Browse Source

报销开发子报销列表新增字段

anderx 2 years ago
parent
commit
94370b21a5

+ 39 - 14
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -736,7 +736,7 @@
 
   <sql id="mainAllSql">
     select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no,b.aname,b.apply_dep,b.pay_dep,b.real_amount,
-           date_format(b.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
+           date_format(b.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.examine_name,
            dep.name applyDepName,dep2.name payDepName, b.remarks,b.eaaid ,eap.name ,eap.bank ,eap.accounts ,b.status,b.process_status,
            c.id sonId,c.total_amount sonAmount,c.`type` ,c.type_other ,c.user_names ,c.release_start ,c.release_end ,
            c.district_name districtName,c.user_names userNames,c.secondary_type ,c.secondary_type_other,c.attachment_url,
@@ -774,6 +774,7 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="process_status" jdbcType="INTEGER" property="processStatus" />
     <result column="createTimeStr" jdbcType="VARCHAR" property="createTimeStr" />
+    <result column="examine_name" jdbcType="VARCHAR" property="examineName" />
     <association property="sonList" resultMap="SonExpenseAccountMap"></association>
   </resultMap>
 
@@ -826,7 +827,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,
-    date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.status,b.process_status,
+    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` ,c.type_other ,c.user_names ,c.release_start ,c.release_end,
     c.attachment_url attachmentUrl,c.secondary_type,c.secondary_type_other
@@ -842,25 +843,34 @@
     <if test=" status != null">
       and b.status = #{status}
     </if>
-    <if test="listStatus ==0">
-      and b.status in(0,1,3)
-    </if>
-    <if test="listStatus ==1">
-      and b.status =2
-    </if>
     <if test=" roleType ==0">
       and b.aid = #{aid}
     </if>
     <if test="roleType == 1">
-      and b.process_status &gt; 0
+      <if test="listStatus ==0">
+        and b.process_status =1
+      </if>
+      <if test="listStatus ==1">
+        and b.process_status &gt; 1
+      </if>
       and ad.superior_id= #{aid}
     </if>
     <if test="roleType == 2">
-      and b.process_status &gt; 1
+      <if test="listStatus ==0">
+        and b.process_status =2
+      </if>
+      <if test="listStatus ==1">
+        and b.process_status &gt; 2
+      </if>
       and adDep.finance_id = #{aid}
     </if>
     <if test="roleType == 3">
-      and b.process_status &gt; 2
+      <if test="listStatus ==0">
+        and b.process_status =3
+      </if>
+      <if test="listStatus ==1">
+        and b.process_status &gt; 3
+      </if>
       and ad.department_id in
       <foreach collection="deps" item="dep" open="(" close=")" separator=",">
         #{dep}
@@ -890,15 +900,30 @@
       and b.aid = #{aid}
     </if>
     <if test="roleType == 1">
-      and b.process_status &gt; 0
+      <if test="listStatus ==0">
+        and b.process_status =1
+      </if>
+      <if test="listStatus ==1">
+        and b.process_status &gt; 1
+      </if>
       and ad.superior_id= #{aid}
     </if>
     <if test="roleType == 2">
-      and b.process_status &gt; 1
+      <if test="listStatus ==0">
+        and b.process_status =2
+      </if>
+      <if test="listStatus ==1">
+        and b.process_status &gt; 2
+      </if>
       and adDep.finance_id = #{aid}
     </if>
     <if test="roleType == 3">
-      and b.process_status &gt; 2
+      <if test="listStatus ==0">
+        and b.process_status =3
+      </if>
+      <if test="listStatus ==1">
+        and b.process_status &gt; 3
+      </if>
       and ad.department_id in
       <foreach collection="deps" item="dep" open="(" close=")" separator=",">
         #{dep}

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

@@ -26,6 +26,15 @@ public class MainExpenseAccount  {
     private String bank;
     private String accounts;
     private String createTimeStr;
+    private String examineName;
+
+    public String getExamineName() {
+        return examineName;
+    }
+
+    public void setExamineName(String examineName) {
+        this.examineName = examineName;
+    }
 
     public BigDecimal getRealAmount() {
         return realAmount;

+ 12 - 10
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -97,6 +97,17 @@ public class ExpenseAccountController extends CertifyApiController {
     }
 
     /**
+     * 主报销列表
+     * @param in
+     * @return
+     */
+    @RequestMapping(value = "/mainList",method = RequestMethod.GET)
+    public Result mainList(ExpenseMainListInput in){
+        Result res =new Result();
+        return res.data(expenseAccountService.mainList(in));
+    }
+
+    /**
      * 报销详情列表
      * @return
      */
@@ -300,16 +311,7 @@ public class ExpenseAccountController extends CertifyApiController {
         return res.data(expenseAccountService.pushMerge(expenseAccounts));
     }
 
-    /**
-     * 主报销列表
-     * @param in
-     * @return
-     */
-    @RequestMapping(value = "/mainList",method = RequestMethod.GET)
-    public Result mainList(ExpenseMainListInput in){
-        Result res =new Result();
-        return res.data(expenseAccountService.mainList(in));
-    }
+
 
 
     /**