From a185b002c0bb9e1a3c09601e61ce9b61efe4a2a7 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 七月 2025 17:23:24 +0800
Subject: [PATCH] art: 技术状态鉴定工单变更-接口问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
index b935a12..ae2a5c8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
@@ -10,7 +10,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.flowable.engine.TaskService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
@@ -76,8 +75,6 @@
private IFlowDefinitionService flowDefinitionService;
@Autowired
private IFlowMyBusinessService flowMyBusinessService;
- @Autowired
- private TaskService taskService;
@Autowired
private IFlowTaskService flowTaskService;
@Autowired
@@ -166,7 +163,7 @@
if (sysUser == null) {
throw new JeecgBootException("鐧诲綍鐢ㄦ埛淇℃伅涓虹┖锛屾搷浣滃け璐ワ紒");
}
- String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CHANG_CODE_RULE);
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CHANGE_CODE_RULE);
request.setChangeOrderNum(codeSeq);
request.setId(null);
request.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.WAIT_SUBMIT.name());
@@ -175,7 +172,7 @@
request.setApplyDate(new Date());
request.setFactoryOrgCode(equipment.getFactoryOrgCode());
//鎶�鏈姸鎬侀壌瀹氳〃
- EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_ORDER_CHANG.name());
+ EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_ORDER_CHANGE.name());
if (eamBaseHFCode == null) {
throw new JeecgBootException("鏈厤缃妧鏈姸鎬侀壌瀹氬彉鏇寸殑HF缂栫爜锛屾坊鍔犲け璐ワ紒");
}
@@ -200,6 +197,7 @@
}
entity.setApplyReason(request.getApplyReason());
entity.setDeferredEvaluationDate(request.getDeferredEvaluationDate());
+ entity.setRemark(request.getRemark());
this.getBaseMapper().updateById(entity);
return true;
}
@@ -393,6 +391,7 @@
entity.setDepartManagerSignatureTime(new Date());
entity.setDepartManagerSignatureResult(request.getDepartManagerSignatureResult());
entity.setDepartManagerComment(request.getDepartManagerComment());
+ values.put("departLeaderConfirmFlag", request.getEquipmentManagerSignatureResult());
if(BusinessCodeConst.APPROVED.equals(request.getDepartManagerSignatureResult())) {
//閫氳繃
entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.PRODUCTION_SUPPORT_SIGNING.name());
--
Gitblit v1.9.3