From a25ee545117a2cb0e03511fe19858d7302237a14 Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Mon, 5 Aug 2024 15:14:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=85=A5=E5=BA=93=E5=A4=B1=E8=B4=A5=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/abstracts/ProcessAbstractService.java            |  1 +
 .../defect/service/impl/DefectCheckServiceImpl.java           |  4 +++-
 hzims-service/ticket/src/main/resources/db/3.0.0.sql          | 11 ++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/abstracts/ProcessAbstractService.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/abstracts/ProcessAbstractService.java
index cf363e4..9952839 100644
--- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/abstracts/ProcessAbstractService.java
+++ b/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();
         try {
             R<BladeFlow> result = flowClient.startProcessInstanceContainNameByKey(dictValue, taskId, processName, variables);
+            r.setSuccess(result.isSuccess());
             r.setCode(result.getCode());
             r.setMsg(result.getMsg());
             // 更新任务流程Id
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
index 859f999..f0355a4 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
+++ b/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())) {
             OperDefectEntity operDefectEntity = new OperDefectEntity();
             BeanUtil.copy(operPhenomenonEntity, operDefectEntity);
-            operDefectEntity.setProcessInstanceId(operPhenomenonEntity.getHandleTaskId().toString());
+            if (ObjectUtil.isNotEmpty(operPhenomenonEntity.getHandleTaskId())){
+            operDefectEntity.setHandleTaskId(operPhenomenonEntity.getHandleTaskId());
+            }
             if(ObjectUtil.isNotEmpty(operPhenomenonEntity.getCheckHours())){
                 operDefectEntity.setActHours(operPhenomenonEntity.getCheckHours());
             }
diff --git a/hzims-service/ticket/src/main/resources/db/3.0.0.sql b/hzims-service/ticket/src/main/resources/db/3.0.0.sql
index 364b1fd..983e8e9 100644
--- a/hzims-service/ticket/src/main/resources/db/3.0.0.sql
+++ b/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`
 ADD COLUMN `em_code` varchar(255) NULL COMMENT '设备编号' ,
-ADD COLUMN `em_name` varchar(255) NULL COMMENT '设备名称' ;
\ No newline at end of file
+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';