ly 1 жил өмнө
parent
commit
790ee37ef0

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

@@ -117,7 +117,10 @@ 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();
             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) {
             if (detail != null) {
-                List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query().eq("social_security_confirm_detail_id", detail.getId()).list();
+                List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query()
+                        .eq("social_security_confirm_detail_id", detail.getId())
+                        .ne("change_status",2).list();
+                        .list();
                 employees.forEach(l -> l.setId(null));
                 employees.forEach(l -> l.setId(null));
                 condition.setDetails(employees);
                 condition.setDetails(employees);
             } else {
             } else {