Просмотр исходного кода

住报销显示订单信息修改

anderx 1 год назад
Родитель
Сommit
db13bf4a29

+ 2 - 0
src/main/java/com/goafanti/common/dao/ExpenseAccountMapper.java

@@ -70,4 +70,6 @@ public interface ExpenseAccountMapper {
     MainExpenseAccount selectbySonId(Integer id);
 
     Integer selectDeleteIdBySonId(Integer integer);
+
+    void updateByOrderRemarks(Integer id);
 }

+ 11 - 2
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -456,7 +456,7 @@
       mea.examine_name examineName,mea.check_no checkNo,mea.id mainId, mea.target_type targetType,
     </if>
     <if test="expenseMain ==1">
-       a.examine_name examineName,a.check_no checkNo,a.target_type targetType,
+       a.examine_name examineName,a.check_no checkNo,a.target_type targetType,a.order_remarks orderRemarks,
     </if>
     f.name depName,d2.name financeName, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.aname,
     b.name applyDepName, c.name payDepName
@@ -851,9 +851,18 @@
         set c.status =b.status ,c.process_status =b.process_status
       where a.id= #{id}
     </update>
+  <update id="updateByOrderRemarks">
+    update expense_account x ,(select a.id,GROUP_CONCAT('【',e.buyer_name ,',',d.contract_no,'】') orderRemarks
+      from expense_account a left join expense_relationship b on a.id=b.id
+      left join expense_account c on b.ea_id =c.id left join t_order_new d on c.order_no =d.order_no
+      left join t_order_mid e on c.order_no =e.order_no  and a.id= #{id}
+      group by a.id)y
+    set x.order_remarks=y.orderRemarks
+    where x.id=y.id
+  </update>
 
 
-    <select id="ExpenseMainList" resultMap="MainMap">
+  <select id="ExpenseMainList" resultMap="MainMap">
       select b.id,b.check_no,b.total_amount,b.real_amount ,b.order_no,o.contract_no ,b.aname,b.apply_dep,b.pay_dep,b.amount,
       date_format(b.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.status,b.process_status,b.examine_name,
       dep.name applyDepName,dep2.name payDepName, b.remarks,b.eaaid

+ 5 - 5
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountBo.java

@@ -17,7 +17,7 @@ public class OutExpenseAccountBo {
     @Excel(name = "报销编号")
     private String checkNo;
     @Excel(name = "报销至订单")
-    private String targetName;
+    private String orderRemarks;
     private String depName;
     private Integer secondaryType;
     private String secondaryTypeOther;
@@ -48,12 +48,12 @@ public class OutExpenseAccountBo {
     private String attachmentUrl;
     private Integer examine;
 
-    public String getTargetName() {
-        return targetName;
+    public String getOrderRemarks() {
+        return orderRemarks;
     }
 
-    public void setTargetName(String targetName) {
-        this.targetName = targetName;
+    public void setOrderRemarks(String orderRemarks) {
+        this.orderRemarks = orderRemarks;
     }
 
     public BigDecimal getAmount() {

+ 1 - 7
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -315,13 +315,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     public Object pageListExport(InputPageListBo in) {
         List<OutExpenseAccountBo> list = (List<OutExpenseAccountBo>) pageList(in).getList();
         for (OutExpenseAccountBo e : list) {
-            if (e.getTargetType()!=null){
-                if (e.getTargetType()==0){
-                    e.setTargetName("固定费用");
-                }else {
-                    e.setTargetName(e.getContractNo()+"-"+e.getBuyerName());
-                }
-            }
             if (e.getType()!=0){
                 e.setTypeOther(EATypes.getDescByCode(e.getType()));
             }else{
@@ -1119,6 +1112,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             update.setId(in.getId());
             update.setExamineName(outExpenseAccount.getExamineName());
             expenseAccountMapper.updateByPrimaryKeySelective(update);
+            expenseAccountMapper.updateByOrderRemarks(in.getId());
         }else if (in.getStatus()==4){
             expenseAccountMapper.updateByMainId(in.getId(),0);
             addExpenseAccountLog(in.getId(),4,0,TokenManager.getAdminId(),"撤销报销审核");