From ea985e90736da6871338fbc8c20286acfedf2102 Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Fri, 19 Jan 2024 10:21:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E4=BF=AE=E6=94=B9im?=
 =?UTF-8?q?plementStatus=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java   |  2 +-
 .../service/impl/OperationTicketServiceImpl.java               | 10 +++++-----
 .../twoTicket/service/impl/TicketProcessServiceImpl.java       |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java
index ea16510..f748f3b 100644
--- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java
+++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java
@@ -498,7 +498,7 @@ public class WorkTicketInfoEntity extends TenantEntity implements Serializable {
 
     @ApiModelProperty("是否线下 ： 1-线下，0-线上")
     private Boolean isOffline;
-    @ApiModelProperty("0未执行，1为执行（运行人员确认过）")
+    @ApiModelProperty("0未执行，1为执行（运行人员确认过）,3为结束")
     private String implementStatus;
     @ApiModelProperty("创建人名称")
     private String createUserName;
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
index c3043fa..d4c5c2c 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
@@ -395,14 +395,14 @@ public class OperationTicketServiceImpl implements OperationTicketService {
      */
     private void saveStandardTicketInfo(StandardTicketInfoVo standardTicketInfoVo) {
         StandardTicketInfoEntity standardTicketInfo = new StandardTicketInfoEntity();
+        BeanUtils.copyProperties(standardTicketInfoVo, standardTicketInfo);
        //保存前保存对应用户得姓名
-        if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getCreateUser())){
             BladeUser user = AuthUtil.getUser();
             if (ObjectUtil.isNotEmpty(user.getUserName())){
                 standardTicketInfo.setCreateUserName(user.getUserName());
                 standardTicketInfo.setUpdateUserName(user.getUserName());
             }
-        }
+
         /*发令人、受令人、负责人、监护人*/
         if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getIssueOrderPerson())) {
             User issueOrderPerson = UserCache.getUser(standardTicketInfoVo.getIssueOrderPerson());
@@ -413,17 +413,17 @@ public class OperationTicketServiceImpl implements OperationTicketService {
         if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getAccessOrderPerson())) {
             User accessOrderPerson = UserCache.getUser(standardTicketInfoVo.getAccessOrderPerson());
             if (ObjectUtil.isNotEmpty(accessOrderPerson)){
-                standardTicketInfo.setIssueOrderPersonName(accessOrderPerson.getName());
+                standardTicketInfo.setAccessOrderPersonName(accessOrderPerson.getName());
             }
         }
 
         if(ObjectUtil.isNotEmpty(standardTicketInfoVo.getGuardian())) {
             User guardian = UserCache.getUser(standardTicketInfoVo.getGuardian());
             if (ObjectUtil.isNotEmpty(guardian)){
-                standardTicketInfo.setIssueOrderPersonName(guardian.getName());
+                standardTicketInfo.setGuardianName(guardian.getName());
             }
         }
-        BeanUtils.copyProperties(standardTicketInfoVo, standardTicketInfo);
+
         boolean save = standardTicketInfoService.save(standardTicketInfo);
         if (!save) {
             throw new ServiceException("Save failed");
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java
index 1a55a22..a5f1495 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java
@@ -589,6 +589,7 @@ public class TicketProcessServiceImpl implements TicketProcessService {
             workTicket.setNextStepOperator(" ");
             workTicket.setStepOperator(" ");
             workTicket.setFlowStatus(999);
+            workTicket.setImplementStatus("3");
         } else {
             workTicket.setFlowTaskId(taskId);
             workTicket.setFlowTaskName(response.getTaskName());