From 9dd577a05579d1280e76850d46897240340e0335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Wed, 4 Sep 2019 17:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dto/PartyMembersDTO.java  |  2 ++
 .../controller/PartyMembersController.java    |  2 +-
 .../esua/epdc/dao/PartyTagRelationDao.java    |  7 ++++--
 .../epdc/service/PartyTagRelationService.java |  5 +++-
 .../service/impl/PartyMembersServiceImpl.java | 15 +++++++++---
 .../impl/PartyTagRelationServiceImpl.java     |  5 ++++
 .../main/resources/mapper/PartyMembersDao.xml |  3 +++
 .../resources/mapper/PartyTagRelationDao.xml  | 23 +++++++++++++++++++
 8 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100755 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
index 9df45cd5f..768fa00d2 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
@@ -36,6 +36,8 @@ public class PartyMembersDTO implements Serializable {
 
 	private String tagIds;
 
+	private String[] tagIdsNew;
+
 	private String tagName;
 
 	private String id;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
index c18a36440..4269632ba 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
@@ -59,7 +59,7 @@ public class PartyMembersController {
     @GetMapping("{id}")
     public Result<PartyMembersDTO> get(@PathVariable("id") String id){
         PartyMembersDTO data = partyMembersService.get(id);
-
+        data.setTagIdsNew(data.getTagIds().split(","));
         return new Result<PartyMembersDTO>().ok(data);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java
index 8329ec861..8b9671825 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java
@@ -29,5 +29,8 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PartyTagRelationDao extends BaseDao<PartyTagRelationEntity> {
-	
-}
\ No newline at end of file
+
+    void deleteByPartyId(String partyId);
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java
index 2a82e316e..1f9bb16e5 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java
@@ -44,4 +44,7 @@ public interface PartyTagRelationService extends BaseService<PartyTagRelationEnt
     void update(PartyTagRelationDTO dto);
 
     void delete(String[] ids);
-}
\ No newline at end of file
+
+    void deleteByPartyId(String partyId);
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index e442eee5c..2108f5cad 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -107,10 +107,8 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         insert(entity);
 
         JSONArray jsonArray = JSON.parseArray(dto.getTagIds());
-
         for (int i = 0; i<jsonArray.size(); i++){
             String tagId = jsonArray.getString(i);
-
             PartyTagRelationDTO partyTagRelationDTO = new PartyTagRelationDTO();
             partyTagRelationDTO.setPartyId(entity.getId());
             partyTagRelationDTO.setTagId(tagId);
@@ -122,8 +120,19 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     @Transactional(rollbackFor = Exception.class)
     public void update(PartyMembersDTO dto) {
         PartyMembersEntity entity = ConvertUtils.sourceToTarget(dto, PartyMembersEntity.class);
-
         updateById(entity);
+
+        partyTagRelationService.deleteByPartyId(entity.getId());
+
+        JSONArray jsonArray = JSON.parseArray(dto.getTagIds());
+        for (int i = 0; i<jsonArray.size(); i++){
+            String tagId = jsonArray.getString(i);
+            PartyTagRelationDTO partyTagRelationDTO = new PartyTagRelationDTO();
+            partyTagRelationDTO.setPartyId(entity.getId());
+            partyTagRelationDTO.setTagId(tagId);
+            partyTagRelationService.save(partyTagRelationDTO);
+        }
+
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTagRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTagRelationServiceImpl.java
index bfb709377..e23082f28 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTagRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTagRelationServiceImpl.java
@@ -110,4 +110,9 @@ public class PartyTagRelationServiceImpl extends BaseServiceImpl<PartyTagRelatio
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteByPartyId(String partyId) {
+        baseDao.deleteByPartyId(partyId);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index 97da21ac0..8ddc60bba 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -61,6 +61,8 @@
         and pm.ID = partytag.PARTY_ID
         and tag.ID = partytag.TAG_ID
         and pm.DEL_FLAG = '0'
+        and partytag.DEL_FLAG = '0'
+        and tag.DEL_FLAG = '0'
         <if test="realName != null and realName != '' ">
             and pm.REAL_NAME = #{realName}
         </if>
@@ -100,6 +102,7 @@
         and pm.ID = partytag.PARTY_ID
 		and pm.ID = #{id}
 		and pm.DEL_FLAG = '0'
+		and partytag.DEL_FLAG = '0'
     </select>
 
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml
new file mode 100755
index 000000000..c559c0dbb
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.dao.PartyTagRelationDao">
+
+    <resultMap type="com.elink.esua.epdc.entity.PartyTagRelationEntity" id="partyTagRelationMap">
+        <result property="id" column="ID"/>
+        <result property="partyId" column="PARTY_ID"/>
+        <result property="tagId" column="TAG_ID"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+
+    <update id="deleteByPartyId">
+        UPDATE epdc_party_tag_relation SET DEL_FLAG = '1' WHERE PARTY_ID = #{partyId}
+    </update>
+
+
+</mapper>