From 2b6f97458858fe9b6316cba3d47bc4b0cb89c7b7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 9 Jun 2024 00:53:21 +0800
Subject: [PATCH] md

---
 .../emis/domain/EmisWaybillProblemInfo.java   |  9 +++++--
 .../EmisWaybillProblemFaqServiceImpl.java     | 27 ++++++++++++++++++-
 .../main/resources/mapper/EmisBaseMapper.xml  |  5 ++++
 .../mapper/EmisWaybillProblemInfoMapper.xml   |  4 ++-
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
index c4bd84763..d889d0bb7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
@@ -37,7 +37,7 @@ public class EmisWaybillProblemInfo extends BaseEntity
     private Long id;
     /* 运单号 */
     private String billCode;
-    /* 问题类型: 航班拉货 */
+    /* 问题类型id: 航班拉货 */
     private Integer problemType;
     /* 问题件标题 */
     private String problemTitle;
@@ -72,8 +72,11 @@ public class EmisWaybillProblemInfo extends BaseEntity
     private String reversionMan;
     /* 回复人代码 */
     private String reversionManCode;
+    /* 回复网点 */
+    private String reversionSiteCode;
     /* 回复日期 */
-    private String reversionDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reversionDate;
     /* 是否检查 0-否 1-是 */
     private String blCheckok;
     /* 是否查看 0-否 1-是 */
@@ -88,6 +91,8 @@ public class EmisWaybillProblemInfo extends BaseEntity
     private String registerManName;
     private String registerSiteName;
 
+    private String reversionSiteName;
+    private String registerManDeptName;
 
 
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java
index 0eb60d236..4184430b2 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java
@@ -10,7 +10,12 @@
 
 package com.xdadan.erp.emis.service.impl;
 
+import java.util.Date;
 import java.util.List;
+
+import com.xdadan.erp.emis.domain.EmisWaybillProblemInfo;
+import com.xdadan.erp.emis.mapper.EmisWaybillProblemInfoMapper;
+import com.xdadan.erp.emis.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisWaybillProblemFaq;
@@ -24,11 +29,15 @@ import com.xdadan.erp.emis.service.IEmisWaybillProblemFaqService;
  * @date 2024-05-20 09:36:48
  */
 @Service
-public class EmisWaybillProblemFaqServiceImpl implements IEmisWaybillProblemFaqService 
+public class EmisWaybillProblemFaqServiceImpl extends EmisBaseService implements IEmisWaybillProblemFaqService
 {
     @Autowired
     private EmisWaybillProblemFaqMapper emisWaybillProblemFaqMapper;
 
+    @Autowired
+    private EmisWaybillProblemInfoMapper emisWaybillProblemInfoMapper;
+
+
     /**
      * 查询问题件FAG
      * 
@@ -62,6 +71,22 @@ public class EmisWaybillProblemFaqServiceImpl implements IEmisWaybillProblemFaqS
     @Override
     public int insertEmisWaybillProblemFaq(EmisWaybillProblemFaq emisWaybillProblemFaq)
     {
+        // 更新问题件最后回复
+        EmisWaybillProblemInfo emisWaybillProblemInfo =
+                emisWaybillProblemInfoMapper.selectEmisWaybillProblemInfoById(emisWaybillProblemFaq.getProbId());
+
+        if(emisWaybillProblemInfo!=null){
+
+            EmisWaybillProblemInfo newEmisWaybillProblemInfo= new EmisWaybillProblemInfo();
+            newEmisWaybillProblemInfo.setId(emisWaybillProblemInfo.getId());
+            newEmisWaybillProblemInfo.setReversionDate(new Date());
+            newEmisWaybillProblemInfo.setReversionManCode(getCurrentUser().getEmpCode());
+            newEmisWaybillProblemInfo.setReversionSiteCode(getCurrentUser().getOwnerSiteCode());
+            newEmisWaybillProblemInfo.setBlReversion("1");
+
+            emisWaybillProblemInfoMapper.updateEmisWaybillProblemInfo(newEmisWaybillProblemInfo);
+        }
+
         return emisWaybillProblemFaqMapper.insertEmisWaybillProblemFaq(emisWaybillProblemFaq);
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
index d0f1118c4..5be762cf0 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
@@ -104,6 +104,11 @@
         select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
     </select>
 
+    <!--    查询员工部门(dept_name)  -->
+    <select id="selectDeptNameByEmpCode" parameterType="String" resultType="string">
+        select b.dept_name from sys_user a,sys_dept b where a.dept_id=b.dept_id and a.emp_code = #{code} limit 1
+    </select>
+
     <!--    查询员工(user_id)  -->
     <select id="selectEmpNameByUserId" parameterType="String" resultType="string">
         select a.emp_name from sys_user a where a.user_id = #{id} limit 1
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index 325943a4a..3e9cba036 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -24,6 +24,7 @@
         <result property="reversionStr"    column="reversion_str"    />
         <result property="reversionMan"    column="reversion_man"    />
         <result property="reversionManCode"    column="reversion_man_code"    />
+        <result property="reversionSiteCode"    column="reversion_site_code"    />
         <result property="reversionDate"    column="reversion_date"    />
         <result property="blCheckok"    column="bl_checkok"    />
         <result property="blSee"    column="bl_see"    />
@@ -33,7 +34,8 @@
         <association property="sendSiteName"    column="send_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
         <association property="registerSiteName"    column="register_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
         <association property="registerManName"    column="register_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
-
+        <association property="reversionSiteName"    column="register_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="registerManDeptName"    column="register_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectDeptNameByEmpCode"/>
 
     </resultMap>