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

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

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

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

@@ -398,7 +398,7 @@
     a.id, a.prid, a.order_no orderNo, o.contract_no contractNo ,tm.buyer_name buyerName, a.aid, a.aname, a.`type`,
         a.type_other typeOther , a.status,a.process_status processStatus,a.total_amount totalAmount,a.debit_id debitId,
         a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
-        a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
+        a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name applyDepName,
         c.name payDepName,d.name ,d.bank ,d.accounts ,a.settlement_amount settlementAmount,a.secondary_type secondaryType,
         a.liquidation_status liquidationStatus, a.remarks,a.check_no checkNo,a.secondary_type_other secondaryTypeOther,
            date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
@@ -423,7 +423,7 @@
 
   <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.target_type targetType ,a.user_names userNames,a.real_amount realAmount,
+    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,
     date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr,
@@ -431,13 +431,14 @@
       eae.type eaeType,
     </if>
     <if test="expenseMain ==0">
-      mea.examine_name examineName,mea.check_no checkNo,e.contract_no contractNo,
+      mea.examine_name examineName,mea.check_no checkNo,e.contract_no contractNo,mea.id mainId,
+      mea.target_type targetType,
     </if>
     <if test="expenseMain ==1">
-       a.examine_name examineName,a.check_no checkNo,
+       a.examine_name examineName,a.check_no checkNo,a.target_type targetType,
     </if>
     f.name depName,d2.name financeName, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.aname,
-    b.name appDepName, c.name payDepName
+    b.name applyDepName, c.name payDepName
     from expense_account a
     <if test="type !=null">
       right join  (select a.id
@@ -599,7 +600,7 @@
         a.id, a.prid, a.order_no orderNo, o.contract_no contractNo ,tm.buyer_name buyerName, a.aid, a.aname, a.`type`,
         a.type_other typeOther , a.status,a.process_status processStatus,a.total_amount totalAmount,a.debit_id debitId,
         a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
-        a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
+        a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name applyDepName,
         c.name payDepName,d.name ,d.bank ,d.accounts ,t0.amount settlementAmount,a.check_no checkNo,
         a.liquidation_status liquidationStatus, a.remarks,
         date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
@@ -871,7 +872,7 @@
 
   <select id="ExpenseDetailsList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountDetailsList">
     select mea.check_no checkNo ,ead.`type`,ead.amount ,ead.real_amount realAmount ,o.contract_no contractNo ,dep.name applyDepName,
-    dep2.name payDepName ,mea.aname ,ad2.name financeName,mea.status ,mea.process_status processStatus ,mea.id mainId,
+    dep2.name payDepName ,mea.aname ,ad2.name financeName,a.status ,mea.process_status processStatus ,mea.id mainId,mea.target_type targetType,
     tm.buyer_name buyerName ,date_format(mea.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr
     from expense_account_details  ead left join expense_account a on ead.eaid =a.id
     left join expense_relationship er on a.id=er.ea_id  left join expense_account mea on  er.id=mea.id

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

@@ -10,7 +10,7 @@ public class OutExpenseAccount extends ExpenseAccount {
     private String createTimeStr;
     private String releaseStartStr;
     private String releaseEndStr;
-    private String appDepName;
+    private String applyDepName;
     private String payDepName;
     private String contractNo;
     private String buyerName;
@@ -105,12 +105,12 @@ public class OutExpenseAccount extends ExpenseAccount {
         this.releaseEndStr = releaseEndStr;
     }
 
-    public String getAppDepName() {
-        return appDepName;
+    public String getApplyDepName() {
+        return applyDepName;
     }
 
-    public void setAppDepName(String appDepName) {
-        this.appDepName = appDepName;
+    public void setApplyDepName(String applyDepName) {
+        this.applyDepName = applyDepName;
     }
 
     public String getPayDepName() {

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

@@ -14,12 +14,13 @@ public class OutExpenseAccountBo {
     private String examineName;
     private String createTimeStr;
     private String aname;
-    private String appDepName;
+    private String applyDepName;
     private String payDepName;
     private Integer status;
     private Integer targetType;
     private String  releaseStartStr;
     private String releaseEndStr;
+    private Integer mainId;
 
     private String contractNo;
     private String checkNo;
@@ -158,12 +159,12 @@ public class OutExpenseAccountBo {
         this.aname = aname;
     }
 
-    public String getAppDepName() {
-        return appDepName;
+    public String getApplyDepName() {
+        return applyDepName;
     }
 
-    public void setAppDepName(String appDepName) {
-        this.appDepName = appDepName;
+    public void setApplyDepName(String applyDepName) {
+        this.applyDepName = applyDepName;
     }
 
     public String getPayDepName() {

+ 9 - 0
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountDetailsList.java

@@ -61,6 +61,15 @@ public class OutExpenseAccountDetailsList {
      * 创建时间
      */
     private String createTimeStr;
+    private Integer targetType;
+
+    public Integer getTargetType() {
+        return targetType;
+    }
+
+    public void setTargetType(Integer targetType) {
+        this.targetType = targetType;
+    }
 
     public String getCheckNo() {
         return checkNo;