Browse Source

修正:缺陷流程入库失败代码修正

zhongwei
ty 4 months ago
parent
commit
a25ee54511
  1. 1
      hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/abstracts/ProcessAbstractService.java
  2. 4
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
  3. 11
      hzims-service/ticket/src/main/resources/db/3.0.0.sql

1
hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/abstracts/ProcessAbstractService.java

@ -48,6 +48,7 @@ public abstract class ProcessAbstractService implements ProcessService {
R r = new R(); R r = new R();
try { try {
R<BladeFlow> result = flowClient.startProcessInstanceContainNameByKey(dictValue, taskId, processName, variables); R<BladeFlow> result = flowClient.startProcessInstanceContainNameByKey(dictValue, taskId, processName, variables);
r.setSuccess(result.isSuccess());
r.setCode(result.getCode()); r.setCode(result.getCode());
r.setMsg(result.getMsg()); r.setMsg(result.getMsg());
// 更新任务流程Id // 更新任务流程Id

4
hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java

@ -373,7 +373,9 @@ public class DefectCheckServiceImpl extends ServiceImpl<OperPhenomenonMapper, Op
if (ObjectUtil.isNotEmpty(operPhenomenonEntity.getIsWarehousing()) && 1==(operPhenomenonEntity.getIsWarehousing())) { if (ObjectUtil.isNotEmpty(operPhenomenonEntity.getIsWarehousing()) && 1==(operPhenomenonEntity.getIsWarehousing())) {
OperDefectEntity operDefectEntity = new OperDefectEntity(); OperDefectEntity operDefectEntity = new OperDefectEntity();
BeanUtil.copy(operPhenomenonEntity, operDefectEntity); BeanUtil.copy(operPhenomenonEntity, operDefectEntity);
operDefectEntity.setProcessInstanceId(operPhenomenonEntity.getHandleTaskId().toString()); if (ObjectUtil.isNotEmpty(operPhenomenonEntity.getHandleTaskId())){
operDefectEntity.setHandleTaskId(operPhenomenonEntity.getHandleTaskId());
}
if(ObjectUtil.isNotEmpty(operPhenomenonEntity.getCheckHours())){ if(ObjectUtil.isNotEmpty(operPhenomenonEntity.getCheckHours())){
operDefectEntity.setActHours(operPhenomenonEntity.getCheckHours()); operDefectEntity.setActHours(operPhenomenonEntity.getCheckHours());
} }

11
hzims-service/ticket/src/main/resources/db/3.0.0.sql

@ -10,4 +10,13 @@ ALTER TABLE `hzims_work_ticket_info`
ALTER TABLE `hzims_standard_ticket_info` ALTER TABLE `hzims_standard_ticket_info`
ADD COLUMN `em_code` varchar(255) NULL COMMENT '设备编号' , ADD COLUMN `em_code` varchar(255) NULL COMMENT '设备编号' ,
ADD COLUMN `em_name` varchar(255) NULL COMMENT '设备名称' ; ADD COLUMN `em_name` varchar(255) NULL COMMENT '设备名称' ;
ALTER TABLE `hzims_oper_defect`
MODIFY COLUMN `TICKET_ID` varchar(255) NULL DEFAULT NULL COMMENT '工作票ID';
ALTER TABLE `hzims_oper_defect_statistics`
MODIFY COLUMN `TICKET_ID` varchar(255) NULL DEFAULT '' COMMENT '工作票ID' ;
ALTER TABLE `hzims_oper_appearance`
MODIFY COLUMN `TICKET_ID` varchar(255) NULL DEFAULT NULL COMMENT '工作票ID';

Loading…
Cancel
Save