From 63c10e35bfbe35cdecc2964ada57fa6fe3a1a498 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 8 Dec 2023 15:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7userName=E6=9B=BF=E6=8D=A2use?=
 =?UTF-8?q?rId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/device/domain/EquPlan.java         | 6 +++---
 .../src/main/java/com/op/device/domain/dto/PDADTO.java      | 1 +
 .../java/com/op/device/service/impl/EquPlanServiceImpl.java | 6 +++---
 .../op/device/service/impl/EquUpkeepOrderServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/device/EquOrderMapper.xml     | 4 ++--
 .../src/main/resources/mapper/device/PersonMapper.xml       | 1 +
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
index a630e7d8..ea70141f 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
@@ -131,7 +131,7 @@ public class EquPlan extends BaseEntity {
 
 	private List<Date> planTimeArray;
 
-	private List<Long> personListVO;
+	private List<String> personListVO;
 
 	private String workCenterName;
 
@@ -285,11 +285,11 @@ public class EquPlan extends BaseEntity {
 		this.workCenterName = workCenterName;
 	}
 
-	public List<Long> getPersonListVO() {
+	public List<String> getPersonListVO() {
 		return personListVO;
 	}
 
-	public void setPersonListVO(List<Long> personListVO) {
+	public void setPersonListVO(List<String> personListVO) {
 		this.personListVO = personListVO;
 	}
 
diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java b/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java
index 9f07ce35..ee1d6463 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java
@@ -2,6 +2,7 @@ package com.op.device.domain.dto;
 
 // 手持传参dto
 public class PDADTO {
+    // 用户名
     private String userId;
     private String planType;
 
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
index e53f2be0..80d08108 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
@@ -306,9 +306,9 @@ public class EquPlanServiceImpl implements IEquPlanService {
         List<EquPlanPerson> personList = equPlanPersonMapper.selectEquPlanPersonByPlanCode(equPlan.getPlanCode());
 
         // 处理人员信息列表信息用于前端穿梭框信息回填
-        List<Long> persons = new ArrayList<>();
+        List<String> persons = new ArrayList<>();
         for (EquPlanPerson person : personList) {
-            persons.add(person.getUserId());
+            persons.add(person.getUserName());
         }
 
         // 通过计划编码获取设备信息列表
@@ -378,7 +378,7 @@ public class EquPlanServiceImpl implements IEquPlanService {
             EquPlanPerson equPlanPerson = new EquPlanPerson();
 
             equPlanPerson.setId(IdUtils.fastSimpleUUID());// id
-            equPlanPerson.setUserId(user.getUserId());// 用户id
+            equPlanPerson.setUserName(user.getUserName());// 用户名称
             equPlanPerson.setPlanCode(equPlan.getPlanCode());// 计划编码
             equPlanPerson.setFactoryCode(factory);// 工厂code
             equPlanPerson.setCreateBy(SecurityContextHolder.getUserName());
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java
index 631077cf..5018203a 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java
@@ -185,7 +185,7 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
             equOrderPerson.setId(IdUtils.fastSimpleUUID());// id
             equOrderPerson.setOrderCode(equOrder.getOrderCode());// 工单编码
             equOrderPerson.setFactoryCode(factory);// 工厂
-            equOrderPerson.setUserId(user.getUserId());// 用户id
+            equOrderPerson.setUserName(user.getUserName());// 用户名称
             equOrderPerson.setCreateBy(SecurityContextHolder.getUserName());
             equOrderPerson.setCreateTime(DateUtils.getNowDate());
             equOrderPerson.setUpdateBy(SecurityContextHolder.getUserName());
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
index 67861b0f..549eed37 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
@@ -140,14 +140,14 @@
 	<select id="selectTodayTask" parameterType="String" resultMap="EquOrderResult">
 		<include refid="selectEquOrderVo"/>
 		where plan_type = #{planType} and del_flag = '0' and order_status != '1' and order_code in (
-		select order_code from equ_order_person where del_flag = '0' and user_id = #{userId} GROUP BY order_code
+		select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code
 		)
 	</select>
 
 	<select id="selectTaskRecord" parameterType="String" resultMap="EquOrderResult">
 		<include refid="selectEquOrderVo"/>
 		where del_flag = '0' and order_status = '1' and plan_type = #{planType} and order_code in (
-		select order_code from equ_order_person where del_flag = '0' and user_id = #{userId} GROUP BY order_code
+		select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code
 		)
 	</select>
 
diff --git a/op-modules/op-device/src/main/resources/mapper/device/PersonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/PersonMapper.xml
index 48104b06..1fd25ef1 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/PersonMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/PersonMapper.xml
@@ -43,6 +43,7 @@
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="loginIp != null  and loginIp != ''"> and login_ip = #{loginIp}</if>
             <if test="loginDate != null "> and login_date = #{loginDate}</if>
+             and del_flag = '0'
         </where>
     </select>