ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 制修订流程结束后字段补全

Browse Source
This commit is contained in:
mzaxd
2023-12-28 11:53:26 +08:00
parent 6c7ff6e77b
commit eee50f7dbf
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
+6
View File
@@ -251,6 +251,12 @@ public class ProcessEsRevision implements Serializable {
@ApiModelProperty(value = "工作组")
private String workGroup;
/**
* 主起草人
*/
@ApiModelProperty(value = "主起草人")
private String mainDraftUser;
/**
* 总工程师
*/
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
+24 -1
View File
@@ -4,6 +4,8 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus;
import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision;
import com.jero.modules.activiti.process.esRevision.entity.vo.ReviewMeetingDetailVO;
@@ -17,11 +19,13 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService;
import com.jero.modules.laws.enterprise.util.BeanCopyUtils;
import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.tag.enums.TableNameEnum;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.ExecutionListener;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -69,8 +73,27 @@ public class ProcessESRevisionEndListener implements ExecutionListener {
JSON.parseObject(inspectContentJson, new TypeReference<List<LinkedHashMap<String, Object>>>() {});
variables.put(FieldCommon.CHECK_LIST, inspectContentList);
}
// 发布企标
// 将标准号进行拆分后填充字段
String standardNumber = (String) variables.get(FieldCommon.STANDARD_NUMBER);
if (StringUtils.isNotBlank(standardNumber)) {
Map<String, String> map = EnterpriseStandardUtil.splitStandardNumber(standardNumber);
variables.putAll(map);
// 如果没有主起草人，则需要填充主起草人
}
// 主起草人
String mainDraftUser = (String) variables.get(FieldCommon.MAIN_DRAFT_USER);
if (StringUtils.isBlank(mainDraftUser)) {
variables.put(FieldCommon.MAIN_DRAFT_USER, data.getMainDraftUser());
}
// 标准状态
String tryFlag = (String) variables.get(FieldCommon.TRY_FLAG);
if (tryFlag.equals(YesOrNoEnum.YES.getValue())) {
variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.TRIAL_OPERATION.getStateValue());
} else {
variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.RELEASE.getStateValue());
}
variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue());
// 发布企标
lawsCommonService.commonAdd(variables);
String espId = data.getEspId();
EnterpriseStandardPlan esp = espService.getById(espId);
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+1
View File
@@ -496,6 +496,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
break;
case MAIN_DRAFT_USER_RELEASE:
data = revisionData.getData();
data.setMainDraftUser(curUserId);
saveOrUpdate(data);
// TODO 在线编辑 插入签章
break;