人员报销数据查询功能修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/domain/dto/AccountantReimbursementBusinessDTO.java

@@ -19,7 +19,8 @@ public class AccountantReimbursementBusinessDTO extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    private String businessCode;  //业务编号
+    private String businessCode;  //报销批次
+    private String reimbursementBatch;  //业务编号
     private String businessCodeId;  //业务编号Id
     private String userId;  //报销人id
     private String userName;  //报销人

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/mapper/xml/AccountantReimbursementBusinessMapper.xml

@@ -239,7 +239,8 @@
         SELECT
         <include refid="reimbursementBusinessColumns"/>
         ,zri.business_code as "businessCode"
-        FROM zs_reimbursement_business_accountant_info a
+        ,zri.reimbursement_batch as "reimbursementBatch"
+        FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join zs_reimbursement_accountant_info zri on zri.id = a.business_code_id
         <where>
@@ -277,7 +278,7 @@
         SELECT
         a.reimbursement_fsalary AS "value",
         (case when a.reimbursement_fsalary = '1' then '报销不实发' when a.reimbursement_fsalary = '2' then '报销并实发' else 0 end) as "label"
-        FROM zs_reimbursement_business_accountant_info a
+        FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join zs_reimbursement_accountant_info zri on zri.id = a.business_code_id
         <where>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/mapper/xml/AccountantReimbursementBusinessTwoMapper.xml

@@ -119,18 +119,18 @@
             resultType="com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementBusinessTwoDTO">
         select
         <include refid="zsReimbursementBusinessAccountantInfoColumns"/>
-        from zs_reimbursement_business_accountant_info a
+        from zs_reimbursement_business_info a
         where id=#{id}
     </select>
 
 
     <delete id="delPhysicsById">
-        delete from zs_reimbursement_business_accountant_info
+        delete from zs_reimbursement_business_info
         where id = #{id}
     </delete>
 
     <delete id="deleteByList">
-        delete from zs_reimbursement_business_accountant_info
+        delete from zs_reimbursement_business_info
         <where>
             <if test="idList != null and idList.size>0">
                 and id in
@@ -142,7 +142,7 @@
     </delete>
 
     <update id="modifyBindCode">
-        update zs_reimbursement_business_accountant_info
+        update zs_reimbursement_business_info
         set
                 business_code_id=#{businessCode}
         where id=#{ids}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/mapper/xml/AssessReimbursementBusinessMapper.xml

@@ -239,7 +239,7 @@
         SELECT
         <include refid="reimbursementBusinessColumns"/>
         ,zri.business_code as "businessCode"
-        FROM zs_reimbursement_business_assess_info a
+        FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join zs_reimbursement_assess_info zri on zri.id = a.business_code_id
         <where>
@@ -276,7 +276,7 @@
         SELECT
         a.reimbursement_fsalary AS "value",
         (case when a.reimbursement_fsalary = '1' then '报销不实发' when a.reimbursement_fsalary = '2' then '报销并实发' else 0 end) as "label"
-        FROM zs_reimbursement_business_assess_info a
+        FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join zs_reimbursement_assess_info zri on zri.id = a.business_code_id
         <where>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/mapper/xml/AssessReimbursementBusinessTwoMapper.xml

@@ -119,18 +119,18 @@
             resultType="com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementBusinessTwoDTO">
         select
         <include refid="zsReimbursementBusinessAssessInfoColumns"/>
-        from zs_reimbursement_business_assess_info a
+        from zs_reimbursement_business_info a
         where id=#{id}
     </select>
 
 
     <delete id="delPhysicsById">
-        delete from zs_reimbursement_business_assess_info
+        delete from zs_reimbursement_business_info
         where id = #{id}
     </delete>
 
     <delete id="deleteByList">
-        delete from zs_reimbursement_business_assess_info
+        delete from zs_reimbursement_business_info
         <where>
             <if test="idList != null and idList.size>0">
                 and id in
@@ -142,7 +142,7 @@
     </delete>
 
     <update id="modifyBindCode">
-        update zs_reimbursement_business_assess_info
+        update zs_reimbursement_business_info
         set
                 business_code_id=#{businessCode}
         where id=#{ids}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/mapper/xml/ProjectReimbursementBusinessMapper.xml

@@ -239,7 +239,7 @@
         SELECT
         <include refid="reimbursementBusinessColumns"/>
         ,zri.business_code as "businessCode"
-        FROM zs_reimbursement_business_project_info a
+        FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join zs_reimbursement_project_info zri on zri.id = a.business_code_id
         <where>
@@ -277,7 +277,7 @@
         SELECT
         a.reimbursement_fsalary AS "value",
         (case when a.reimbursement_fsalary = '1' then '报销不实发' when a.reimbursement_fsalary = '2' then '报销并实发' else 0 end) as "label"
-        FROM zs_reimbursement_business_project_info a
+        FROM zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join zs_reimbursement_project_info zri on zri.id = a.business_code_id
         <where>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/mapper/xml/ProjectReimbursementBusinessTwoMapper.xml

@@ -119,18 +119,18 @@
             resultType="com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementBusinessTwoDTO">
         select
         <include refid="zsReimbursementBusinessProjectInfoColumns"/>
-        from zs_reimbursement_business_project_info a
+        from zs_reimbursement_business_info a
         where id=#{id}
     </select>
 
 
     <delete id="delPhysicsById">
-        delete from zs_reimbursement_business_project_info
+        delete from zs_reimbursement_business_info
         where id = #{id}
     </delete>
 
     <delete id="deleteByList">
-        delete from zs_reimbursement_business_project_info
+        delete from zs_reimbursement_business_info
         <where>
             <if test="idList != null and idList.size>0">
                 and id in
@@ -142,7 +142,7 @@
     </delete>
 
     <update id="modifyBindCode">
-        update zs_reimbursement_business_project_info
+        update zs_reimbursement_business_info
         set
                 business_code_id=#{businessCode}
         where id=#{ids}