项目process微调

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/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/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;
+
     /**
      * 子节点
      */

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/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;
 	}
 

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}