From 0b138cd4aae3c20b41ff968a0f5b2684772059e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Mon, 19 Jun 2023 10:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AD=97=E6=AE=B5=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HyPartnerIntentInfoMapper.xml       |  6 +-----
 .../mapper/HyPartnerLineInfoMapper.xml         |  6 +++++-
 .../partner/PartnerLineInfoAndBaseInfoDTO.java | 18 ++++++++++++++++++
 .../com/cool/store/vo/PartnerIntentInfoVO.java | 14 --------------
 .../store/vo/PartnerLineInfoAndBaseInfoVO.java | 18 ++++++++++++++++++
 .../impl/HyPartnerIntentInfoServiceImpl.java   |  8 --------
 .../impl/HyPartnerLineInfoServiceImpl.java     | 10 ++++++++++
 .../cool/store/controller/ClerkController.java |  2 ++
 .../cool/store/controller/ZoneController.java  |  2 ++
 9 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
index c1da9edb2..dbb61371e 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
@@ -25,16 +25,12 @@
     <result column="weakness" jdbcType="VARCHAR" property="weakness" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="pass_cause" jdbcType="VARCHAR" property="passCause" />
-    <result column="pass_time" jdbcType="TIMESTAMP" property="passTime" />
-    <result column="pass_user" jdbcType="VARCHAR" property="passUser" />
-    <result column="pass_certify-file" jdbcType="VARCHAR" property="passCertifyFile" />
   </resultMap>
   <sql id="Base_Column_List">
     id, partner_id, partner_line_id, live_area, want_shop_area, accept_adjust_type, is_have_want_shop, 
     want_shop_info, max_budget, money_source, money_prove, education, work_year, is_have_work_exp, 
     work_exp, is_consumer, other_band, brand_strength, need_improve, strength, weakness, 
-    create_time, update_time,pass_cause,pass_time,pass_user,pass_certify-file
+    create_time, update_time
   </sql>
   <select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
     select
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 87872511e..239671482 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -297,7 +297,11 @@
       a.partner_id as partnerUserId,
       a.investment_manager as investmentManager,
       b.user_portrait as user_portrait,
-      b.id as partnerBaseInfoId
+      b.id as partnerBaseInfoId,
+      b.pass_reason as passReason,
+     b.certify_file as certifyFile,
+     b.pass_time as passTime,
+     b.pass_user_id as passUserId
     from hy_partner_line_info a inner join hy_partner_base_info b
     on a.id = b.partner_line_id
     <where>
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java
index 3895358ef..647f0f917 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java
@@ -3,6 +3,8 @@ package com.cool.store.dto.partner;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author suzhuhong
  * @Date 2023/6/12 16:05
@@ -43,5 +45,21 @@ public class PartnerLineInfoAndBaseInfoDTO {
     @ApiModelProperty("招商经理手机号")
     private String investmentManagerPhone;
     @ApiModelProperty("用户画像")
+
     private String userPortrait;
+
+    @ApiModelProperty("通过原因")
+    private String passCause;
+
+    @ApiModelProperty("通过时间")
+    private Date passTime;
+
+    @ApiModelProperty("通过人名称")
+    private String passUserName;
+
+    @ApiModelProperty("通过人ID")
+    private String passUserId;
+
+    @ApiModelProperty("通过证明")
+    private String passCertifyFile;
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
index da05c0b5d..803582259 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
@@ -88,19 +88,5 @@ public class PartnerIntentInfoVO {
     @ApiModelProperty("创建时间")
     private Date createTime;
 
-    @ApiModelProperty("通过原因")
-    private String passCause;
-
-    @ApiModelProperty("通过时间")
-    private Date passTime;
-
-    @ApiModelProperty("通过人名称")
-    private String passUserName;
-
-    @ApiModelProperty("通过人ID")
-    private String passUserId;
-
-    @ApiModelProperty("通过证明")
-    private String passCertifyFile;
 
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
index 7826b27ea..1484a5b4d 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -46,8 +47,25 @@ public class PartnerLineInfoAndBaseInfoVO {
 
     @ApiModelProperty("招商经理手机号")
     private String investmentManagerPhone;
+
     @ApiModelProperty("用户画像")
     private String userPortrait;
+
     @ApiModelProperty("线索状态")
     private Integer lineStatus;
+
+    @ApiModelProperty("通过原因")
+    private String passCause;
+
+    @ApiModelProperty("通过时间")
+    private Date passTime;
+
+    @ApiModelProperty("通过人名称")
+    private String passUserName;
+
+    @ApiModelProperty("通过人ID")
+    private String passUserId;
+
+    @ApiModelProperty("通过证明")
+    private List<String> passCertifyFile;
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
index bb6684601..c1000ecaa 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
@@ -108,10 +108,6 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerIntentInfoDO.getPartnerId());
         partnerIntentInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
         partnerIntentInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
-        EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(hyPartnerIntentInfoDO.getPassUser());
-        if (userInfo!=null){
-            partnerIntentInfoVO.setPassUserName(userInfo.getName());
-        }
         //todo su 手机号归属地 意向申请区域名称
         return partnerIntentInfoVO;
     }
@@ -214,10 +210,6 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         partnerIntentInfoVO.setOtherBand(hyPartnerIntentInfoDO.getOtherBand());
         partnerIntentInfoVO.setStrength(hyPartnerIntentInfoDO.getStrength());
         partnerIntentInfoVO.setNeedImprove(hyPartnerIntentInfoDO.getNeedImprove());
-        partnerIntentInfoVO.setPassCause(hyPartnerIntentInfoDO.getPassCause());
-        partnerIntentInfoVO.setPassCertifyFile(hyPartnerIntentInfoDO.getPassCertifyFile());
-        partnerIntentInfoVO.setPassUserId(hyPartnerIntentInfoDO.getPassUser());
-        partnerIntentInfoVO.setPassTime(hyPartnerIntentInfoDO.getPassTime());
         return partnerIntentInfoVO;
     }
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
index 385f487d8..f3f662f48 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -80,6 +80,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             partnerLineInfoAndBaseInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
             partnerLineInfoAndBaseInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
         }
+        EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId());
+        if (userInfo!=null){
+            partnerLineInfoAndBaseInfoVO.setPassUserName(userInfo.getName());
+        }
         //todo su 1、招商经理名称 手机号归属地  2、加盟商手机号归属地
         return partnerLineInfoAndBaseInfoVO;
     }
@@ -362,6 +366,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         partnerLineInfoAndBaseInfoVO.setPartnerBaseInfoId(partnerLineInfoAndBaseInfoDTO.getPartnerBaseInfoId());
         partnerLineInfoAndBaseInfoVO.setWorkflowStage(partnerLineInfoAndBaseInfoDTO.getWorkflowStage());
         partnerLineInfoAndBaseInfoVO.setWorkflowStatus(partnerLineInfoAndBaseInfoDTO.getWorkflowStatus());
+        partnerLineInfoAndBaseInfoVO.setPassCause(partnerLineInfoAndBaseInfoDTO.getPassCause());
+        if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile())){
+            partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile(), String.class));
+        }
+        partnerLineInfoAndBaseInfoVO.setPassUserId(partnerLineInfoAndBaseInfoDTO.getPassUserId());
+        partnerLineInfoAndBaseInfoVO.setPassTime(partnerLineInfoAndBaseInfoDTO.getPassTime());
         return partnerLineInfoAndBaseInfoVO;
     }
 
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java
index c2378f68b..f20a95cfc 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java
@@ -3,6 +3,7 @@ package com.cool.store.controller;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.HyPartnerClerkService;
 import com.cool.store.vo.PartnerClerkVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -21,6 +22,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
+@Api(tags = "店员")
 public class ClerkController {
 
     @Resource
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ZoneController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ZoneController.java
index 559c2cf1a..bdd180639 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ZoneController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ZoneController.java
@@ -7,6 +7,7 @@ import com.cool.store.service.ZoneService;
 import com.cool.store.vo.ZoneCheckVO;
 import com.cool.store.vo.ZoneVO;
 import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -23,6 +24,7 @@ import java.util.List;
  */
 @RestController
 @Slf4j
+@Api(tags = "战区")
 public class ZoneController {
 
     @Resource