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

报销开发费用明细列表,费用列表新增
主报销查询修改

anderx лет назад: 2
Родитель
Сommit
2d6f155e99

+ 8 - 7
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -423,16 +423,15 @@
 
   <select id="selectExpenseAccountList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountBo">
     select a.id,a.total_amount totalAmount,a.`type`,a.process_status processStatus,a.type_other typeOther,
-    a.attachment_url attachmentUrl ,a.user_names userNames,a.real_amount realAmount,
-    a.secondary_type secondaryType, a.secondary_type_other secondaryTypeOther,a.status,
-    date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
+    a.attachment_url attachmentUrl ,a.real_amount realAmount,e.contract_no contractNo,tm.buyer_name buyerName,
+    a.secondary_type secondaryType, a.secondary_type_other secondaryTypeOther,a.status,a.user_names userNames,
+    date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,a.user_names userNames,
     date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr,
     <if test="processStatus ==1">
       eae.type eaeType,
     </if>
     <if test="expenseMain ==0">
-      mea.examine_name examineName,mea.check_no checkNo,e.contract_no contractNo,mea.id mainId,
-      mea.target_type targetType,
+      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,
@@ -456,7 +455,9 @@
     </if>
     <if test="expenseMain ==1">
       left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
+      left join t_order_new e on a.order_no =e.order_no
     </if>
+    left join t_order_mid  tm on e.order_no =tm.order_no
     <if test="processStatus ==1">
       inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
       where auditor= #{auditor} group by eaid) eae on a.id=eae.eaid
@@ -515,7 +516,7 @@
       and d.department_id = #{depId}
     </if>
     <if test="contractNo != null">
-      and e.contract_no = #{contractNo}
+      and e.contract_no like concat('%',#{contractNo},'%')
     </if>
     <if test="applyDep != null">
       and a.apply_dep  = #{applyDep}
@@ -792,7 +793,7 @@
 
 
   <select id="ExpenseMainList" resultMap="MainMap">
-    select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no,b.aname,b.apply_dep,b.pay_dep,
+    select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no ,b.aname,b.apply_dep,b.pay_dep,
     date_format(a.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 ,
     c.id sonId,c.total_amount sonAmount,c.`type` sonType,c.type_other sonTypeOTher,c.user_names ,c.release_start ,c.release_end,

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

@@ -25,12 +25,30 @@ public class OutExpenseAccountBo {
     private String contractNo;
     private String checkNo;
     private String userNames;
+    private String buyerName;
     private String depName;
     private String financeName;
     private String attachmentUrl;
     private Integer examine;
     private Integer realAmount;
 
+
+    public Integer getMainId() {
+        return mainId;
+    }
+
+    public void setMainId(Integer mainId) {
+        this.mainId = mainId;
+    }
+
+    public String getBuyerName() {
+        return buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
     public Integer getRealAmount() {
         return realAmount;
     }

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

@@ -764,7 +764,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         ExpenseAccount update =new ExpenseAccount();
         if (in.getStatus()==null)in.setStatus(1);
         if (in.getStatus()==1){
-            if (in.getOrderNo()!=null)update.setOrderNo(in.getOrderNo());
+            if (in.getOrderNo()!=null){
+                update.setOrderNo(in.getOrderNo());
+                update.setTargetType(1);
+            }
             if (in.getPayDep()!=null)update.setPayDep(in.getPayDep());
             if (in.getApplyDep()!=null)update.setApplyDep(in.getApplyDep());
             if (in.getRemarks()!=null)update.setRemarks(in.getRemarks());
@@ -779,6 +782,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }else if (in.getStatus()==4){
             expenseAccountMapper.updateByMainId(in.getId(),0);
         }
+
         update.setStatus(in.getStatus());
         update.setProcessStatus(outExpenseAccount.getProcessStatus());
         update.setId(in.getId());