Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili

 Conflicts:

	epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.16__self_org_category.sql

@@ -0,0 +1,6 @@
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526493468551626753', 'self_org_category', '社区自组织类别', '社区自组织类别：文化队伍、楼委会、老友俱乐部、治安巡逻队、其他', 1, 0, 0, '1', '2022-05-17 17:22:58', '1', '2022-05-17 17:22:58');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526495882432299010', 1526493468551626753, '楼委会', 'lwh', '0', '楼委会', 2, 0, 0, '1', '2022-05-17 17:32:34', '1', '2022-05-17 17:32:34');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526495969778679810', 1526493468551626753, '老友俱乐部', 'lyjlb', '0', '老友俱乐部', 3, 0, 0, '1', '2022-05-17 17:32:55', '1', '2022-05-17 17:32:55');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526496168622243842', 1526493468551626753, '其他', 'other', '0', '其他', 5, 0, 0, '1', '2022-05-17 17:33:42', '1', '2022-05-17 17:33:51');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526495766724034562', 1526493468551626753, '文化队伍', 'whdw', '0', '文化队伍', 1, 0, 0, '1', '2022-05-17 17:32:06', '1', '2022-05-17 17:32:40');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526496054369402882', 1526493468551626753, '治安巡逻队', 'zaxld', '0', '治安巡逻队', 4, 0, 0, '1', '2022-05-17 17:33:15', '1', '2022-05-17 17:33:24');

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectDTO.java

@@ -50,6 +50,8 @@ public class ProjectDTO implements Serializable {
      */
 	private String agencyId;
 
+	private String gridId;
+
     /**
      * 来源：议题issue
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectProcessDTO.java

@@ -109,6 +109,16 @@ public class ProjectProcessDTO implements Serializable {
      */
 	private String costWorkdays;
 
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位类型，1社区自组织，2联建单位
+     */
+    private String assistanceUnitType;
+
     /**
      * 删除标识：0.未删除 1.已删除
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitListFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/5/17 18:45
+ * @DESC
+ */
+@Data
+public class PartyUnitListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 8059924463686783668L;
+
+    /**
+     * 联建单位IDs
+     */
+    private List<String> partyUnitIds;
+
+    /**
+     * 社区自组织IDs
+     */
+    private List<String> communitySelfIds;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListResultDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/5/17 18:45
+ * @DESC
+ */
+@Data
+public class PartyUnitListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8059924463686783008L;
+
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位名字
+     */
+    private String assistanceUnitName;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -7,8 +7,10 @@ import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.AutoEvaluateDemandFormDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
+import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
+import com.epmet.dto.result.PartyUnitListResultDTO;
 import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallbackFactory;
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -107,4 +110,13 @@ public interface EpmetHeartOpenFeignClient {
 
     @PostMapping("/heart/icresidemanddict/demandoption")
     Result<List<OptionResultDTO>> getDemandOptions();
+
+    /**
+     * Desc: 获取联建单位名字
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/17 17:53
+     */
+    @PostMapping("/heart/icpartyunit/getPartyUnitList")
+    Result<List<PartyUnitListResultDTO>> getPartyUnitList(@RequestBody PartyUnitListFormDTO formDTO);
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java

@@ -8,13 +8,16 @@ import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.AutoEvaluateDemandFormDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
+import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
+import com.epmet.dto.result.PartyUnitListResultDTO;
 import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -108,4 +111,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result<List<OptionResultDTO>> getDemandOptions() {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "getDemandOptions", null);
     }
+
+    @Override
+    public Result<List<PartyUnitListResultDTO>> getPartyUnitList(PartyUnitListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "getPartyUnitList", formDTO);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@@ -1,20 +1,3 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.controller;
 
 import com.epmet.commons.rocketmq.messages.ServerSatisfactionCalFormDTO;
@@ -36,9 +19,11 @@ import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
+import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.dto.result.PartyUnitDistributionResultDTO;
+import com.epmet.dto.result.PartyUnitListResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.excel.IcPartyUnitExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -57,6 +42,7 @@ import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -267,4 +253,15 @@ public class IcPartyUnitController {
             }
         }
     }
+
+    /**
+     * Desc: 获取联建单位名字
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/17 17:53
+     */
+    @PostMapping("/getPartyUnitList")
+    public Result<List<PartyUnitListResultDTO>> getPartyUnitList(@RequestBody PartyUnitListFormDTO formDTO){
+        return new Result<List<PartyUnitListResultDTO>>().ok(icPartyUnitService.getPartyUnitList(formDTO));
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.dto.result.PartyUnitDistributionResultDTO;
+import com.epmet.dto.result.PartyUnitListResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,6 +28,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 联建单位
@@ -66,4 +68,20 @@ public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
     List<PartyUnitDistributionResultDTO> getDistribution(@Param("agencyId")String agencyId);
 
     int updateSatisfaction(@Param("partyUnitId") String serverId, @Param("satisfaction") BigDecimal satisfaction);
+
+    /**
+     * Desc: 获取联建单位名字
+     * @param ids
+     * @author zxc
+     * @date 2022/5/17 17:53
+     */
+    List<PartyUnitListResultDTO> getPartyUnitList(@Param("ids") List<String> ids);
+
+    /**
+     * Desc: 获取社区自组织名字
+     * @param ids
+     * @author zxc
+     * @date 2022/5/17 18:51
+     */
+    List<PartyUnitListResultDTO> getCommunitySelfList(@Param("ids") List<String> ids);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java

@@ -1,20 +1,3 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
@@ -25,8 +8,10 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
+import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.PartyUnitDistributionResultDTO;
+import com.epmet.dto.result.PartyUnitListResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import org.springframework.web.multipart.MultipartFile;
@@ -34,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 联建单位
@@ -158,4 +144,12 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
     void calPartyUnitSatisfation(ServerSatisfactionCalFormDTO formDTO);
 
     List<IcPartyUnitEntity> queryListById(List<String> partyUnitIds);
+
+    /**
+     * Desc: 获取联建单位名字
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/17 17:53
+     */
+    List<PartyUnitListResultDTO> getPartyUnitList(PartyUnitListFormDTO formDTO);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -51,8 +51,10 @@ import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
+import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.PartyUnitDistributionResultDTO;
+import com.epmet.dto.result.PartyUnitListResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceStatDTO;
@@ -594,6 +596,24 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         return Collections.EMPTY_LIST;
     }
 
+    /**
+     * Desc: 获取联建单位名字
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/17 17:53
+     */
+    @Override
+    public List<PartyUnitListResultDTO>getPartyUnitList(PartyUnitListFormDTO formDTO) {
+        List<PartyUnitListResultDTO> result = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(formDTO.getPartyUnitIds())){
+            result.addAll(baseDao.getPartyUnitList(formDTO.getPartyUnitIds()));
+        }
+        if (CollectionUtils.isNotEmpty(formDTO.getCommunitySelfIds())){
+            result.addAll(baseDao.getCommunitySelfList(formDTO.getCommunitySelfIds()));
+        }
+        return result;
+    }
+
     private String getServiceMatter(Map<String, String> map, String matter) {
         List<String> matters = Arrays.asList(matter.split(StrConstant.COLON));
         List<String> list = matters.stream().map(map::get).collect(Collectors.toList());

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.15__self_org_category.sql

@@ -0,0 +1,2 @@
+alter table ic_community_self_organization
+add COLUMN CATEGORY_CODE VARCHAR(32) DEFAULT NULL COMMENT '分类，来源于字典表dictType=self_org_category;';

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml

@@ -74,6 +74,34 @@
             ID
     </select>
 
+    <!-- 获取联建单位名字 -->
+    <select id="getPartyUnitList" resultType="com.epmet.dto.result.PartyUnitListResultDTO">
+        SELECT
+            ID AS assistanceUnitId,
+            UNIT_NAME AS assistanceUnitName
+        FROM ic_party_unit
+        WHERE DEL_FLAG = '0'
+          AND ID IN (
+              <foreach collection="ids" item="id" separator=",">
+                  #{id}
+              </foreach>
+            )
+    </select>
+
+    <!-- 获取社区自组织名字 -->
+    <select id="getCommunitySelfList" resultType="com.epmet.dto.result.PartyUnitListResultDTO">
+        SELECT
+            ID AS assistanceUnitId,
+            ORGANIZATION_NAME AS assistanceUnitName
+        FROM ic_community_self_organization
+        WHERE DEL_FLAG = '0'
+            AND ID IN (
+            <foreach collection="ids" item="id" separator=",">
+                #{id}
+            </foreach>
+            )
+    </select>
+
     <update id="updateSatisfaction" parameterType="map">
         update ic_party_unit
         set SATISFACTION=#{satisfaction},UPDATED_TIME=NOW()

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java

@@ -94,4 +94,14 @@ public class EventToProjectFormDTO implements Serializable {
 
     private String app;
     private String client;
+
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位类型，1社区自组织，2联建单位
+     */
+    private String assistanceUnitType;
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java

@@ -19,45 +19,32 @@ public class IcEventListFormDTO implements Serializable {
     /**
      * 所属小区ID
      */
-    private String villageId;
+    private String sourceType;
     /**
      * 所属楼宇Id
      */
-    private String buildId;
+    private String eventContent;
     /**
      * 单元id
      */
-    private String unitId;
-    /**
-     * 所属家庭Id
-     */
-    private String homeId;
-    /**
-     * 姓名
-     */
     private String name;
     /**
-     * 是否享受福利【否:0 是:1】
+     * 所属家庭Id
-     */
-    private String isWeifare;
-    /**
-     * 手机号
      */
     private String mobile;
-    /**
-     * 身份证号
-     */
-    private String idCard;
     /**
      * 起始迁入时间
      */
-    //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String startTime;
     /**
      * 终止迁入时间
      */
-    //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String endTime;
+    /**
+     * 手机号
+     */
+    private String status;
+
     /**
      * 页码
      */
@@ -68,15 +55,8 @@ public class IcEventListFormDTO implements Serializable {
     private Integer pageSize = 20;
 
     private Boolean isPage = true;
+
     private String customerId;
-    private String moveInId;
-    /**
-     * 当前登录用户id
-     */
     private String staffId;
-    /**
-     * 当前登录用户所属组织id
-     */
-    private String agencyId;
 
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java

@@ -73,7 +73,17 @@ public class ProjectApprovalFormDTO implements Serializable {
     /**
      * 网格ID
      */
-    @NotBlank(message = "网格ID不能为空",groups = {AddGroup.class})
+    @NotBlank(message = "网格ID不能为空",groups = {AddGroup.class,ProjectApprovalFormDTO.ApprovalCategory.class})
     private String gridId;
+
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位类型，1社区自组织，2联建单位
+     */
+    private String assistanceUnitType;
 }
 

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectManageListFormDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/5/17 14:14
+ * @DESC
+ */
+@Data
+public class ProjectManageListFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3317804468566708838L;
+
+    public interface ProjectManageListForm{}
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 转项目开始日期，eg：20220505
+     */
+    private String startDate;
+
+    /**
+     * 转项目结束日期，eg：20220505
+     */
+    private String endDate;
+
+    /**
+     * all：全部，closed：已关闭，pending：待处理
+     */
+    @NotBlank(message = "status不能为空",groups = ProjectManageListForm.class)
+    private String status;
+
+    private String userId;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java

@@ -1,7 +1,120 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
 import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 
+/**
+ * @Description 【迁入管理】列表--接口返参
+ * @Author sun
+ */
+@Data
 public class IcEventListResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 迁入Id
+     */
+    private String eventId;
+    /**
+     * 网格ID
+     */
+    private String gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
+    /**
+     * 所属小区ID
+     */
+    private String eventContent;
+    /**
+     * 所属小区名称
+     */
+    private List<String> imageList;
+    /**
+     * 所属小区名称
+     */
+    private List<String> voiceList;
+    /**
+     * 所属楼宇Id
+     */
+    private String sourceTypeName;
+    /**
+     * 所属楼宇名称
+     */
+    private String address;
+    /**
+     * 单元id
+     */
+    private String name;
+    /**
+     * 单元名称
+     */
+    private String mobile;
+    /**
+     * 所属家庭Id
+     */
+    private String satisfaction;
+    /**
+     * 所属家庭名称
+     */
+    private String isResiUser;
+    /**
+     * 所属家庭Id
+     */
+    private String status;
+    /**
+     * 姓名
+     */
+    private String createdUserId;
+
+    /**
+     * 迁入时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date inTime;
+
+    /**
+     * 迁入原因
+     */
+    private String inReason;
+
+    /**
+     * 来源地区编码
+     */
+    private String sourceAddressCode;
+    /**
+     * 来源地区编码全路径
+     */
+    private String sourceAddressPathCode;
+    /**
+     * 来源地区地址
+     */
+    private String sourceAddress;
+
+    /**
+     * 迁移证号码
+     */
+    private String moveNumber;
+
+    /**
+     * 户主姓名
+     */
+    private String householderName;
+
+    /**
+     * 与户主关系[字典表]
+     */
+    private String householderRelation;
+
+    /**
+     * 与户主关系[字典表]
+     */
+    private String householderRelationName;
 
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessListV2ResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -53,6 +54,23 @@ public class ProcessListV2ResultDTO implements Serializable {
      * 内部备注
      */
     private String internalRemark;
+
+    /**
+     * 协办单位类型，1社区自组织，2联建单位
+     */
+    @JsonIgnore
+    private String assistanceUnitType;
+
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位名字
+     */
+    private String assistanceUnitName;
+
     /**
      * 子节点
      */
@@ -76,6 +94,8 @@ public class ProcessListV2ResultDTO implements Serializable {
         this.departmentName = "";
         this.publicReply = "";
         this.internalRemark = "";
+        this.assistanceUnitName = "";
+        this.assistanceUnitId = "";
         this.publicFile = new ArrayList<>();
         this.internalFile = new ArrayList<>();
         this.subProcess = new ArrayList<>();

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java

@@ -0,0 +1,82 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/5/17 14:27
+ * @DESC
+ */
+@Data
+public class ProjectManageListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2374701362057175388L;
+
+    /**
+     * 所顺网格
+     */
+    private String gridName;
+    private String gridId;
+
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
+    /**
+     * 项目标题
+     */
+    private String title;
+
+    /**
+     * 转项目时间
+     */
+    private String shiftProjectTime;
+
+    /**
+     * 项目方案
+     */
+    private String projectScheme;
+
+    /**
+     * 内部备注
+     */
+    private String internalRemark;
+
+    /**
+     * 滞留天数
+     */
+    private Integer detentionDays;
+
+    /**
+     * 状态
+     */
+    private String status;
+    private String statusValue;
+
+    /**
+     * 处理部门
+     */
+    private List<String> departmentNameList;
+
+    private Date updatedTime;
+    private String isHandle;
+
+    public ProjectManageListResultDTO() {
+        this.gridName = "";
+        this.title = "";
+        this.shiftProjectTime = "";
+        this.projectScheme = "";
+        this.internalRemark = "";
+        this.detentionDays = NumConstant.ZERO;
+        this.status = "";
+        this.departmentNameList = new ArrayList<>();
+        this.projectId = "";
+    }
+}

epmet-module/gov-project/gov-project-server/pom.xml

@@ -24,6 +24,11 @@
             <artifactId>epmet-third-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-heart-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java

@@ -336,4 +336,18 @@ public class ProjectController {
     public Result<ProjectAuditResetResultDTO> eventAuditReset(@RequestParam("gridId")String gridId){
         return new Result<ProjectAuditResetResultDTO>().ok(projectService.eventAuditReset(gridId));
     }
+
+    /**
+     * Desc: 列表【项目管理】
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/17 14:19
+     */
+    @PostMapping("project-list")
+    public Result<PageData> projectList(@LoginUser TokenDto tokenDto,ProjectManageListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, ProjectManageListFormDTO.ProjectManageListForm.class);
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<PageData>().ok(projectService.projectList(formDTO));
+    }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.EventProjectInfoDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.ProjectStaffDTO;
-import com.epmet.dto.form.LatestListFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.PatrolProjectFormDTO;
-import com.epmet.dto.form.ProjectListFromDTO;
-import com.epmet.dto.form.ShiftProjectsFromDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -300,4 +297,6 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 */
 	Integer selectEventStatus(@Param("gridId") String gridId);
 
+	List<ProjectManageListResultDTO> getProjectManageList(ProjectManageListFormDTO formDTO);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java

@@ -45,6 +45,8 @@ public class ProjectEntity extends BaseEpmetEntity {
      */
 	private String agencyId;
 
+	private String gridId;
+
     /**
      * 来源：议题issue  项目立项:agency
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java

@@ -112,4 +112,14 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
 	 */
 	private Integer isSend;
 
+	/**
+	 * 协办单位ID
+	 */
+	private String assistanceUnitId;
+
+	/**
+	 * 协办单位类型，1社区自组织，2联建单位
+	 */
+	private String assistanceUnitType;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@@ -385,4 +385,12 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 */
 	ProjectAuditResetResultDTO eventAuditReset(String gridId);
 
+	/**
+	 * Desc: 列表【项目管理】
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2022/5/17 14:19
+	 */
+	PageData projectList(ProjectManageListFormDTO formDTO);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -32,6 +32,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
@@ -3170,6 +3171,56 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return result;
     }
 
+	/**
+	 * Desc: 列表【项目管理】,包括 待我处理的项目、我发起的项目、我参与的项目
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2022/5/17 14:19
+	 */
+    @Override
+    public PageData<ProjectManageListResultDTO> projectList(ProjectManageListFormDTO formDTO) {
+		PageData<ProjectManageListResultDTO> result = new PageData<>(new ArrayList<>(),NumConstant.ZERO);
+		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+		formDTO.setPageNo(pageIndex);
+		List<ProjectManageListResultDTO> projectManageList = baseDao.getProjectManageList(formDTO);
+		if (CollectionUtils.isNotEmpty(projectManageList)){
+			// 获取滞留天数
+			Integer days = getDays(ConvertUtils.sourceToTarget(formDTO, ProjectListFromDTO.class));
+			projectManageList.forEach(p -> {
+				// 所属网格赋值
+				if (StringUtils.isNotBlank(p.getGridId())){
+					GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(p.getGridId());
+					if (null == gridInfo){
+						throw new EpmetException("未查询到网格信息"+p.getGridId());
+					}
+					p.setGridName(gridInfo.getGridNamePath());
+				}
+				// 获取当前处理部门
+				List<String> departmentNameList = new ArrayList<>();
+				if (ProjectConstant.CLOSED.equals(p.getStatus())) {
+					p.setDepartmentNameList(departmentNameList);
+					p.setDetentionDays(NumConstant.ZERO);
+				} else {
+					ProjectDTO projectDTO = ConvertUtils.sourceToTarget(p, ProjectDTO.class);
+					projectDTO.setId(p.getProjectId());
+					if (p.getIsHandle().equals("unhandled")){
+						String detentionDays = getDetentionDays(projectDTO);
+						if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > days) {
+							p.setDetentionDays(Integer.valueOf(detentionDays));
+						} else {
+							p.setDetentionDays(Integer.valueOf(detentionDays));
+						}
+					}
+					departmentNameList = baseDao.selectDepartmentNameList(projectDTO);
+					p.setDepartmentNameList(departmentNameList);
+				}
+			});
+			result.setTotal(projectManageList.size());
+			result.setList(projectManageList);
+		}
+		return result;
+    }
+
     /**
 	 * @Description  区间项目分类数量处理
 	 * 查询的是时间段内的分类项目数，查询的时间 是传入一个日期，拼上时间，在进行比较大小

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@@ -111,6 +111,8 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 	private BlockChainUploadService blockChainUploadService;
 	@Autowired
 	private YuShanSysApiService yuShanSysApiService;
+	@Autowired
+	private EpmetHeartOpenFeignClient heartOpenFeignClient;
 
 
 	@Override
@@ -240,6 +242,30 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 				processList.forEach(p -> internalFiles.stream().filter(f -> p.getProcessId().equals(f.getProcessId())).forEach(f -> p.getInternalFile().add(f)));
 			}
 		}
+		// 协办单位名字赋值 协办单位类型，1社区自组织，2联建单位
+		Map<String, List<ProcessListV2ResultDTO>> groupByType = processList.stream().filter(p -> StringUtils.isNotBlank(p.getAssistanceUnitType())).collect(Collectors.groupingBy(ProcessListV2ResultDTO::getAssistanceUnitType));
+		List<ProcessListV2ResultDTO> oneType = groupByType.get(NumConstant.ONE_STR);
+		List<ProcessListV2ResultDTO> twoType = groupByType.get(NumConstant.TWO_STR);
+		PartyUnitListFormDTO partyUnitListFormDTO = new PartyUnitListFormDTO();
+		if (CollectionUtils.isNotEmpty(oneType)){
+			partyUnitListFormDTO.setCommunitySelfIds(oneType.stream().map(m -> m.getAssistanceUnitId()).collect(Collectors.toList()));
+		}
+		if (CollectionUtils.isNotEmpty(twoType)){
+			partyUnitListFormDTO.setPartyUnitIds(twoType.stream().map(m -> m.getAssistanceUnitId()).collect(Collectors.toList()));
+		}
+		Result<List<PartyUnitListResultDTO>> partyUnitListResult = heartOpenFeignClient.getPartyUnitList(partyUnitListFormDTO);
+		if (!partyUnitListResult.success()){
+			throw new EpmetException("查询协办单位失败");
+		}
+		if (CollectionUtils.isNotEmpty(partyUnitListResult.getData())){
+			partyUnitListResult.getData().forEach(u -> {
+				processList.forEach(p -> {
+					if (u.getAssistanceUnitId().equals(p.getAssistanceUnitId())){
+						p.setAssistanceUnitName(u.getAssistanceUnitName());
+					}
+				});
+			});
+		}
 		return processList;
 	}
 
@@ -382,6 +408,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		ProjectEntity projectEntity = new ProjectEntity();
 		projectEntity.setCustomerId(formDTO.getCustomerId());
 		projectEntity.setAgencyId(loginUser.getAgencyId());
+		projectEntity.setGridId(formDTO.getGridId());
 		if (ProjectConstant.WORK_EVENT.equals(formDTO.getType())) {
 			projectEntity.setOrigin(ProjectConstant.WORK_EVENT);
 			projectEntity.setOriginId(formDTO.getGridId());
@@ -407,6 +434,8 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		processEntity.setOperationName(ProjectConstant.OPERATION_PROJECT_APPROVAL);
 		processEntity.setPublicReply(formDTO.getPublicReply());
 		processEntity.setInternalRemark(formDTO.getInternalRemark());
+		processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
+		processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
 		agencyDeptGrid.getAgencyList().forEach(agency -> {
 			if (loginUser.getAgencyId().equals(agency.getId())) {
 				processEntity.setDepartmentName(agency.getOrganizationName());
@@ -675,6 +704,8 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 	public EventToProjectResultDTO eventToProject(EventToProjectFormDTO formDTO) {
 		//事件已经立项，不能重复操作
 		ResiEventEntity resiEventEntity=resiEventService.getById(formDTO.getEventId());
+		//TODO 兼容新事件表
+		String gridId = "";
 		if(null==resiEventEntity||resiEventEntity.getShiftProject()){
 			throw new RenException(EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getCode(),EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getMsg());
 		}
@@ -719,6 +750,7 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		projectEntity.setOriginId(formDTO.getEventId());
 		projectEntity.setTitle(formDTO.getTitle());
 		projectEntity.setBackGround(formDTO.getPublicReply());
+		projectEntity.setGridId(gridId);
 		projectEntity.setStatus(ProjectConstant.PENDING);
 		projectEntity.setOrgIdPath(loginUser.getOrgIdPath());
 		projectEntity.setLocateAddress(null == formDTO.getLocateAddress() ? "" : formDTO.getLocateAddress());
@@ -735,6 +767,8 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		processEntity.setOperationName(ProjectConstant.OPERATION_PROJECT_APPROVAL);
 		processEntity.setPublicReply(formDTO.getPublicReply());
 		processEntity.setInternalRemark(formDTO.getInternalRemark());
+		processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
+		processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
 		agencyDeptGrid.getAgencyList().forEach(agency -> {
 			if (loginUser.getAgencyId().equals(agency.getId())) {
 				processEntity.setDepartmentName(agency.getOrganizationName());

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.22__add_project_and_process.sql

@@ -0,0 +1,6 @@
+
+
+ALTER TABLE `project_process` ADD COLUMN `ASSISTANCE_UNIT_ID` VARCHAR(32) COMMENT '协办单位ID' AFTER `staff_id`;
+ALTER TABLE `project_process` ADD COLUMN `ASSISTANCE_UNIT_TYPE` VARCHAR(1) COMMENT '协办单位类型，1社区自组织，2联建单位' AFTER `ASSISTANCE_UNIT_ID`;
+ALTER TABLE `project` ADD COLUMN `GRID_ID` VARCHAR(32) DEFAULT'' COMMENT '网格ID' AFTER `AGENCY_ID`;
+

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -564,4 +564,29 @@
         AND p.status = 'pending'
         ORDER BY psp.created_time, p.created_time ASC<!-- 先按滞留时间降序再按创建时间升序 -->
     </select>
+
+    <!--  -->
+    <select id="getProjectManageList" resultType="com.epmet.dto.result.ProjectManageListResultDTO">
+        SELECT
+            p.TITLE,
+            p.GRID_ID,
+            (CASE WHEN p.STATUS = 'closed' THEN '已结案' ELSE '未结案' END) AS statusValue,
+            p.STATUS,
+            p.CREATED_TIME AS shiftProjectTime,
+            ps.IS_HANDLE,
+            ps.CREATED_TIME AS updatedTime,
+            t.* FROM
+            (SELECT
+                 DISTINCT pp.PROJECT_ID,
+                          pp.INTERNAL_REMARK,
+                          pp.PUBLIC_REPLY AS projectScheme
+             FROM project_process pp
+             WHERE DEL_FLAG = '0'
+               AND pp.STAFF_ID = #{userId}
+             ORDER BY pp.CREATED_TIME DESC) t
+                INNER JOIN project p ON p.ID = t.PROJECT_ID AND p.DEL_FLAG = '0'
+                LEFT JOIN project_staff ps ON ps.PROJECT_ID = t.PROJECT_ID AND ps.DEL_FLAG = '0'
+        GROUP BY t.PROJECT_ID
+        LIMIT #{pageNo}, #{pageSize}
+    </select>
 </mapper>

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml

@@ -95,7 +95,9 @@
             DEPARTMENT_NAME,
             PUBLIC_REPLY,
             INTERNAL_REMARK,
-            IS_SEND
+            IS_SEND,
+            ASSISTANCE_UNIT_TYPE,
+            ASSISTANCE_UNIT_ID
         FROM project_process
         WHERE DEL_FLAG = '0'
               AND PROJECT_ID = #{projectId}