人员报销数据添加

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/controller/AccountantReimbursementUserController.java

@@ -136,8 +136,8 @@ public class AccountantReimbursementUserController {
     @ApiLog("初始化部门人员报销数据信息（当年）")
     @PreAuthorize("hasAnyAuthority('accountant:reimbursementUser:add')")
     @PostMapping("initialize")
-    public ResponseEntity initialize() {
-        Map<String, Object> result = service.initialize("兴光会计");
+    public ResponseEntity initialize(String officeType) {
+        Map<String, Object> result = service.initialize("兴光会计",officeType);
         Boolean success = (Boolean) result.get("success");
         if(success){
             return ResponseEntity.ok(result.get("message"));

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

@@ -33,6 +33,7 @@ public class AccountantReimbursementBusinessDTO extends BaseEntity {
     private String reimbursementAmount;  //报销额度
     private String remainReimbursementAmount;  //剩余报销额度
     private String remarks; //备注
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
     /**
      * 报销开始日期
      */

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

@@ -31,6 +31,7 @@ public class AccountantReimbursementBusinessReturnDTO {
 
     private String userId;  //报销人员id
     private String year; //报销年份
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 
     /**
      * 报销开始日期

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

@@ -63,6 +63,7 @@ public class AccountantReimbursementUserDTO extends BaseEntity {
 
     private String surplusReimbursementAmount;  //剩余报销额度
     private String keyFlag; //用于判断使用
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 
 
 }

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

@@ -84,8 +84,9 @@ public interface AccountantReimbursementUserMapper extends BaseMapper<Accountant
      * 根据人员id集合和年份查询已存在的人员信息
      * @param userIdList
      * @param year
+     * @param officeType 1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估
      * @return
      */
-    List<AccountantReimbursementUserDTO> getExistReimbursementUserList(@Param("userIdList") List<String> userIdList, @Param("year") String year);
+    List<AccountantReimbursementUserDTO> getExistReimbursementUserList(@Param("userIdList") List<String> userIdList, @Param("year") String year ,@Param("officeType") String officeType);
 
 }

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

@@ -60,7 +60,7 @@
     <select id="getYearList" resultType="com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementUserDTO">
         SELECT
             <include refid="reimbursementUserColumns"/>
-        FROM zs_reimbursement_user_accountant_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -76,7 +76,7 @@
             a.year as year,
             ifnull(sum(a.reimbursement_amount),0) as alreadyReimbursementAmount,
             ifnull(sum(a.reimbursement_day),0) as alreadyReimbursementDay
-        FROM zs_reimbursement_business_accountant_info a
+        FROM zs_reimbursement_business_info a
         <where>
             a.del_flag = 0
             and a.user_id = #{userId}
@@ -90,7 +90,7 @@
     <select id="reimbursementUserByUserIdAndYear" resultType="com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementUserDTO">
         SELECT
             <include refid="reimbursementUserColumns"/>
-        FROM zs_reimbursement_user_accountant_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -100,7 +100,7 @@
     </select>
 
     <insert id="save">
-        insert into zs_reimbursement_business_accountant_info (
+        insert into zs_reimbursement_business_info (
             id,
             create_by,
             create_date,
@@ -116,7 +116,8 @@
             </if>
             reimbursement_type,
             reimbursement_fsalary,
-            reimbursement_amount
+            reimbursement_amount,
+            office_type
         )
         values
         (
@@ -135,7 +136,8 @@
             </if>
             #{reimbursementType},
             #{reimbursementFsalary},
-            #{reimbursementAmount}
+            #{reimbursementAmount},
+            #{officeType}
         )
     </insert>
 
@@ -195,7 +197,7 @@
 
     <select id="getAlreadyReimbursementQuotaByUserIdAndYear" resultType="java.lang.String">
         select ifnull(sum(a.reimbursement_amount),0)
-        from zs_reimbursement_business_accountant_info a
+        from zs_reimbursement_business_info a
         where a.del_flag = 0
         and a.user_id= #{userId}
         and a.year = #{year}
@@ -204,9 +206,10 @@
 
     <select id="getAlreadyReimbursementQuotaByBusinessCodeId" resultType="java.lang.String">
         select ifnull(sum(a.reimbursement_amount),0)
-        from zs_reimbursement_business_accountant_info a
+        from zs_reimbursement_business_info a
         where a.del_flag = 0
         and a.business_code_id= #{businessCodeId}
+        and office_type = #{officeType}
     </select>
 
     <select id="getGatheringStatusById" resultType="java.lang.String">

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

@@ -68,7 +68,7 @@
         ifnull(sum(zrbi.reimbursement_amount),0) as "alreadyReimbursementAmount",
         ifnull((a.reimbursement_quota - ifnull(sum(zrbi.reimbursement_amount),0)),0) as "remainReimbursementAmount",
         ifnull(( CONVERT ( a.reimbursement_quota / a.reimbursement_quota_day, DECIMAL ( 15, 2 )) - ifnull(sum( zrbi.reimbursement_day ),0)), 0 ) AS "surplusReimbursementDay"
-        FROM zs_reimbursement_user_accountant_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join sys_office so on so.id = su.office_id
         LEFT JOIN zs_reimbursement_business_accountant_info zrbi ON zrbi.user_id = a.user_id and zrbi.year = a.year
@@ -83,6 +83,7 @@
             <if test="reimbursementUser.officeId != null and reimbursementUser.officeId != ''">
                 and su.office_id in (select id from sys_office where del_flag = 0 and (id = #{reimbursementUser.officeId} or parent_ids like concat('%',#{reimbursementUser.officeId},'%')))
             </if>
+            and a.office_type = #{reimbursementUser.officeType}
         </where>
         group by a.user_id,a.year
         order by a.update_date desc,a.year desc, a.user_id asc
@@ -103,7 +104,7 @@
     </select>
 
     <insert id="save">
-        insert into zs_reimbursement_user_accountant_info (
+        insert into zs_reimbursement_user_info (
             id,
             create_by,
             create_date,
@@ -115,7 +116,8 @@
             year,
             reimbursement_quota,
             reimbursement_all_day,
-            reimbursement_quota_day
+            reimbursement_quota_day,
+            office_type
         )
         values
         (
@@ -130,12 +132,13 @@
             #{year},
             #{reimbursementQuota},
             #{reimbursementAllDay},
-            #{reimbursementQuotaDay}
+            #{reimbursementQuotaDay},
+            #{officeType}
         )
     </insert>
 
     <insert id="saveList">
-        insert into zs_reimbursement_user_accountant_info (
+        insert into zs_reimbursement_user_info (
         id,
         create_by,
         create_date,
@@ -147,7 +150,8 @@
         year,
         reimbursement_quota,
         reimbursement_all_day,
-        reimbursement_quota_day
+        reimbursement_quota_day,
+        office_type
         )
         values
         <foreach collection="reimbursementUserList" item="item" separator=",">
@@ -162,7 +166,8 @@
             #{item.year},
             #{item.reimbursementQuota},
             #{item.reimbursementAllDay},
-            #{item.reimbursementQuotaDay}
+            #{item.reimbursementQuotaDay},
+            #{item.officeType}
             )
         </foreach>
     </insert>
@@ -170,7 +175,7 @@
 
 
     <update id="update">
-        update zs_reimbursement_user_accountant_info
+        update zs_reimbursement_user_info
         set
             update_by = #{updateBy}
             ,update_date = #{updateDate}
@@ -194,7 +199,7 @@
     <select id="queryById" resultType="com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementUserDTO">
         SELECT
         <include refid="reimbursementUserColumns"/>
-            FROM zs_reimbursement_user_accountant_info a
+            FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -205,7 +210,7 @@
     <select id="queryByUserIdAndYear" resultType="com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementUserDTO">
         SELECT
         <include refid="reimbursementUserColumns"/>
-            FROM zs_reimbursement_user_accountant_info a
+            FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -216,7 +221,7 @@
     </select>
 
     <delete id="delete">
-        delete from zs_reimbursement_user_accountant_info
+        delete from zs_reimbursement_user_info
         <where>
             <if test="idList != null and idList.size>0">
                 and id in
@@ -243,7 +248,7 @@
     <select id="getExistReimbursementUserList" resultType="com.jeeplus.test.reimbursementAccountant.domain.dto.AccountantReimbursementUserDTO">
         SELECT
         <include refid="reimbursementUserColumns"/>
-        FROM zs_reimbursement_user_accountant_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -254,6 +259,7 @@
                 </foreach>
             </if>
             and a.year = #{year}
+            and office_type = #{officeType}
         </where>
     </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/service/AccountantReimbursementUserService.java

@@ -82,5 +82,5 @@ public interface AccountantReimbursementUserService {
      * 初始化部门人员报销数据信息（当年）
      * @param officeName 部门名称
      */
-    Map<String,Object> initialize(String officeName);
+    Map<String,Object> initialize(String officeName,String officeType);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAccountant/service/impl/AccountantReimbursementUserServiceImpl.java

@@ -328,7 +328,7 @@ public class AccountantReimbursementUserServiceImpl implements AccountantReimbur
 
     @Override
     @Transactional(readOnly = false)
-    public Map<String, Object> initialize(String officeName) {
+    public Map<String, Object> initialize(String officeName,String officeType) {
         Map<String,Object> map = new HashMap<>();
         //根据部门名称  查询所属部门
         List<OfficeDTO> officeListByOfficeName = officeService.getOfficeAllByOfficeName(officeName);
@@ -355,7 +355,7 @@ public class AccountantReimbursementUserServiceImpl implements AccountantReimbur
             String year = String.valueOf(date.get(Calendar.YEAR));
 
             //根据人员id集合和年份查询已存在的人员信息
-            List<AccountantReimbursementUserDTO> existReimbursementUserList = mapper.getExistReimbursementUserList(userIdList, year);
+            List<AccountantReimbursementUserDTO> existReimbursementUserList = mapper.getExistReimbursementUserList(userIdList, year,officeType);
 
             //排除已存在的人员信息
             for (AccountantReimbursementUserDTO existReimbursementUser: existReimbursementUserList) {
@@ -400,6 +400,7 @@ public class AccountantReimbursementUserServiceImpl implements AccountantReimbur
                     userInfo.setReimbursementQuotaDay(reimbursementQuotaDay);
                     userInfo.setReimbursementAllDay(reimbursementAllDay);
                     userInfo.setReimbursementQuota(reimbursementQuotaB.toString());
+                    userInfo.setOfficeType(officeType);
                     userInfo.preInsert();
                     userInfoList.add(userInfo);
                 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/controller/AssessReimbursementUserController.java

@@ -136,8 +136,8 @@ public class AssessReimbursementUserController {
     @ApiLog("初始化部门人员报销数据信息（当年）")
     @PreAuthorize("hasAnyAuthority('assess:reimbursementUser:add')")
     @PostMapping("initialize")
-    public ResponseEntity initialize() {
-        Map<String, Object> result = service.initialize("兴光评估");
+    public ResponseEntity initialize(String officeType) {
+        Map<String, Object> result = service.initialize("兴光评估",officeType);
         Boolean success = (Boolean) result.get("success");
         if(success){
             return ResponseEntity.ok(result.get("message"));

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

@@ -33,6 +33,7 @@ public class AssessReimbursementBusinessDTO extends BaseEntity {
     private String reimbursementAmount;  //报销额度
     private String remainReimbursementAmount;  //剩余报销额度
     private String remarks; //备注
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
     /**
      * 报销开始日期
      */

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

@@ -33,6 +33,7 @@ public class AssessReimbursementBusinessReturnDTO {
 
     private String userId;  //报销人员id
     private String year; //报销年份
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 
     /**
      * 报销开始日期

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

@@ -63,6 +63,7 @@ public class AssessReimbursementUserDTO extends BaseEntity {
 
     private String surplusReimbursementAmount;  //剩余报销额度
     private String keyFlag; //用于判断使用
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 
 
 }

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

@@ -83,8 +83,9 @@ public interface AssessReimbursementUserMapper extends BaseMapper<AssessReimburs
      * 根据人员id集合和年份查询已存在的人员信息
      * @param userIdList
      * @param year
+     * @param officeType 1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估
      * @return
      */
-    List<AssessReimbursementUserDTO> getExistReimbursementUserList(@Param("userIdList") List<String> userIdList, @Param("year") String year);
+    List<AssessReimbursementUserDTO> getExistReimbursementUserList(@Param("userIdList") List<String> userIdList, @Param("year") String year,@Param("officeType") String officeType);
 
 }

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

@@ -60,7 +60,7 @@
     <select id="getYearList" resultType="com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementUserDTO">
         SELECT
             <include refid="reimbursementUserColumns"/>
-        FROM zs_reimbursement_user_assess_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -76,7 +76,7 @@
             a.year as year,
             ifnull(sum(a.reimbursement_amount),0) as alreadyReimbursementAmount,
             ifnull(sum(a.reimbursement_day),0) as alreadyReimbursementDay
-        FROM zs_reimbursement_business_assess_info a
+        FROM zs_reimbursement_business_info a
         <where>
             a.del_flag = 0
             and a.user_id = #{userId}
@@ -90,7 +90,7 @@
     <select id="reimbursementUserByUserIdAndYear" resultType="com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementUserDTO">
         SELECT
             <include refid="reimbursementUserColumns"/>
-        FROM zs_reimbursement_user_assess_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -100,7 +100,7 @@
     </select>
 
     <insert id="save">
-        insert into zs_reimbursement_business_assess_info (
+        insert into zs_reimbursement_business_info (
             id,
             create_by,
             create_date,
@@ -116,7 +116,8 @@
             </if>
             reimbursement_type,
             reimbursement_fsalary,
-            reimbursement_amount
+            reimbursement_amount,
+            office_type
         )
         values
         (
@@ -135,7 +136,8 @@
             </if>
             #{reimbursementType},
             #{reimbursementFsalary},
-            #{reimbursementAmount}
+            #{reimbursementAmount},
+            #{officeType}
         )
     </insert>
 
@@ -195,7 +197,7 @@
 
     <select id="getAlreadyReimbursementQuotaByUserIdAndYear" resultType="java.lang.String">
         select ifnull(sum(a.reimbursement_amount),0)
-        from zs_reimbursement_business_assess_info a
+        from zs_reimbursement_business_info a
         where a.del_flag = 0
         and a.user_id= #{userId}
         and a.year = #{year}
@@ -204,9 +206,10 @@
 
     <select id="getAlreadyReimbursementQuotaByBusinessCodeId" resultType="java.lang.String">
         select ifnull(sum(a.reimbursement_amount),0)
-        from zs_reimbursement_business_assess_info a
+        from zs_reimbursement_business_info a
         where a.del_flag = 0
         and a.business_code_id= #{businessCodeId}
+        and office_type = #{officeType}
     </select>
 
     <select id="getGatheringStatusById" resultType="java.lang.String">

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

@@ -68,7 +68,7 @@
         ifnull(sum(zrbi.reimbursement_amount),0) as "alreadyReimbursementAmount",
         ifnull((a.reimbursement_quota - ifnull(sum(zrbi.reimbursement_amount),0)),0) as "remainReimbursementAmount",
         ifnull(( CONVERT ( a.reimbursement_quota / a.reimbursement_quota_day, DECIMAL ( 15, 2 )) - ifnull(sum( zrbi.reimbursement_day ),0)), 0 ) AS "surplusReimbursementDay"
-        FROM zs_reimbursement_user_assess_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join sys_office so on so.id = su.office_id
         LEFT JOIN zs_reimbursement_business_assess_info zrbi ON zrbi.user_id = a.user_id and zrbi.year = a.year
@@ -83,6 +83,7 @@
             <if test="reimbursementUser.officeId != null and reimbursementUser.officeId != ''">
                 and su.office_id in (select id from sys_office where del_flag = 0 and (id = #{reimbursementUser.officeId} or parent_ids like concat('%',#{reimbursementUser.officeId},'%')))
             </if>
+            and a.office_type = #{reimbursementUser.officeType}
         </where>
         group by a.user_id,a.year
         order by a.update_date desc,a.year desc, a.user_id asc
@@ -103,7 +104,7 @@
     </select>
 
     <insert id="save">
-        insert into zs_reimbursement_user_assess_info (
+        insert into zs_reimbursement_user_info (
             id,
             create_by,
             create_date,
@@ -115,7 +116,8 @@
             year,
             reimbursement_quota,
             reimbursement_all_day,
-            reimbursement_quota_day
+            reimbursement_quota_day,
+            office_type
         )
         values
         (
@@ -130,12 +132,13 @@
             #{year},
             #{reimbursementQuota},
             #{reimbursementAllDay},
-            #{reimbursementQuotaDay}
+            #{reimbursementQuotaDay},
+            #{officeType}
         )
     </insert>
 
     <insert id="saveList">
-        insert into zs_reimbursement_user_assess_info (
+        insert into zs_reimbursement_user_info (
         id,
         create_by,
         create_date,
@@ -147,7 +150,8 @@
         year,
         reimbursement_quota,
         reimbursement_all_day,
-        reimbursement_quota_day
+        reimbursement_quota_day,
+        office_type
         )
         values
         <foreach collection="reimbursementUserList" item="item" separator=",">
@@ -162,7 +166,8 @@
             #{item.year},
             #{item.reimbursementQuota},
             #{item.reimbursementAllDay},
-            #{item.reimbursementQuotaDay}
+            #{item.reimbursementQuotaDay},
+            #{item.officeType}
             )
         </foreach>
     </insert>
@@ -170,7 +175,7 @@
 
 
     <update id="update">
-        update zs_reimbursement_user_assess_info
+        update zs_reimbursement_user_info
         set
             update_by = #{updateBy}
             ,update_date = #{updateDate}
@@ -194,7 +199,7 @@
     <select id="queryById" resultType="com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementUserDTO">
         SELECT
         <include refid="reimbursementUserColumns"/>
-            FROM zs_reimbursement_user_assess_info a
+            FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -205,7 +210,7 @@
     <select id="queryByUserIdAndYear" resultType="com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementUserDTO">
         SELECT
         <include refid="reimbursementUserColumns"/>
-            FROM zs_reimbursement_user_assess_info a
+            FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -216,7 +221,7 @@
     </select>
 
     <delete id="delete">
-        delete from zs_reimbursement_user_assess_info
+        delete from zs_reimbursement_user_info
         <where>
             <if test="idList != null and idList.size>0">
                 and id in
@@ -243,7 +248,7 @@
     <select id="getExistReimbursementUserList" resultType="com.jeeplus.test.reimbursementAssess.domain.dto.AssessReimbursementUserDTO">
         SELECT
         <include refid="reimbursementUserColumns"/>
-        FROM zs_reimbursement_user_assess_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -254,6 +259,7 @@
                 </foreach>
             </if>
             and a.year = #{year}
+            and office_type = #{officeType}
         </where>
     </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/service/AssessReimbursementUserService.java

@@ -82,5 +82,5 @@ public interface AssessReimbursementUserService {
      * 初始化部门人员报销数据信息（当年）
      * @param officeName 部门名称
      */
-    Map<String,Object> initialize(String officeName);
+    Map<String,Object> initialize(String officeName,String officeType);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementAssess/service/impl/AssessReimbursementUserServiceImpl.java

@@ -327,7 +327,7 @@ public class AssessReimbursementUserServiceImpl implements AssessReimbursementUs
 
     @Override
     @Transactional(readOnly = false)
-    public Map<String, Object> initialize(String officeName) {
+    public Map<String, Object> initialize(String officeName,String officeType) {
         Map<String,Object> map = new HashMap<>();
         //根据部门名称  查询所属部门
         List<OfficeDTO> officeListByOfficeName = officeService.getOfficeAllByOfficeName(officeName);
@@ -354,7 +354,7 @@ public class AssessReimbursementUserServiceImpl implements AssessReimbursementUs
             String year = String.valueOf(date.get(Calendar.YEAR));
 
             //根据人员id集合和年份查询已存在的人员信息
-            List<AssessReimbursementUserDTO> existReimbursementUserList = mapper.getExistReimbursementUserList(userIdList, year);
+            List<AssessReimbursementUserDTO> existReimbursementUserList = mapper.getExistReimbursementUserList(userIdList, year,officeType);
 
             //排除已存在的人员信息
             for (AssessReimbursementUserDTO existReimbursementUser: existReimbursementUserList) {
@@ -399,6 +399,7 @@ public class AssessReimbursementUserServiceImpl implements AssessReimbursementUs
                     userInfo.setReimbursementQuotaDay(reimbursementQuotaDay);
                     userInfo.setReimbursementAllDay(reimbursementAllDay);
                     userInfo.setReimbursementQuota(reimbursementQuotaB.toString());
+                    userInfo.setOfficeType(officeType);
                     userInfo.preInsert();
                     userInfoList.add(userInfo);
                 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/controller/ProjectReimbursementUserController.java

@@ -136,8 +136,8 @@ public class ProjectReimbursementUserController {
     @ApiLog("初始化部门人员报销数据信息（当年）")
     @PreAuthorize("hasAnyAuthority('project:reimbursementUser:add')")
     @PostMapping("initialize")
-    public ResponseEntity initialize() {
-        Map<String, Object> result = service.initialize("兴光项目");
+    public ResponseEntity initialize(String officeType) {
+        Map<String, Object> result = service.initialize("兴光项目",officeType);
         Boolean success = (Boolean) result.get("success");
         if(success){
             return ResponseEntity.ok(result.get("message"));

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

@@ -33,6 +33,7 @@ public class ProjectReimbursementBusinessDTO extends BaseEntity {
     private String reimbursementAmount;  //报销额度
     private String remainReimbursementAmount;  //剩余报销额度
     private String remarks; //备注
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
     /**
      * 报销开始日期
      */

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

@@ -32,6 +32,7 @@ public class ProjectReimbursementBusinessReturnDTO {
 
     private String userId;  //报销人员id
     private String year; //报销年份
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 
     /**
      * 报销开始日期

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

@@ -63,6 +63,7 @@ public class ProjectReimbursementUserDTO extends BaseEntity {
 
     private String surplusReimbursementAmount;  //剩余报销额度
     private String keyFlag; //用于判断使用
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 
 
 }

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

@@ -83,8 +83,9 @@ public interface ProjectReimbursementUserMapper extends BaseMapper<ProjectReimbu
      * 根据人员id集合和年份查询已存在的人员信息
      * @param userIdList
      * @param year
+     * @param officeType 1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估
      * @return
      */
-    List<ProjectReimbursementUserDTO> getExistReimbursementUserList(@Param("userIdList") List<String> userIdList, @Param("year") String year);
+    List<ProjectReimbursementUserDTO> getExistReimbursementUserList(@Param("userIdList") List<String> userIdList, @Param("year") String year,@Param("officeType") String officeType);
 
 }

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

@@ -60,7 +60,7 @@
     <select id="getYearList" resultType="com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementUserDTO">
         SELECT
             <include refid="reimbursementUserColumns"/>
-        FROM zs_reimbursement_user_project_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -76,7 +76,7 @@
             a.year as year,
             ifnull(sum(a.reimbursement_amount),0) as alreadyReimbursementAmount,
             ifnull(sum(a.reimbursement_day),0) as alreadyReimbursementDay
-        FROM zs_reimbursement_business_project_info a
+        FROM zs_reimbursement_business_info a
         <where>
             a.del_flag = 0
             and a.user_id = #{userId}
@@ -90,7 +90,7 @@
     <select id="reimbursementUserByUserIdAndYear" resultType="com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementUserDTO">
         SELECT
             <include refid="reimbursementUserColumns"/>
-        FROM zs_reimbursement_user_project_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -100,7 +100,7 @@
     </select>
 
     <insert id="save">
-        insert into zs_reimbursement_business_project_info (
+        insert into zs_reimbursement_business_info (
             id,
             create_by,
             create_date,
@@ -116,7 +116,8 @@
             </if>
             reimbursement_type,
             reimbursement_fsalary,
-            reimbursement_amount
+            reimbursement_amount,
+            office_type
         )
         values
         (
@@ -135,7 +136,8 @@
             </if>
             #{reimbursementType},
             #{reimbursementFsalary},
-            #{reimbursementAmount}
+            #{reimbursementAmount},
+            #{officeType}
         )
     </insert>
 
@@ -195,7 +197,7 @@
 
     <select id="getAlreadyReimbursementQuotaByUserIdAndYear" resultType="java.lang.String">
         select ifnull(sum(a.reimbursement_amount),0)
-        from zs_reimbursement_business_project_info a
+        from zs_reimbursement_business_info a
         where a.del_flag = 0
         and a.user_id= #{userId}
         and a.year = #{year}
@@ -204,9 +206,10 @@
 
     <select id="getAlreadyReimbursementQuotaByBusinessCodeId" resultType="java.lang.String">
         select ifnull(sum(a.reimbursement_amount),0)
-        from zs_reimbursement_business_project_info a
+        from zs_reimbursement_business_info a
         where a.del_flag = 0
         and a.business_code_id= #{businessCodeId}
+        and office_type = #{officeType}
     </select>
 
     <select id="getGatheringStatusById" resultType="java.lang.String">

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

@@ -68,7 +68,7 @@
         ifnull(sum(zrbi.reimbursement_amount),0) as "alreadyReimbursementAmount",
         ifnull((a.reimbursement_quota - ifnull(sum(zrbi.reimbursement_amount),0)),0) as "remainReimbursementAmount",
         ifnull(( CONVERT ( a.reimbursement_quota / a.reimbursement_quota_day, DECIMAL ( 15, 2 )) - ifnull(sum( zrbi.reimbursement_day ),0)), 0 ) AS "surplusReimbursementDay"
-        FROM zs_reimbursement_user_project_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         left join sys_office so on so.id = su.office_id
         LEFT JOIN zs_reimbursement_business_project_info zrbi ON zrbi.user_id = a.user_id and zrbi.year = a.year
@@ -83,6 +83,7 @@
             <if test="reimbursementUser.officeId != null and reimbursementUser.officeId != ''">
                 and su.office_id in (select id from sys_office where del_flag = 0 and (id = #{reimbursementUser.officeId} or parent_ids like concat('%',#{reimbursementUser.officeId},'%')))
             </if>
+            and a.office_type = #{reimbursementUser.officeType}
         </where>
         group by a.user_id,a.year
         order by a.update_date desc,a.year desc, a.user_id asc
@@ -103,7 +104,7 @@
     </select>
 
     <insert id="save">
-        insert into zs_reimbursement_user_project_info (
+        insert into zs_reimbursement_user_info (
             id,
             create_by,
             create_date,
@@ -115,7 +116,8 @@
             year,
             reimbursement_quota,
             reimbursement_all_day,
-            reimbursement_quota_day
+            reimbursement_quota_day,
+            office_type
         )
         values
         (
@@ -130,12 +132,13 @@
             #{year},
             #{reimbursementQuota},
             #{reimbursementAllDay},
-            #{reimbursementQuotaDay}
+            #{reimbursementQuotaDay},
+            #{officeType}
         )
     </insert>
 
     <insert id="saveList">
-        insert into zs_reimbursement_user_project_info (
+        insert into zs_reimbursement_user_info (
         id,
         create_by,
         create_date,
@@ -147,7 +150,8 @@
         year,
         reimbursement_quota,
         reimbursement_all_day,
-        reimbursement_quota_day
+        reimbursement_quota_day,
+        office_type
         )
         values
         <foreach collection="reimbursementUserList" item="item" separator=",">
@@ -162,7 +166,8 @@
             #{item.year},
             #{item.reimbursementQuota},
             #{item.reimbursementAllDay},
-            #{item.reimbursementQuotaDay}
+            #{item.reimbursementQuotaDay},
+            #{item.officeType}
             )
         </foreach>
     </insert>
@@ -170,7 +175,7 @@
 
 
     <update id="update">
-        update zs_reimbursement_user_project_info
+        update zs_reimbursement_user_info
         set
             update_by = #{updateBy}
             ,update_date = #{updateDate}
@@ -194,7 +199,7 @@
     <select id="queryById" resultType="com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementUserDTO">
         SELECT
         <include refid="reimbursementUserColumns"/>
-            FROM zs_reimbursement_user_project_info a
+            FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -205,7 +210,7 @@
     <select id="queryByUserIdAndYear" resultType="com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementUserDTO">
         SELECT
         <include refid="reimbursementUserColumns"/>
-            FROM zs_reimbursement_user_project_info a
+            FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -216,7 +221,7 @@
     </select>
 
     <delete id="delete">
-        delete from zs_reimbursement_user_project_info
+        delete from zs_reimbursement_user_info
         <where>
             <if test="idList != null and idList.size>0">
                 and id in
@@ -243,7 +248,7 @@
     <select id="getExistReimbursementUserList" resultType="com.jeeplus.test.reimbursementProject.domain.dto.ProjectReimbursementUserDTO">
         SELECT
         <include refid="reimbursementUserColumns"/>
-        FROM zs_reimbursement_user_project_info a
+        FROM zs_reimbursement_user_info a
         <include refid="reimbursementUserJoinColumns"/>
         <where>
             a.del_flag = 0
@@ -254,6 +259,7 @@
                 </foreach>
             </if>
             and a.year = #{year}
+            and office_type = #{officeType}
         </where>
     </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/service/ProjectReimbursementUserService.java

@@ -82,5 +82,5 @@ public interface ProjectReimbursementUserService {
      * 初始化部门人员报销数据信息（当年）
      * @param officeName 部门名称
      */
-    Map<String,Object> initialize(String officeName);
+    Map<String,Object> initialize(String officeName,String officeType);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementProject/service/impl/ProjectReimbursementUserServiceImpl.java

@@ -326,7 +326,7 @@ public class ProjectReimbursementUserServiceImpl implements ProjectReimbursement
 
     @Override
     @Transactional(readOnly = false)
-    public Map<String, Object> initialize(String officeName) {
+    public Map<String, Object> initialize(String officeName,String officeType) {
         Map<String,Object> map = new HashMap<>();
         //根据部门名称  查询所属部门
         List<OfficeDTO> officeListByOfficeName = officeService.getOfficeAllByOfficeName(officeName);
@@ -353,7 +353,7 @@ public class ProjectReimbursementUserServiceImpl implements ProjectReimbursement
             String year = String.valueOf(date.get(Calendar.YEAR));
 
             //根据人员id集合和年份查询已存在的人员信息
-            List<ProjectReimbursementUserDTO> existReimbursementUserList = mapper.getExistReimbursementUserList(userIdList, year);
+            List<ProjectReimbursementUserDTO> existReimbursementUserList = mapper.getExistReimbursementUserList(userIdList, year,officeType);
 
             //排除已存在的人员信息
             for (ProjectReimbursementUserDTO existReimbursementUser: existReimbursementUserList) {
@@ -398,6 +398,7 @@ public class ProjectReimbursementUserServiceImpl implements ProjectReimbursement
                     userInfo.setReimbursementQuotaDay(reimbursementQuotaDay);
                     userInfo.setReimbursementAllDay(reimbursementAllDay);
                     userInfo.setReimbursementQuota(reimbursementQuotaB.toString());
+                    userInfo.setOfficeType(officeType);
                     userInfo.preInsert();
                     userInfoList.add(userInfo);
                 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/controller/ReimbursementUserController.java

@@ -138,8 +138,8 @@ public class ReimbursementUserController {
     @ApiLog("初始化部门人员报销数据信息（当年）")
     @PreAuthorize("hasAnyAuthority('reimbursementUser:add')")
     @PostMapping("initialize")
-    public ResponseEntity initialize() {
-        Map<String, Object> result = service.initialize("中审众环");
+    public ResponseEntity initialize(String officeType) {
+        Map<String, Object> result = service.initialize("中审众环",officeType);
         Boolean success = (Boolean) result.get("success");
         if(success){
             return ResponseEntity.ok(result.get("message"));

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/domain/dto/ReimbursementBusinessDTO.java

@@ -34,6 +34,7 @@ public class ReimbursementBusinessDTO extends BaseEntity {
     private String remainReimbursementAmount;  //剩余报销额度
     private String remarks; //备注
     private String reimbursementAddress;  //地区类型（0：正常报销；1：武汉）
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/domain/dto/ReimbursementBusinessReturnDTO.java

@@ -31,6 +31,7 @@ public class ReimbursementBusinessReturnDTO{
     private String reimbursementAddress; //报销来源
     private String reimbursementFsalary; //实发类型
     private String year; //报销年份
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 
     /**
      * 报销开始日期

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/domain/dto/ReimbursementUserDTO.java

@@ -69,5 +69,6 @@ public class ReimbursementUserDTO extends BaseEntity {
     private String surplusReimbursementAmount;  //剩余报销额度
     private String keyFlag; //用于判断使用
     private String reimbursementAddress; //报销类型 0：分所报销；1：总所报销
+    private String officeType; //部门类型（1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估）
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/mapper/ReimbursementUserMapper.java

@@ -88,8 +88,9 @@ public interface ReimbursementUserMapper extends BaseMapper<ReimbursementUserDTO
      * 根据人员id集合和年份查询已存在的人员信息
      * @param userIdList
      * @param year
+     * @param officeType 1:中审众环；2：兴光会计；3：兴光项目；4：兴光评估
      * @return
      */
-    List<ReimbursementUserDTO> getExistReimbursementUserList(@Param("userIdList") List<String> userIdList, @Param("year") String year);
+    List<ReimbursementUserDTO> getExistReimbursementUserList(@Param("userIdList") List<String> userIdList, @Param("year") String year ,@Param("officeType") String officeType);
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/mapper/xml/ReimbursementBusinessMapper.xml

@@ -120,7 +120,8 @@
             reimbursement_type,
             reimbursement_fsalary,
             reimbursement_address,
-            reimbursement_amount
+            reimbursement_amount,
+            office_type
         )
         values
         (
@@ -140,7 +141,8 @@
             #{reimbursementType},
             #{reimbursementFsalary},
             0,
-            #{reimbursementAmount}
+            #{reimbursementAmount},
+            #{officeType}
         )
     </insert>
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/mapper/xml/ReimbursementUserMapper.xml

@@ -90,6 +90,7 @@
             <if test="reimbursementUser.officeId != null and reimbursementUser.officeId != ''">
                 and su.office_id in (select id from sys_office where del_flag = 0 and (id = #{reimbursementUser.officeId} or parent_ids like concat('%',#{reimbursementUser.officeId},'%')))
             </if>
+            and a.office_type = #{reimbursementUser.officeType}
         </where>
         group by a.user_id,a.year
         order by a.update_date desc,a.year desc, a.user_id asc
@@ -122,7 +123,8 @@
             year,
             reimbursement_quota,
             reimbursement_all_day,
-            reimbursement_quota_day
+            reimbursement_quota_day,
+            office_type
         )
         values
         (
@@ -137,7 +139,8 @@
             #{year},
             #{reimbursementQuota},
             #{reimbursementAllDay},
-            #{reimbursementQuotaDay}
+            #{reimbursementQuotaDay},
+            #{officeType}
         )
     </insert>
 
@@ -154,7 +157,8 @@
         year,
         reimbursement_quota,
         reimbursement_all_day,
-        reimbursement_quota_day
+        reimbursement_quota_day,
+        office_type
         )
         values
         <foreach collection="reimbursementUserList" item="item" separator=",">
@@ -169,7 +173,8 @@
             #{item.year},
             #{item.reimbursementQuota},
             #{item.reimbursementAllDay},
-            #{item.reimbursementQuotaDay}
+            #{item.reimbursementQuotaDay},
+            #{item.officeType}
             )
         </foreach>
     </insert>
@@ -274,6 +279,7 @@
                 </foreach>
             </if>
             and a.year = #{year}
+            and office_type = #{officeType}
         </where>
     </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/service/ReimbursementUserService.java

@@ -95,5 +95,5 @@ public interface ReimbursementUserService {
      * 初始化部门人员报销数据信息（当年）
      * @param officeName 部门名称
      */
-    Map<String,Object> initialize(String officeName);
+    Map<String,Object> initialize(String officeName,String officeType);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/service/impl/ReimbursementUserServiceImpl.java

@@ -405,7 +405,7 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
 
     @Override
     @Transactional(readOnly = false)
-    public Map<String, Object> initialize(String officeName) {
+    public Map<String, Object> initialize(String officeName,String officeType) {
         Map<String,Object> map = new HashMap<>();
         //根据部门名称  查询所属部门
         List<OfficeDTO> officeListByOfficeName = officeService.getOfficeAllByOfficeName(officeName);
@@ -432,7 +432,7 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
             String year = String.valueOf(date.get(Calendar.YEAR));
 
             //根据人员id集合和年份查询已存在的人员信息
-            List<ReimbursementUserDTO> existReimbursementUserList = mapper.getExistReimbursementUserList(userIdList, year);
+            List<ReimbursementUserDTO> existReimbursementUserList = mapper.getExistReimbursementUserList(userIdList, year,officeType);
 
             //排除已存在的人员信息
             for (ReimbursementUserDTO existReimbursementUser: existReimbursementUserList) {
@@ -477,6 +477,7 @@ public class ReimbursementUserServiceImpl implements ReimbursementUserService {
                     userInfo.setReimbursementQuotaDay(reimbursementQuotaDay);
                     userInfo.setReimbursementAllDay(reimbursementAllDay);
                     userInfo.setReimbursementQuota(reimbursementQuotaB.toString());
+                    userInfo.setOfficeType(officeType);
                     userInfo.preInsert();
                     userInfoList.add(userInfo);
                 }