盛威

src/com/engine/salary/entity/salarysob/dto/SalaryApprovalDTO.java

@@ -36,6 +36,8 @@ public class SalaryApprovalDTO {
     // 审批项目信息
     private List<approvalItemGroup> approvalItemGroup;
 
+    private Boolean canEdit;
+
     /**
      * 审批项目信息分组形式
      */

src/com/engine/salary/service/SalaryApprovalRuleService.java

@@ -1,5 +1,6 @@
 package com.engine.salary.service;
 
+import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryitem.param.SalaryItemSearchParam;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
 import com.engine.salary.entity.salarysob.dto.SalaryApprovalDTO;
@@ -97,6 +98,13 @@ public interface SalaryApprovalRuleService {
 
     SalaryApprovalDTO getApprovalInfoByRecordId(Long salaryAcctRecordId);
 
+    /**
+     * 获取该核算记录是否可以编辑、核算
+     * @param salaryAcctRecordPO
+     * @return
+     */
+    boolean getRecordIsCanEdit(SalaryAcctRecordPO salaryAcctRecordPO);
+
     /**
      * 保存审批流程id
      * @param saveParam

src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java

@@ -158,6 +158,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         return ServiceUtil.getService(SalaryAcctResultTemplateServiceImpl.class, user);
     }
 
+    private SalaryApprovalRuleService getSalaryApprovalRuleService(User user) {
+        return ServiceUtil.getService(SalaryApprovalRuleServiceImpl.class, user);
+    }
+
     @Override
     public XSSFWorkbook exportSalaryAcctEmployee(SalaryAcctEmployeeQueryParam queryParam) {
         ValidUtil.doValidator(queryParam);
@@ -1011,6 +1015,12 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         if (salaryAcctRecordPO == null) {
             throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除"));
         }
+
+        // 校验是否可以编辑
+        boolean recordIsCanEdit = getSalaryApprovalRuleService(user).getRecordIsCanEdit(salaryAcctRecordPO);
+        if (StringUtils.equals("importSalaryAcctResult", importType) && !recordIsCanEdit) {
+            throw new SalaryRunTimeException("该核算记录已经发起审批，无法编辑或核算，请先删除审批流程");
+        }
         // 薪资账套下的薪资项目副本
         List<SalarySobItemPO> salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId());
         // 薪资项目

src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java

@@ -188,6 +188,10 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
         return ServiceUtil.getService(TaxAgentAdminServiceImpl.class, user);
     }
 
+    private SalaryApprovalRuleService getSalaryApprovalRuleService(User user) {
+        return ServiceUtil.getService(SalaryApprovalRuleServiceImpl.class, user);
+    }
+
 
     private SalaryCheckResultService salaryCheckResultService;
 
@@ -593,6 +597,12 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
         if (Objects.isNull(salaryAcctEmployeePO)) {
             throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "薪资核算人员不存在或已被删除"));
         }
+        // 校验是否可以编辑
+        SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(salaryAcctEmployeePO.getSalaryAcctRecordId());
+        boolean recordIsCanEdit = getSalaryApprovalRuleService(user).getRecordIsCanEdit(salaryAcctRecordPO);
+        if (!recordIsCanEdit) {
+            throw new SalaryRunTimeException("该核算记录已经发起审批，无法编辑或核算，请先删除审批流程");
+        }
         // 查询原来的薪资核算结果
         List<SalaryAcctResultPO> salaryAcctResultPOSOld = getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctEmpId(saveParam.getSalaryAcctEmpId()).build());
         // 解密

src/com/engine/salary/service/impl/SalaryApprovalRuleServiceImpl.java

@@ -17,11 +17,17 @@ import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.salaryacct.SalaryAcctRecordMapper;
 import com.engine.salary.mapper.salarysob.SalaryApprovalRuleMapper;
 import com.engine.salary.service.*;
+import com.engine.salary.sys.constant.SalarySysConstant;
+import com.engine.salary.sys.entity.po.SalarySysConfPO;
+import com.engine.salary.sys.service.SalarySysConfService;
+import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
 import com.engine.salary.util.JsonUtil;
 import com.engine.salary.util.db.IdGenerator;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.valid.ValidUtil;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import weaver.conn.RecordSet;
 import weaver.hrm.User;
 
 import java.util.Collection;
@@ -62,6 +68,10 @@ public class SalaryApprovalRuleServiceImpl extends Service implements SalaryAppr
         return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
     }
 
+    private SalarySysConfService getSalarySysConfService(User user) {
+        return ServiceUtil.getService(SalarySysConfServiceImpl.class, user);
+    }
+
     @Override
     public List<SalaryApprovalRulePO> listAll() {
         return getSalaryApprovalRuleMapper().listAll();
@@ -183,7 +193,32 @@ public class SalaryApprovalRuleServiceImpl extends Service implements SalaryAppr
         SalaryApprovalRulePO approvalRulePO = getBySalarySobId(acctRecordPO.getSalarySobId());
 
         List<SalaryItemPO> salaryItemList = getSalaryItemService(user).listAll();
-        return SalaryApprovalBO.convert2DTO(approvalRulePO, salaryItemList);
+        SalaryApprovalDTO salaryApprovalDTO = SalaryApprovalBO.convert2DTO(approvalRulePO, salaryItemList);
+        // 查询是否可以核算、编辑(默认开启)
+        salaryApprovalDTO.setCanEdit(getRecordIsCanEdit(acctRecordPO));
+        return salaryApprovalDTO;
+    }
+
+    public boolean getRecordIsCanEdit(SalaryAcctRecordPO acctRecordPO) {
+        // 审批总开关，默认关闭
+        SalarySysConfPO approvalStatus = getSalarySysConfService(user).getOneByCode(SalarySysConstant.SALARY_APPROVAL_STATUS);
+        if (approvalStatus == null || approvalStatus.getConfValue().equals("0")) {
+            return true;
+        }
+        // 查询是否可以核算、编辑(默认开启)
+        SalarySysConfPO canEdit = getSalarySysConfService(user).getOneByCode(SalarySysConstant.APPROVAL_CAN_EDIT_RESULT_STATUS);
+        if (canEdit == null || canEdit.getConfValue().equals("1")) {
+            return true;
+        } else {
+            // 发起审批后不能核损，判断流程id是否存在
+            if (StringUtils.isBlank(acctRecordPO.getApprovalId())) {
+                return true;
+            } else {
+                RecordSet rs = new RecordSet();
+                rs.execute("SELECT * FROM workflow_requestbase where REQUESTID =" + acctRecordPO.getApprovalId());
+                return !rs.next();
+            }
+        }
     }
 
     @Override

src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java

@@ -104,10 +104,20 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord
             // 规则设置中是否开启薪资审批按钮，默认关闭
             SalarySysConfPO salaryApprovalStatusConf = getSalarySysConfService(user).getOneByCode(SalarySysConstant.SALARY_APPROVAL_STATUS);
             List<Long> needApprovalSalarySobIds = new ArrayList<>();
+            // 默认可以重新核算、可以手动归档
+            boolean approvalCanReCalc = true;
+            boolean approvalCanFile = true;
             if (salaryApprovalStatusConf != null && salaryApprovalStatusConf.getConfValue().equals("1")) {
                 // 开启了薪资审批，获取这开启审批的账套id
                 List<SalaryApprovalRulePO> salaryApprovalRules = getSalaryApprovalRuleService(user).listBySalarySobIds(salarySobIds);
                 needApprovalSalarySobIds = salaryApprovalRules.stream().filter(po -> po.getOpenApproval().equals(1)).map(SalaryApprovalRulePO::getSalarySobId).collect(Collectors.toList());
+
+                // 获取 开启审批的核算记录允许重新核算设置，默认开启
+                SalarySysConfPO approvalCanReCalcFileStatusPO = getSalarySysConfService(user).getOneByCode(SalarySysConstant.APPROVAL_CAN_RE_CALC_STATUS);
+                approvalCanReCalc = approvalCanReCalcFileStatusPO == null ? true : approvalCanReCalcFileStatusPO.getConfValue().equals("1");
+                // 获取 开启审批的核算记录允许手动归档，默认开启
+                SalarySysConfPO approvalCanManualFileStatusPO = getSalarySysConfService(user).getOneByCode(SalarySysConstant.APPROVAL_CAN_MANUAL_FILE_STATUS);
+                approvalCanFile = approvalCanManualFileStatusPO == null ? true : approvalCanManualFileStatusPO.getConfValue().equals("1");
             }
             // 查询薪资核算记录的创建人员的人员信息
             List<Long> employeeIds = SalaryEntityUtil.properties(list, SalaryAcctRecordPO::getCreator, Collectors.toList());
@@ -120,13 +130,6 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord
 
             Set<Long> taxAgentIds = SalaryEntityUtil.properties(salarySobPOS, SalarySobPO::getTaxAgentId);
             List<TaxAgentPO> taxAgentPOS = getTaxAgentService(user).listByIds(taxAgentIds);
-
-            // 获取 开启审批的核算记录允许重新核算设置，默认开启
-            SalarySysConfPO approvalCanReCalcFileStatusPO = getSalarySysConfService(user).getOneByCode(SalarySysConstant.APPROVAL_CAN_RE_CALC_STATUS);
-            boolean approvalCanReCalc = approvalCanReCalcFileStatusPO == null ? true : approvalCanReCalcFileStatusPO.getConfValue().equals("1");
-            // 获取 开启审批的核算记录允许手动归档，默认开启
-            SalarySysConfPO approvalCanManualFileStatusPO = getSalarySysConfService(user).getOneByCode(SalarySysConstant.APPROVAL_CAN_MANUAL_FILE_STATUS);
-            boolean approvalCanFile = approvalCanManualFileStatusPO == null ? true : approvalCanManualFileStatusPO.getConfValue().equals("1");
             // 转换成列表dto
             List<SalaryAcctRecordListDTO> salaryAcctRecordListDTOS = SalaryAcctRecordBO.convert2ListDTO(list, salarySobPOS, employeeComInfos, salaryAcctEmployeeCountDTOS, salarySendCheckResult, taxAgentPOS, needApprovalSalarySobIds, approvalCanFile, approvalCanReCalc);
             dtoPage.setList(salaryAcctRecordListDTOS);

src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java

@@ -75,6 +75,10 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
         return ServiceUtil.getService(SalarySysConfServiceImpl.class, user);
     }
 
+    private SalaryApprovalRuleService getSalaryApprovalRuleService(User user) {
+        return ServiceUtil.getService(SalaryApprovalRuleServiceImpl.class, user);
+    }
+
     /**
      * 薪资核算列表
      *
@@ -211,6 +215,12 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
         List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).listAllForReport();
         calculateParam.setEmps(SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId));
 
+        // 校验是否可以编辑
+        SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(calculateParam.getSalaryAcctRecordId());
+        boolean recordIsCanEdit = getSalaryApprovalRuleService(user).getRecordIsCanEdit(salaryAcctRecordPO);
+        if (!recordIsCanEdit) {
+            throw new SalaryRunTimeException("该核算记录已经发起审批，无法编辑或核算，请先删除审批流程");
+        }
         //当前登陆人员
         DataCollectionEmployee simpleEmployee = new DataCollectionEmployee();
         simpleEmployee.setEmployeeId((long) user.getUID());