From 5d858b31dee51504a163b3de32e8212de7e2772c Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Fri, 22 Sep 2023 09:23:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?#poi=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hnac/hzims/operational/census/service/impl/TargetServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java
index 83aac67..aaafcdc 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java
@@ -149,7 +149,7 @@ public class TargetServiceImpl implements TargetService {
 			double sum = stationDevices.stream().mapToDouble(EminfoAndEmParamVo::getInstalledCapacity).sum();
 			item.setInstalledCapacity(sum);
 			// 装机容量详情
-			List<String> details = stationDevices.stream().map(device-> "[" + device.getName() + " " +device.getInstalledCapacity()  +"kw]").collect(Collectors.toList());
+			List<String> details = stationDevices.stream().map(device-> "[" + device.getName() + " " +device.getInstalledCapacity()  +"kW]").collect(Collectors.toList());
 			item.setDetail(String.join("|",details));
 			return item;
 		}).filter(capacity->Math.abs(capacity.getInstalledCapacity()) > 0).collect(Collectors.toList());

From e5f4ba9fa8e291622dcfcdd7a17c11da932d01ae Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Tue, 26 Sep 2023 08:27:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?#=20=E7=BA=BF=E4=B8=8B=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=A5=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workTicket/service/impl/OfflineTicketServiceImpl.java     |  2 +-
 .../ticket/workTicket/wrapper/WorkTicketInfoWrapper.java      | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

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 312edca..595a19d 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,7 +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()));
         ticketInfoEntity.setStepOperator(userName);
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 978d211..ec27c85 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
@@ -39,15 +39,8 @@ public class WorkTicketInfoWrapper extends BaseEntityWrapper<WorkTicketInfoEntit
 		}
 		User licensor = UserCache.getUser(workTicketInfoVO.getLicensor());
 		workTicketInfoVO.setLicensorName(Optional.ofNullable(licensor).map(User::getName).orElse(null));
-		/*完善班组成员名称，按逗号分隔*/
-		if(Func.isEmpty(workTicketInfoVO.getClassGroupMembers())){
-			workTicketInfoVO.setMembersName(workTicketInfoVO.getClassGroupMembersManual());
-		}
-		else{
-			String membersName = Optional.ofNullable(workTicketInfoVO.getClassGroupMembers()).map(ids -> {
-				return Arrays.stream(ids.split(",")).map(id->Optional.ofNullable(UserCache.getUser(Long.parseLong(id))).map(User::getName).orElse(id)).collect(Collectors.joining(","));
-			}).orElse(null);
-			workTicketInfoVO.setMembersName(membersName);
+		if(Func.isNotEmpty(workTicketInfoVO.getClassGroupMembersManual())){
+			workTicketInfoVO.setClassGroupMembersName(workTicketInfoVO.getClassGroupMembersManual());
 		}
 		/*完善票据来源、票据类型*/
 		workTicketInfoVO.setTypeName(DictCache.getValue(DictConstants.TICKET_TYPE,workTicketInfoVO.getType()));