瀏覽代碼

no message

ly 1 年之前
父節點
當前提交
4e3851464d

+ 5 - 2
src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundConfirmController.java

@@ -107,9 +107,12 @@ public class BizHousingFundConfirmController extends BaseController {
         if (details.isEmpty()) {
             // 获取上个月的人员信息
             // 先获取之前的一个月是否已填报,然后获取填报后的工资人员信息
-            BizHousingFundConfirmDetail detail = housingFundConfirmDetailService.query().eq("housing_fund_confirm_id", condition.getHousingFundConfirmId()).lt("concat(year,month)", condition.getYear() + condition.getMonth()).orderByDesc("concat(year, month)").last("limit 1").one();
+            BizHousingFundConfirmDetail detail = housingFundConfirmDetailService.query()
+                    .eq("housing_fund_confirm_id", condition.getHousingFundConfirmId())
+                    .lt("concat(year,month)", condition.getYear() + condition.getMonth()).orderByDesc("concat(year, month)").last("limit 1").one();
             if (detail != null) {
-                List<BizHousingFundConfirmDetailEmployee> employees = housingFundConfirmDetailEmployeeService.query().eq("housing_fund_confirm_detail_id", detail.getId()).list();
+                List<BizHousingFundConfirmDetailEmployee> employees = housingFundConfirmDetailEmployeeService.query()
+                        .eq("housing_fund_confirm_detail_id", detail.getId()).ne("change_status", 2).list();
                 employees.forEach(l -> l.setId(null));
                 condition.setDetails(employees);
             } else {