质检资料上报时，监理单位人员可以审批

blade-service/blade-business/src/main/java/org/springblade/business/controller/EVisaTaskCheckController.java

@@ -60,6 +60,7 @@ public class EVisaTaskCheckController {
 
     private final JdbcTemplate jdbcTemplate;
 
+
     /**
      * 检查所选的流程环节处理人是否具有审批权限（三大填报页、日志列表的批量上报、首件列表的批量上报）
      */
@@ -80,7 +81,16 @@ public class EVisaTaskCheckController {
             //获取这些审批人在当前合同段的权限
             List<JSONObject> userRoleList = this.saveUserInfoByProjectClient.queryUserContractRole(customFlowUserList, json.getString("contractId"));
             if (userRoleList == null || userRoleList.size() <= 0) {
-                return R.data(300, false, "所选审批人均未找到当前表格所需要的签字岗位，请联系服务人员处理");
+                //查看当前项目下是否有监理合同段关联此合同段
+                Long contractId = jdbcTemplate.queryForObject("SELECT id from m_contract_info mci WHERE contract_type = 2 \n" +
+                        "and id in (SELECT contract_id_jlyz  FROM m_contract_relation_jlyz WHERE contract_id_sg = " + json.getString("contractId")+")",Long.class);
+                if (contractId == null) {
+                    return R.data(300, false, "所选审批人均未找到当前表格所需要的签字岗位，请联系服务人员处理");
+                }
+                userRoleList = this.saveUserInfoByProjectClient.queryUserContractRole(customFlowUserList, contractId+"");
+                if (userRoleList == null || userRoleList.size() <= 0){
+                    return R.data(300, false, "所选审批人均未找到当前表格所需要的签字岗位，请联系服务人员处理");
+                }
             }
 
             //获取电签配置
@@ -134,7 +144,16 @@ public class EVisaTaskCheckController {
             //获取这些审批人在当前合同段的权限
             List<JSONObject> userRoleList = this.saveUserInfoByProjectClient.queryUserContractRole(customFlowUserList, json.getString("contractId"));
             if (userRoleList == null || userRoleList.size() <= 0) {
-                return R.data(300, false, "所选审批人均未找到当前表格所需要的签字岗位，请联系服务人员处理");
+                //查看当前项目下是否有监理合同段关联此合同段
+                Long contractId = jdbcTemplate.queryForObject("SELECT id from m_contract_info mci WHERE contract_type = 2 \n" +
+                        "and id in (SELECT contract_id_jlyz  FROM m_contract_relation_jlyz WHERE contract_id_sg = " + json.getString("contractId")+")",Long.class);
+                if (contractId == null) {
+                    return R.data(300, false, "所选审批人均未找到当前表格所需要的签字岗位，请联系服务人员处理");
+                }
+                userRoleList = this.saveUserInfoByProjectClient.queryUserContractRole(customFlowUserList, contractId+"");
+                if (userRoleList == null || userRoleList.size() <= 0){
+                    return R.data(300, false, "所选审批人均未找到当前表格所需要的签字岗位，请联系服务人员处理");
+                }
             }
 
             //获取电签配置

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectCostBudgetServiceImpl.java

@@ -484,7 +484,7 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
             if (vo2ChildrenList != null && vo2ChildrenList.size() > 0){
                 //选出正在进行中的子计划id
                 List<Long> ids = vo2ChildrenList.stream().filter(l -> l.getStatus() != null && l.getStatus() != 1).map(ProjectCostBudgetVO2::getId).collect(Collectors.toList());
-                //清空除进行中之外的子计划的 员工任务信息表
+                //清空除进行中之外的子计划的成本测算 员工任务信息表
                 employeeTaskInfoService.deleteByBudgetParentId(ids,vo2.getId());
                 BigDecimal allTotal = new BigDecimal(0);
                 Boolean isTaskType = false;