fix: 修复工资非零申报, 人员被删除

src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryController.java

@@ -335,6 +335,7 @@ public class BizFinancialSalaryController extends BaseController {
         return toAjax(bizFinancialSalaryDetailService.save(bizFinancialSalaryDetail) && addRecord(bizFinancialSalaryDetail.getFinancialSalaryId(), bizFinancialSalaryDetail.getYear(), bizFinancialSalaryDetail.getMonth(), SecurityUtils.getUserId(), "填写工资信息"));
     }
 
+    @Log(title = "生产管理-工资非零申报-更新", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('business:salary:edit')")
     @PostMapping("/updateDetail")
     @Transactional(rollbackFor = Exception.class)
@@ -342,6 +343,7 @@ public class BizFinancialSalaryController extends BaseController {
         return toAjax(bizFinancialSalaryDetailService.updateById(bizFinancialSalaryDetail) && addRecord(bizFinancialSalaryDetail.getFinancialSalaryId(), bizFinancialSalaryDetail.getYear(), bizFinancialSalaryDetail.getMonth(), SecurityUtils.getUserId(), "修改工资信息"));
     }
 
+    @Log(title = "生产管理-公司非零申报-审核通过", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('business:salary:verify')")
     @PostMapping("/verifyDetail")
     @Transactional(rollbackFor = Exception.class)
@@ -381,10 +383,11 @@ public class BizFinancialSalaryController extends BaseController {
         } else {
             bool = bool && addRecord(bizFinancialSalaryDetail.getFinancialSalaryId(), bizFinancialSalaryDetail.getYear(), bizFinancialSalaryDetail.getMonth(), SecurityUtils.getUserId(), "工资审核不通过");
         }
-        bool = bool && bizFinancialSalaryDetailService.updateById(bizFinancialSalaryDetail);
+        bool = bool && bizFinancialSalaryDetailService.updateById(bizFinancialSalaryDetail,true);
         return toAjax(bool);
     }
 
+    @Log(title = "生产管理-公司非零申报-退回", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('business:salary:verify')")
     @PostMapping("/turnBackDetail")
     @Transactional(rollbackFor = Exception.class)

src/main/java/cn/ezhizao/project/business/salary/service/IBizFinancialSalaryDetailService.java

@@ -30,5 +30,5 @@ public interface IBizFinancialSalaryDetailService extends IService<BizFinancialS
     public int physicalDelete(BizFinancialSalaryDetail bizFinancialSalaryDetail);
 
 
-
+    public boolean updateById(BizFinancialSalaryDetail bizFinancialSalaryDetail, Boolean deleteEmployeeFlag);
 }

src/main/java/cn/ezhizao/project/business/salary/service/impl/BizFinancialSalaryDetailServiceImpl.java

@@ -1,20 +1,15 @@
 package cn.ezhizao.project.business.salary.service.impl;
 
-import java.util.List;
-import javax.annotation.Resource;
-
-import cn.ezhizao.common.exception.ServiceException;
-import cn.ezhizao.common.utils.StringUtils;
-import cn.ezhizao.project.business.salary.domain.BizFinancialSalary;
+import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetail;
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetailEmployee;
-import cn.ezhizao.project.business.salary.mapper.BizFinancialSalaryDetailEmployeeMapper;
+import cn.ezhizao.project.business.salary.mapper.BizFinancialSalaryDetailMapper;
 import cn.ezhizao.project.business.salary.service.IBizFinancialSalaryDetailEmployeeService;
-import cn.ezhizao.project.business.salary.service.IBizFinancialSalaryService;
+import cn.ezhizao.project.business.salary.service.IBizFinancialSalaryDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import cn.ezhizao.project.business.salary.mapper.BizFinancialSalaryDetailMapper;
-import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetail;
-import cn.ezhizao.project.business.salary.service.IBizFinancialSalaryDetailService;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 工资报工信息Service业务层处理
@@ -66,21 +61,25 @@ public class BizFinancialSalaryDetailServiceImpl  extends ServiceImpl<BizFinanci
     }
 
     @Override
-    public boolean updateById(BizFinancialSalaryDetail bizFinancialSalaryDetail) {
+    public boolean updateById(BizFinancialSalaryDetail bizFinancialSalaryDetail, Boolean deleteEmployeeFlag) {
         boolean status = super.updateById(bizFinancialSalaryDetail);
-        BizFinancialSalaryDetailEmployee delCondition = new BizFinancialSalaryDetailEmployee();
-        delCondition.setFinancialSalaryDetailId(bizFinancialSalaryDetail.getId());
-        bizFinancialSalaryDetailEmployeeService.physicalDelete(delCondition);
-        List<BizFinancialSalaryDetailEmployee> employees = bizFinancialSalaryDetail.getDetails();
-        employees.forEach(l -> {
-            l.setFinancialSalaryDetailId(bizFinancialSalaryDetail.getId());
-            l.setCompanyId(bizFinancialSalaryDetail.getCompanyId());
-            l.setFinancialSalaryId(bizFinancialSalaryDetail.getFinancialSalaryId());
-        });
-        status = status && (employees.isEmpty() || bizFinancialSalaryDetailEmployeeService.saveBatch(employees));
+        if (deleteEmployeeFlag) {
+            BizFinancialSalaryDetailEmployee delCondition = new BizFinancialSalaryDetailEmployee();
+            delCondition.setFinancialSalaryDetailId(bizFinancialSalaryDetail.getId());
+            bizFinancialSalaryDetailEmployeeService.physicalDelete(delCondition);
+            List<BizFinancialSalaryDetailEmployee> employees = bizFinancialSalaryDetail.getDetails();
+            employees.forEach(l -> {
+                l.setFinancialSalaryDetailId(bizFinancialSalaryDetail.getId());
+                l.setCompanyId(bizFinancialSalaryDetail.getCompanyId());
+                l.setFinancialSalaryId(bizFinancialSalaryDetail.getFinancialSalaryId());
+            });
+            status = status && (employees.isEmpty() || bizFinancialSalaryDetailEmployeeService.saveBatch(employees));
+        }
         return status;
     }
 
-
-
+    @Override
+    public boolean updateById(BizFinancialSalaryDetail bizFinancialSalaryDetail) {
+        return this.updateById(bizFinancialSalaryDetail, true);
+    }
 }