无票报销登记和展示功能

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

@@ -27,6 +27,7 @@ public class AccountantReimbursementBusinessTwoDTO extends BaseEntity {
     private String reimbursementQuotaDay;  //日报销额度
     private String surplusReimbursementDay;  //剩余报销天数
     private String reimbursementType;  //报销类型（1：正常报销；2：补差）
+    private String reimbursementFsalary;  //实发类型（1：登记不实发；2：登记并实发）
     @Excel(name = "报销类型",width = 12)
     private String reimbursementTypeStr;  //报销类型（导出Str）
     @Excel(name = "报销天数",type = 10,width = 12)
@@ -35,4 +36,6 @@ public class AccountantReimbursementBusinessTwoDTO extends BaseEntity {
     private String reimbursementAmount;  //报销额度
     private String remainReimbursementAmount;  //剩余报销额度
     private String remarks; //备注
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
+    private String userOfficeName; //报销人员所属部门
 }

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

@@ -30,6 +30,7 @@
         a.reimbursement_day as 'reimbursementDay',
         a.reimbursement_amount as 'reimbursementAmount',
         a.reimbursement_type as 'reimbursementType',
+        a.reimbursement_fsalary as 'reimbursementFsalary',
         (case when a.reimbursement_type = '1' then '正常报销' when a.reimbursement_type = '2' then '补差' else '' end) as reimbursementTypeStr,
         su.name as 'userName'
     </sql>
@@ -37,7 +38,7 @@
         left join sys_user su on su.id = a.user_id
     </sql>
     <insert id="insertAccountantReimbursementBusiness">
-        insert into zs_reimbursement_business_accountant_info
+        insert into zs_reimbursement_business_info
         (
                     id,
             create_by,
@@ -53,7 +54,9 @@
                 reimbursement_day,
             </if>
             reimbursement_amount,
-            reimbursement_type
+            reimbursement_type,
+            reimbursement_fsalary,
+            office_type
         )
         values
         (
@@ -71,7 +74,9 @@
                 #{reimbursementDay},
             </if>
             #{reimbursementAmount},
-            #{reimbursementType}
+            #{reimbursementType},
+            #{reimbursementFsalary},
+            #{officeType}
         )
     </insert>
 
@@ -79,8 +84,10 @@
             resultType="com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementBusinessTwoDTO">
         select
         <include refid="joinZsReimbursementBusinessAccountantInfoColumns"/>
-        from zs_reimbursement_business_accountant_info a
+        ,(select name from sys_office where id = (select substring_index(substring_index(parent_ids,',',3 ),',',-1 ) from sys_office where id = su.office_id)) as 'userOfficeName'
+        from zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
+        left join sys_office so on so.id = su.office_id
         <where>
             a.del_flag = 0 and (a.business_code_id='' or a.business_code_id=null)
             <if test="accountantReimbursementBusiness.year != null and accountantReimbursementBusiness.year != ''">
@@ -89,6 +96,7 @@
             <if test="accountantReimbursementBusiness.userId != null and accountantReimbursementBusiness.userId != ''">
                 and a.user_id = #{accountantReimbursementBusiness.userId}
             </if>
+            and a.office_type = #{accountantReimbursementBusiness.officeType}
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/domain/dto/AssessReimbursementBusinessTwoDTO.java

@@ -27,6 +27,7 @@ public class AssessReimbursementBusinessTwoDTO extends BaseEntity {
     private String reimbursementQuotaDay;  //日报销额度
     private String surplusReimbursementDay;  //剩余报销天数
     private String reimbursementType;  //报销类型（1：正常报销；2：补差）
+    private String reimbursementFsalary;  //实发类型（1：登记不实发；2：登记并实发）
     @Excel(name = "报销类型",width = 12)
     private String reimbursementTypeStr;  //报销类型（导出Str）
     @Excel(name = "报销天数",type = 10,width = 12)
@@ -35,4 +36,6 @@ public class AssessReimbursementBusinessTwoDTO extends BaseEntity {
     private String reimbursementAmount;  //报销额度
     private String remainReimbursementAmount;  //剩余报销额度
     private String remarks; //备注
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
+    private String userOfficeName; //报销人员所属部门
 }

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

@@ -30,6 +30,7 @@
         a.reimbursement_day as 'reimbursementDay',
         a.reimbursement_amount as 'reimbursementAmount',
         a.reimbursement_type as 'reimbursementType',
+        a.reimbursement_fsalary as 'reimbursementFsalary',
         (case when a.reimbursement_type = '1' then '正常报销' when a.reimbursement_type = '2' then '补差' else '' end) as reimbursementTypeStr,
         su.name as 'userName'
     </sql>
@@ -37,7 +38,7 @@
         left join sys_user su on su.id = a.user_id
     </sql>
     <insert id="insertAssessReimbursementBusiness">
-        insert into zs_reimbursement_business_assess_info
+        insert into zs_reimbursement_business_info
         (
                     id,
             create_by,
@@ -53,7 +54,9 @@
                 reimbursement_day,
             </if>
             reimbursement_amount,
-            reimbursement_type
+            reimbursement_type,
+            reimbursement_fsalary,
+            office_type
         )
         values
         (
@@ -71,7 +74,9 @@
                 #{reimbursementDay},
             </if>
             #{reimbursementAmount},
-            #{reimbursementType}
+            #{reimbursementType},
+            #{reimbursementFsalary},
+            #{officeType}
         )
     </insert>
 
@@ -79,8 +84,10 @@
             resultType="com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementBusinessTwoDTO">
         select
         <include refid="joinZsReimbursementBusinessAssessInfoColumns"/>
-        from zs_reimbursement_business_assess_info a
+        ,(select name from sys_office where id = (select substring_index(substring_index(parent_ids,',',3 ),',',-1 ) from sys_office where id = su.office_id)) as 'userOfficeName'
+        from zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
+        left join sys_office so on so.id = su.office_id
         <where>
             a.del_flag = 0 and (a.business_code_id='' or a.business_code_id=null)
             <if test="assessReimbursementBusiness.year != null and assessReimbursementBusiness.year != ''">
@@ -89,6 +96,7 @@
             <if test="assessReimbursementBusiness.userId != null and assessReimbursementBusiness.userId != ''">
                 and a.user_id = #{assessReimbursementBusiness.userId}
             </if>
+            and a.office_type = #{assessReimbursementBusiness.officeType}
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/domain/dto/ProjectReimbursementBusinessTwoDTO.java

@@ -27,6 +27,7 @@ public class ProjectReimbursementBusinessTwoDTO extends BaseEntity {
     private String reimbursementQuotaDay;  //日报销额度
     private String surplusReimbursementDay;  //剩余报销天数
     private String reimbursementType;  //报销类型（1：正常报销；2：补差）
+    private String reimbursementFsalary;  //实发类型（1：登记不实发；2：登记并实发）
     @Excel(name = "报销类型",width = 12)
     private String reimbursementTypeStr;  //报销类型（导出Str）
     @Excel(name = "报销天数",type = 10,width = 12)
@@ -35,4 +36,6 @@ public class ProjectReimbursementBusinessTwoDTO extends BaseEntity {
     private String reimbursementAmount;  //报销额度
     private String remainReimbursementAmount;  //剩余报销额度
     private String remarks; //备注
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
+    private String userOfficeName; //报销人员所属部门
 }

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

@@ -30,6 +30,7 @@
         a.reimbursement_day as 'reimbursementDay',
         a.reimbursement_amount as 'reimbursementAmount',
         a.reimbursement_type as 'reimbursementType',
+        a.reimbursement_fsalary as 'reimbursementFsalary',
         (case when a.reimbursement_type = '1' then '正常报销' when a.reimbursement_type = '2' then '补差' else '' end) as reimbursementTypeStr,
         su.name as 'userName'
     </sql>
@@ -37,7 +38,7 @@
         left join sys_user su on su.id = a.user_id
     </sql>
     <insert id="insertProjectReimbursementBusiness">
-        insert into zs_reimbursement_business_project_info
+        insert into zs_reimbursement_business_info
         (
                     id,
             create_by,
@@ -53,7 +54,9 @@
                 reimbursement_day,
             </if>
             reimbursement_amount,
-            reimbursement_type
+            reimbursement_type,
+            reimbursement_fsalary,
+            office_type
         )
         values
         (
@@ -71,7 +74,9 @@
                 #{reimbursementDay},
             </if>
             #{reimbursementAmount},
-            #{reimbursementType}
+            #{reimbursementType},
+            #{reimbursementFsalary},
+            #{officeType}
         )
     </insert>
 
@@ -79,8 +84,10 @@
             resultType="com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementBusinessTwoDTO">
         select
         <include refid="joinZsReimbursementBusinessProjectInfoColumns"/>
-        from zs_reimbursement_business_project_info a
+        ,(select name from sys_office where id = (select substring_index(substring_index(parent_ids,',',3 ),',',-1 ) from sys_office where id = su.office_id)) as 'userOfficeName'
+        from zs_reimbursement_business_info a
         <include refid="reimbursementUserJoinColumns"/>
+        left join sys_office so on so.id = su.office_id
         <where>
             a.del_flag = 0 and (a.business_code_id='' or a.business_code_id=null)
             <if test="projectReimbursementBusiness.year != null and projectReimbursementBusiness.year != ''">
@@ -89,6 +96,7 @@
             <if test="projectReimbursementBusiness.userId != null and projectReimbursementBusiness.userId != ''">
                 and a.user_id = #{projectReimbursementBusiness.userId}
             </if>
+            and a.office_type = #{projectReimbursementBusiness.officeType}
         </where>
         order by a.update_date desc,a.year desc, a.user_id asc
     </select>