From e4af23ba1572cfbd4d509239ef79ee1ac03b4266 Mon Sep 17 00:00:00 2001
From: mythxb <mythxb@qq.com>
Date: Tue, 5 Sep 2023 16:18:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=A5=E8=81=8C=E8=BF=9B=E5=BA=A6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/user/ListDetailMapper.xml     | 6 ++++--
 .../src/main/resources/mapper/user/ListFactorMapper.xml     | 3 ++-
 .../main/java/com/rzyc/controller/PcPersonalController.java | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/inventory-dao/src/main/resources/mapper/user/ListDetailMapper.xml b/inventory-dao/src/main/resources/mapper/user/ListDetailMapper.xml
index 45a7eb1..86d1859 100644
--- a/inventory-dao/src/main/resources/mapper/user/ListDetailMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/user/ListDetailMapper.xml
@@ -484,8 +484,10 @@
 
   <!--履职详情-->
   <select id="countListDetail" resultType="java.lang.Long">
-    SELECT COUNT(*) FROM list_relation lr
-    WHERE lr.`target_id` = #{listFactorId}
+    SELECT COUNT(lr.`relation_id`)
+    FROM list_relation lr
+      left join listdetail ld on lr.`detail_id` = ld.`ListDetailId`
+    WHERE lr.`target_id` = #{listFactorId} and ld.`del_state` = 1
   </select>
 
   <!--履职详情-->
diff --git a/inventory-dao/src/main/resources/mapper/user/ListFactorMapper.xml b/inventory-dao/src/main/resources/mapper/user/ListFactorMapper.xml
index 76f8556..fb4f47e 100644
--- a/inventory-dao/src/main/resources/mapper/user/ListFactorMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/user/ListFactorMapper.xml
@@ -502,9 +502,10 @@
 
   <!--用户履职档案-->
   <select id="userListFactor" resultMap="FactorResultMap">
-    SELECT lr.`create_time` changeTime,lr.relation_id, lf.*
+    SELECT ld.`CreatedOn` changeTime,ld.`ListDetailId` relation_id, lf.*
     FROM ListFactor lf
     LEFT JOIN list_relation lr ON lf.ListFactorId = lr.`target_id` AND lr.`target_type` = 1
+    LEFT JOIN listdetail ld ON lr.`detail_id` = ld.`ListDetailId` AND ld.`del_state` = 1
     WHERE lf.`ListPerformId` = #{listPerformId}
     and lf.SysYear = #{time}
       and lf.del_state = 1
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
index bcbde43..209855e 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
@@ -653,6 +653,9 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
         MultiResult<ListDetailWithBLOBs> result = new MultiResult<>();
         List<ListDetailWithBLOBs> listDetails = listDetailMapper.factorDetail(listFactorId,"");
         if(listDetails.size() > 0){
+            for(ListDetailWithBLOBs listDetailWithBLOBs :listDetails ){
+                listDetailWithBLOBs.setWorktitle(listDetailWithBLOBs.getWorkcnt());
+            }
             result.setData(listDetails);
         }else{
             result.setCode(Code.NO_DATA.getCode());