From 3d863919849a8b9b9c0613c81b61377bfb66e78c Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 1 Dec 2020 11:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E6=B0=B4=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dto/ArchivesDeptDTO.java  |  7 +++++-
 .../entity/ArchivesDeptEntity.java            |  7 +++---
 .../service/impl/ArchivesDeptServiceImpl.java |  2 ++
 .../consumer/OrganizationModifyConsumer.java  |  6 -----
 .../resources/mapper/archives/ArchivesDao.xml | 22 ++++++++++---------
 .../mapper/archivesdept/ArchivesDeptDao.xml   |  1 +
 .../service/impl/ActApplyInfoServiceImpl.java |  7 +++++-
 7 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ArchivesDeptDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ArchivesDeptDTO.java
index add85a92..c0e8f7c2 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ArchivesDeptDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ArchivesDeptDTO.java
@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -47,6 +48,10 @@ public class ArchivesDeptDTO implements Serializable {
      * 排序
      */
     private Integer deptOrder;
+    /**
+     * 是否启用
+     */
+    private String enableFlag;
 
     /**
      * 归属部门ID
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/entity/ArchivesDeptEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/entity/ArchivesDeptEntity.java
index 7398406e..b8530ba4 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/entity/ArchivesDeptEntity.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/entity/ArchivesDeptEntity.java
@@ -18,13 +18,10 @@
 package com.elink.esua.epdc.modules.archivesdept.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 档案部门排序表
  *
@@ -53,4 +50,8 @@ public class ArchivesDeptEntity extends BaseEpdcEntity {
 	 */
 	private Integer deptOrder;
 
+    /**
+     * 是否启用
+     */
+    private String enableFlag;
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/service/impl/ArchivesDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/service/impl/ArchivesDeptServiceImpl.java
index 889aada4..03245492 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/service/impl/ArchivesDeptServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archivesdept/service/impl/ArchivesDeptServiceImpl.java
@@ -110,6 +110,8 @@ public class ArchivesDeptServiceImpl extends BaseServiceImpl<ArchivesDeptDao, Ar
         if(archivesDeptEntity==null){
             // 没有新增一条
             ArchivesDeptEntity archivesDept =new ArchivesDeptEntity();
+            //默认启用
+            archivesDept.setEnableFlag("1");
             archivesDept.setDept(dept);
             archivesDept.setDeptId(deptId);
             return insert(archivesDept);
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/OrganizationModifyConsumer.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/OrganizationModifyConsumer.java
index 3b5b66f5..fe4c744b 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/OrganizationModifyConsumer.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/rocketmq/consumer/OrganizationModifyConsumer.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant;
 import com.elink.esua.epdc.modules.archives.service.ArchivesService;
 import com.elink.esua.epdc.modules.archivesdept.service.ArchivesDeptService;
-import com.elink.esua.epdc.modules.dept.service.DeptInfoService;
 import com.elink.esua.epdc.modules.reportissue.service.ReportIssueService;
 import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -33,9 +32,6 @@ public class OrganizationModifyConsumer implements RocketMQListener<MessageExt>
     @Autowired
     private ArchivesDeptService archivesDeptService;
 
-    @Autowired
-    private DeptInfoService deptInfoService;
-
     @Autowired
     private ReportIssueService reportIssueService;
 
@@ -50,8 +46,6 @@ public class OrganizationModifyConsumer implements RocketMQListener<MessageExt>
             archivesService.modifyOrganizationInfo(dto);
             // 档案部门修改组织机构信息
             archivesDeptService.modifyOrganizationInfo(dto);
-            // 部门信息表修改组织机构信息
-            deptInfoService.modifyOrganizationInfo(dto);
             // 我要举报修改组织机构信息
             reportIssueService.modifyOrganizationInfo(dto);
             log.info("EPDC-CUSTOM-SERVER消费消息END：{topic:{}, msgId:{}, body:{}}", RocketMqConstant.MQ_TOPIC_ORGANIZATION, messageExt.getMsgId(), body);
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml
index 064382ba..1508c65b 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml
@@ -79,16 +79,18 @@
 
 
     <select id="selectListArchiveDeptInfo" resultType="com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO">
-    SELECT
-        DEPT,
-        DEPT_ID
-    FROM
-        epdc_archives_dept
-    WHERE
-        DEL_FLAG = '0'
-    ORDER BY
-        DEPT_ORDER ASC
-    LIMIT #{pageIndex},#{pageSize}
+        SELECT
+            ead.DEPT,
+            ead.DEPT_ID
+        FROM
+            epdc_archives_dept ead
+        left join epdc_archives ea on ead.DEPT_ID = ea.DEPT_ID and ea.DEL_FLAG='0'
+        WHERE
+            ead.DEL_FLAG = '0' and ea.ID is not null  and ead.ENABLE_FLAG ='1'
+        group by ead.DEPT_ID
+        ORDER BY
+            ead.DEPT_ORDER ASC
+        LIMIT #{pageIndex},#{pageSize}
     </select>
 
     <select id="selectListArchiveInfo" resultType="com.elink.esua.epdc.dto.result.ArchiveResultDTO">
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archivesdept/ArchivesDeptDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archivesdept/ArchivesDeptDao.xml
index 719a00a7..17b13eca 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archivesdept/ArchivesDeptDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archivesdept/ArchivesDeptDao.xml
@@ -7,6 +7,7 @@
         <result property="id" column="ID"/>
         <result property="dept" column="DEPT"/>
         <result property="deptOrder" column="DEPT_ORDER"/>
+        <result property="enableFlag" column="ENABLE_FLAG"/>
         <result property="deptId" column="DEPT_ID"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java
index 34c8d128..70023385 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java
@@ -83,9 +83,14 @@ public class ActApplyInfoServiceImpl extends BaseServiceImpl<ActApplyInfoDao, Ac
 
     private QueryWrapper<ActApplyInfoEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
-
+        String actTitle = (String) params.get("actTitle");
+        String actContacts = (String) params.get("actContacts");
+        String actTel = (String) params.get("actTel");
         QueryWrapper<ActApplyInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.like(StringUtils.isNotBlank(actTitle),"ACT_TITLE",actTitle);
+        wrapper.like(StringUtils.isNotBlank(actContacts),"ACT_CONTACTS",actContacts);
+        wrapper.like(StringUtils.isNotBlank(actTel),"ACT_TEL",actTel);
 
         return wrapper;
     }