Forráskód Böngészése

fix:公积金人员详情,社保人员详情,本月数据查询时在复制上一个月人员数据时没有把status字段重置为0

ly 1 éve
szülő
commit
36e7fd8285

+ 3 - 1
src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundConfirmController.java

@@ -113,7 +113,9 @@ public class BizHousingFundConfirmController extends BaseController {
             if (detail != null) {
                 List<BizHousingFundConfirmDetailEmployee> employees = housingFundConfirmDetailEmployeeService.query()
                         .eq("housing_fund_confirm_detail_id", detail.getId()).ne("change_status", 2).list();
-                employees.forEach(l -> l.setId(null));
+                employees.forEach(em->{
+                    em.setId(null);
+                    em.setChangeStatus(0);});
                 condition.setDetails(employees);
             } else {
                 condition.setDetails(new ArrayList<>());

+ 5 - 1
src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityConfirmController.java

@@ -118,12 +118,16 @@ public class SocialSecurityConfirmController extends BaseController {
             BizSocialSecurityConfirmDetail detail = socialSecurityConfirmDetailService.query()
                     .eq("social_security_confirm_id", condition.getSocialSecurityConfirmId()).lt("concat(year,month)", condition.getYear() + condition.getMonth()).orderByDesc("concat(year, month)").last("limit 1").one();
             if (detail != null) {
+                //获取当前月份人员详情中不等于删除状态的人员
                 List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query()
                         .eq("social_security_confirm_detail_id", detail.getId())
                         .ne("change_status",2)
                         .list();
 
-                employees.forEach(l -> l.setId(null));
+
+                employees.forEach(em->{
+                    em.setId(null);
+                    em.setChangeStatus(0);});
                 condition.setDetails(employees);
             } else {
                 condition.setDetails(new ArrayList<>());