From 6402a849c5cd7928d7ef316d38b5a12b45fb18ad Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Thu, 28 Sep 2023 09:46:41 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E7=BA=BF=E4=B8=8B=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=A5=A8=E6=B5=81=E7=A8=8B=E9=A2=84=E8=A7=88=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/operational/feign/IAccessTaskClient.java |  1 -
 .../workTicket/service/impl/OfflineTicketServiceImpl.java   |  1 +
 .../workTicket/service/impl/WorkTicketInfoServiceImpl.java  | 13 ++++++-------
 .../ticket/workTicket/wrapper/WorkTicketInfoWrapper.java    | 12 ++++--------
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java
index 9455567..d723454 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java
@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 /**
  * @author hx
  */
-@Repository
 @FeignClient(
 	value = OperationalConstants.APP_NAME
 )
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
index 03e7144..774fc57 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
@@ -71,6 +71,7 @@ public class OfflineTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMapp
     public boolean invoicing(WorkTicketInfoDto dto) {
         WorkTicketInfoEntity ticketInfoEntity = BeanUtil.copy(dto,WorkTicketInfoEntity.class);
         ticketInfoEntity.setCode(this.getTicketCode(ticketInfoEntity.getType(),ticketInfoEntity.getSignageCode()));
+        ticketInfoEntity.setStatus(WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_OPERATE.getStatus());
         ticketInfoEntity.setFlowStatus(WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_OPERATE.getStatus());
         ticketInfoEntity.setFlowTaskName(WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_OPERATE.getDescription());
         String userName = this.getLicensorNameByDept(Long.parseLong(AuthUtil.getDeptId()));
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
index a8ce5bf..5a34661 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
@@ -983,6 +983,8 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
             User user = UserCache.getUser(workTicketInfo.getLicensor());
             workTicketInfo.setLicensorName(user == null ? null : user.getName());
         }
+        // 工作负责人名称
+        workTicketInfo.setPrincipalName(Optional.ofNullable(workTicketInfo.getPrincipalManual()).filter(StringUtil::isNotBlank).orElse(workTicketInfo.getPrincipalName()));
 
         // 负责值班负责人
         if (workTicketInfo.getWatchPrincipal() != null) {
@@ -1019,14 +1021,11 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
             if (workTicketInfo.getTotalPerson() == null) {
                 workTicketInfo.setTotalPerson(sb.toString().trim().split(",").length);
             }
-
-            //成员信息
-            if (workTicketInfo.getClassGroupMembersName() == null) {
-                workTicketInfo.setClassGroupMembersName(sb.toString().endsWith(",") ? sb.toString().substring(0, sb.length() - 1) : sb.toString());
-            }
         }
-
-
+        workTicketInfo.setClassGroupMembersName(Optional.ofNullable(workTicketInfo.getClassGroupMembersManual()).filter(StringUtil::isNotBlank).orElse(workTicketInfo.getClassGroupMembersName()));
+        if(Func.isNotEmpty(workTicketInfo.getClassGroupMembersManual())) {
+            workTicketInfo.setTotalPerson(workTicketInfo.getClassGroupMembersManual().split(",").length);
+        }
         //负责人名称
         if (workTicketInfo.getPrincipalName() == null && workTicketInfo.getPrincipal() != null) {
             User user = UserCache.getUser(workTicketInfo.getPrincipal());
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java
index ec27c85..9d5452a 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java
@@ -25,20 +25,16 @@ public class WorkTicketInfoWrapper extends BaseEntityWrapper<WorkTicketInfoEntit
 	@Override
 	public WorkTicketInfoVO entityVO(WorkTicketInfoEntity entity) {
 		WorkTicketInfoVO workTicketInfoVO = BeanUtil.copy(entity,WorkTicketInfoVO.class);
-		User creator = UserCache.getUser(workTicketInfoVO.getCreateUser());
-		User updater = UserCache.getUser(workTicketInfoVO.getUpdateUser());
-		workTicketInfoVO.setCreateUserName(Optional.ofNullable(creator).map(User::getName).orElse(null));
-		workTicketInfoVO.setUpdateUserName(Optional.ofNullable(updater).map(User::getName).orElse(null));
+		workTicketInfoVO.setCreateUserName(Optional.ofNullable(workTicketInfoVO.getCreateUser()).map(UserCache::getUser).map(User::getName).orElse(null));
+		workTicketInfoVO.setUpdateUserName(Optional.ofNullable(workTicketInfoVO.getUpdateUser()).map(UserCache::getUser).map(User::getName).orElse(null));
 		/*完善负责人、许可人名称*/
 		if(Func.isEmpty(workTicketInfoVO.getPrincipal())){
 			workTicketInfoVO.setPrincipalName(workTicketInfoVO.getPrincipalManual());
 		}
 		else{
-			User principal = UserCache.getUser(workTicketInfoVO.getPrincipal());
-			workTicketInfoVO.setPrincipalName(Optional.ofNullable(principal).map(User::getName).orElse(null));
+			workTicketInfoVO.setPrincipalName(Optional.ofNullable(workTicketInfoVO.getPrincipal()).map(UserCache::getUser).map(User::getName).orElse(null));
 		}
-		User licensor = UserCache.getUser(workTicketInfoVO.getLicensor());
-		workTicketInfoVO.setLicensorName(Optional.ofNullable(licensor).map(User::getName).orElse(null));
+		workTicketInfoVO.setLicensorName(Optional.ofNullable(workTicketInfoVO.getLicensor()).map(UserCache::getUser).map(User::getName).orElse(null));
 		if(Func.isNotEmpty(workTicketInfoVO.getClassGroupMembersManual())){
 			workTicketInfoVO.setClassGroupMembersName(workTicketInfoVO.getClassGroupMembersManual());
 		}