Skip to content

Z
zlmy-cloud
Commit 6578a2f3 authored by 鲁鸿波's avatar 鲁鸿波
Browse files
Options

东北港口条件确认特殊判断

parent d5972a84
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 15 deletions
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java
View file @ 6578a2f3
......@@ -15,6 +15,7 @@ import com.testor.biz.sys.dict.data.model.domain.SysDictData;
import com.testor.biz.sys.user.model.domain.SysUser;
import com.testor.biz.sys.user.service.SysUserService;
import com.testor.common.constant.RemindConstants;
import com.testor.common.core.constant.Constants;
import com.testor.common.core.utils.StringUtils;
import com.testor.common.core.utils.poi.ExcelUtil;
import com.testor.common.util.BeanConverUtil;
......@@ -80,7 +81,6 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBody;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.Constants;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.stereotype.Service;
......@@ -669,20 +669,56 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
//判断当前是否为 较大和高风险
boolean isHighRisk = WorkLevelEnum.MEDIUM_RISK.getValue().equals(escalatedLevelValue) || WorkLevelEnum.HIGH_RISK.getValue().equals(escalatedLevelValue);
List<THazardConditionConfirmation> tHazardConditionConfirmations = tHazardConditionConfirmationService.list(new QueryWrapper<THazardConditionConfirmation>().eq(THazardConditionConfirmation.PLAN_ID, tHazardWorkPlan.getId())
.eq(THazardConditionConfirmation.BATCH, tHazardWorkPlan.getBatch())
.and(wrapper -> {
wrapper.in(THazardConditionConfirmation.WORK_TYPE_ID, dangeWorkTypes) //如果是进出仓
.isNotNull(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE) //作业现场负责人不能为空
//.ne(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE, "")
.or()
.notIn(THazardConditionConfirmation.WORK_TYPE_ID, dangeWorkTypes) //如果不为进出仓
.isNotNull(isHighRisk, THazardConditionConfirmation.DEPARTMENT_SIGNATURE) //安全管理部门不能为空
//.ne(isHighRisk, THazardConditionConfirmation.DEPARTMENT_SIGNATURE, "")
.isNotNull(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE); //作业现场负责人不能为空
//.ne(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE, "");
})
);
List<THazardConditionConfirmation> tHazardConditionConfirmations = new ArrayList<>();
//东北港口新流程图安全管理部门为空,防止orgId为空的时候无流程可走,默认走之前统一流程
boolean flag = false;
if(null != tHazardWorkPlan.getOrgId()){
NewSysOrg sysOrg = newSysOrgService.getById(tHazardWorkPlan.getOrgId());
log.info("危险作业流程--workProcessValidation---sysOrg:{}", JSON.toJSONString(sysOrg));
if(null != sysOrg){
if(null != sysOrg.getParentIds()){
if(sysOrg.getParentIds().contains(Constants.DBGK_ORG_ID) || sysOrg.getOrgId().equals(Constants.DBGK_ORG_ID)){
log.info("危险作业流程--workProcessValidation---sysOrg.getParentIds().contains(Constants.DBGK_ORG_ID) || sysOrg.getOrgId().equals(Constants.DBGK_ORG_ID)):{}", sysOrg.getParentIds().contains(Constants.DBGK_ORG_ID) || sysOrg.getOrgId().equals(Constants.DBGK_ORG_ID));
tHazardConditionConfirmations = tHazardConditionConfirmationService.list(new QueryWrapper<THazardConditionConfirmation>().eq(THazardConditionConfirmation.PLAN_ID, tHazardWorkPlan.getId())
.eq(THazardConditionConfirmation.BATCH, tHazardWorkPlan.getBatch())
.and(wrapper -> {
wrapper.in(THazardConditionConfirmation.WORK_TYPE_ID, dangeWorkTypes) //如果是进出仓
.isNotNull(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE) //作业现场负责人不能为空
//.ne(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE, "")
.or()
.notIn(THazardConditionConfirmation.WORK_TYPE_ID, dangeWorkTypes) //如果不为进出仓
//.ne(isHighRisk, THazardConditionConfirmation.DEPARTMENT_SIGNATURE, "")
.isNotNull(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE); //作业现场负责人不能为空
//.ne(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE, "");
})
);
flag = true;
}
}
}
}
log.info("危险作业流程--workProcessValidation---tHazardConditionConfirmations:{}", JSON.toJSONString(tHazardConditionConfirmations));
log.info("危险作业流程--workProcessValidation---flag {}", flag);
if(!flag){
tHazardConditionConfirmations = tHazardConditionConfirmationService.list(new QueryWrapper<THazardConditionConfirmation>().eq(THazardConditionConfirmation.PLAN_ID, tHazardWorkPlan.getId())
.eq(THazardConditionConfirmation.BATCH, tHazardWorkPlan.getBatch())
.and(wrapper -> {
wrapper.in(THazardConditionConfirmation.WORK_TYPE_ID, dangeWorkTypes) //如果是进出仓
.isNotNull(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE) //作业现场负责人不能为空
//.ne(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE, "")
.or()
.notIn(THazardConditionConfirmation.WORK_TYPE_ID, dangeWorkTypes) //如果不为进出仓
.isNotNull(isHighRisk, THazardConditionConfirmation.DEPARTMENT_SIGNATURE) //安全管理部门不能为空
//.ne(isHighRisk, THazardConditionConfirmation.DEPARTMENT_SIGNATURE, "")
.isNotNull(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE); //作业现场负责人不能为空
//.ne(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE, "");
})
);
}
log.info("危险作业流程--workProcessValidation---tHazardConditionConfirmations.size() < workTypesArrayLength :{},{}", tHazardConditionConfirmations.size(), workTypesArrayLength);
if (tHazardConditionConfirmations.size() < workTypesArrayLength) {
throw new ServiceException(new ResponseInfo(200, "涉及其他类型的条件确认未签字[serviceError]"));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment