|
@@ -118,12 +118,16 @@ public class SocialSecurityConfirmController extends BaseController {
|
|
BizSocialSecurityConfirmDetail detail = socialSecurityConfirmDetailService.query()
|
|
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();
|
|
.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) {
|
|
if (detail != null) {
|
|
|
|
+ //获取当前月份人员详情中不等于删除状态的人员
|
|
List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query()
|
|
List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query()
|
|
.eq("social_security_confirm_detail_id", detail.getId())
|
|
.eq("social_security_confirm_detail_id", detail.getId())
|
|
.ne("change_status",2)
|
|
.ne("change_status",2)
|
|
.list();
|
|
.list();
|
|
|
|
|
|
- employees.forEach(l -> l.setId(null));
|
|
|
|
|
|
+
|
|
|
|
+ employees.forEach(em->{
|
|
|
|
+ em.setId(null);
|
|
|
|
+ em.setChangeStatus(0);});
|
|
condition.setDetails(employees);
|
|
condition.setDetails(employees);
|
|
} else {
|
|
} else {
|
|
condition.setDetails(new ArrayList<>());
|
|
condition.setDetails(new ArrayList<>());
|