From 57fb2aeca4344e70b811090ea683f05755cb80c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sun, 21 Apr 2024 14:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/controller/FlowLabourInfoController.java  |  5 +----
 .../jh/flow/mapper/FlowLabourInfoMapper.java       |  8 ++++++++
 .../jh/flow/service/IFlowLabourInfoService.java    | 14 +++++++++++---
 .../service/impl/FlowLabourInfoServiceImpl.java    | 14 +++++++++++++-
 .../resources/mapper/flow/FlowLabourInfoMapper.xml |  5 +++++
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/controller/FlowLabourInfoController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/controller/FlowLabourInfoController.java
index 7b82193c..2ff10d59 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/controller/FlowLabourInfoController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/controller/FlowLabourInfoController.java
@@ -115,10 +115,7 @@ public class FlowLabourInfoController extends BaseController
     @RateLimiter(count = 10, limitType = LimitType.IP)
     public AjaxResult findMyFlowLabours(@PathVariable("cardId") String cardId)
     {
-        FlowLabourInfo flowLabourInfo = new FlowLabourInfo();
-        flowLabourInfo.setLaborCardId(cardId);
-        List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo);
-        return success(list);
+        return success(flowLabourInfoService.selectFlowLabourInfoByCardId(cardId));
     }
 
     /**
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/mapper/FlowLabourInfoMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/mapper/FlowLabourInfoMapper.java
index 1e0fb1df..7bef48c4 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/mapper/FlowLabourInfoMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/mapper/FlowLabourInfoMapper.java
@@ -21,6 +21,14 @@ public interface FlowLabourInfoMapper
      */
     public FlowLabourInfo selectFlowLabourInfoById(Long id);
 
+    /**
+     * 身份证查询劳资投诉列表
+     *
+     * @param cardId 身份证号
+     * @return 劳资投诉
+     */
+    public List<FlowLabourInfo> selectFlowLabourInfoByCardId(String cardId);
+
     /**
      * 查询劳资投诉列表
      * 
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java
index b5267671..c6b445bf 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java
@@ -1,11 +1,11 @@
 package com.yanzhu.jh.flow.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.yanzhu.jh.flow.domain.FlowLabourInfo;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 劳资投诉Service接口
  * 
@@ -22,6 +22,14 @@ public interface IFlowLabourInfoService
      */
     public FlowLabourInfo selectFlowLabourInfoById(Long id);
 
+    /**
+     * 身份证查询劳资投诉列表
+     *
+     * @param cardId 身份证号
+     * @return 劳资投诉
+     */
+    public List<FlowLabourInfo> selectFlowLabourInfoByCardId(String cardId);
+
     /**
      * 查询劳资投诉列表
      * 
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java
index dc90fedb..e0004a5f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java
@@ -44,6 +44,18 @@ public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService
         return flowLabourInfoMapper.selectFlowLabourInfoById(id);
     }
 
+    /**
+     * 身份证查询劳资投诉列表
+     *
+     * @param cardId 身份证号
+     * @return 劳资投诉
+     */
+    @Override
+    public List<FlowLabourInfo> selectFlowLabourInfoByCardId(String cardId)
+    {
+        return flowLabourInfoMapper.selectFlowLabourInfoByCardId(cardId);
+    }
+
     /**
      * 查询劳资投诉列表
      * 
@@ -138,7 +150,7 @@ public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService
             //保存流程节点信息
             FlowLabourAuditNode flowLabourAuditNode = new FlowLabourAuditNode();
             flowLabourAuditNode.setFlowId(flowLabourInfo.getId());
-            flowLabourAuditNode.setFlowNode("10");
+            flowLabourAuditNode.setFlowNode("0");
             flowLabourAuditNode.setCreateBy(flowLabourInfo.getLaborName());
             flowLabourAuditNode.setCreateTime(new Date());
             flowLabourAuditNodeMapper.insertFlowLabourAuditNode(flowLabourAuditNode);
diff --git a/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
index 97cd6640..42811402 100644
--- a/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
@@ -145,6 +145,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFlowLabourInfoVo"/>
         where fl.id = #{id}
     </select>
+
+    <select id="selectFlowLabourInfoByCardId" parameterType="String" resultMap="FlowLabourInfoResult">
+        <include refid="selectFlowLabourInfoVo"/>
+        where fl.labor_cardId = #{cardId}
+    </select>
         
     <insert id="insertFlowLabourInfo" parameterType="FlowLabourInfo" useGeneratedKeys="true" keyProperty="id">
         insert into flow_labour_info