Merge remote-tracking branch 'origin/dev_ic_mp' into develop

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/PartyServiceCenterDetailFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/28 5:05 下午
+ * @DESC
+ */
+@Data
+public class PartyServiceCenterDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 8849427528238500433L;
+
+    public interface PartyServiceCenterDetailForm{}
+
+    @NotBlank(message = "partyServiceCenterId不能为空",groups = PartyServiceCenterDetailForm.class)
+    private String partyServiceCenterId;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java

@@ -34,9 +34,13 @@ public class GridBaseInfoResultDTO implements Serializable {
      */
     private String code = "";
     /**
-     * 编码
+     * 网格类型 字典表value值
      */
     private String gridType = "";
+    /**
+     * 网格类型 字典表label值
+     */
+    private String gridTypeName = "";
     /**
      * 负责人
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java

@@ -70,9 +70,13 @@ public class GridDetailResultDTO implements Serializable {
      */
     private String code = "";
     /**
-     * 网格类型
+     * 网格类型 字典表value值
      */
     private String gridType = "";
+    /**
+     * 网格类型 字典表label值
+     */
+    private String gridTypeName = "";
     /**
      * 负责人
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java

@@ -229,5 +229,16 @@ public class IcPartyServiceCenterController {
         return new Result<List<AppointmentRecordResultDTO>>().ok(icPartyServiceCenterService.appointmentRecordMini(formDTO,tokenDto));
     }
 
+    /**
+     * @Description  党群服务中心详情
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/28 5:13 下午
+     */
+    @PostMapping("partyservicecenterdetail")
+    public Result<PartyServiceCenterListResultDTO> partyServiceCenterDetail(@RequestBody PartyServiceCenterDetailFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, PartyServiceCenterDetailFormDTO.PartyServiceCenterDetailForm.class);
+        return new Result<PartyServiceCenterListResultDTO>().ok(icPartyServiceCenterService.partyServiceCenterDetail(formDTO));
+    }
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPartyServiceCenterDao.java

@@ -43,6 +43,14 @@ public interface IcPartyServiceCenterDao extends BaseDao<IcPartyServiceCenterEnt
      */
     List<PartyServiceCenterListResultDTO> partyServiceCenterList(@Param("orgId")String orgId);
 
+    /**
+     * @Description  查询党群服务中心详情
+     * @param centerId
+     * @author zxc
+     * @date 2021/12/28 5:15 下午
+     */
+    PartyServiceCenterListResultDTO partyServiceCenterDetail(@Param("centerId")String centerId);
+
     /**
      * @Description  获取网格所属组织下所有的可预约事项
      * @param orgId

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java

@@ -183,4 +183,12 @@ public interface IcPartyServiceCenterService extends BaseService<IcPartyServiceC
      */
     List<AppointmentRecordResultDTO> appointmentRecordMini(AppointmentRecordMiniFormDTO formDTO,TokenDto tokenDto);
 
+    /**
+     * @Description  党群服务中心详情
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/28 5:13 下午
+     */
+    PartyServiceCenterListResultDTO partyServiceCenterDetail(PartyServiceCenterDetailFormDTO formDTO);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -43,6 +44,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerGridEntity;
+import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
@@ -51,6 +53,7 @@ import com.epmet.service.CustomerGridService;
 import com.epmet.util.ModuleConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -87,6 +90,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     private RedisUtils redisUtils;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private EpmetAdminOpenFeignClient adminOpenFeignClient;
 
     @Override
     public PageData<CustomerGridDTO> page(Map<String, Object> params) {
@@ -216,6 +221,12 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         //获取人员具体信息(头像、名字...)
         Result<List<StaffGridListDTO>> staffGridList = epmetUserFeignClient.getStaffGridList(customerStaffGridDTOS);
         griddetail.setStaffGridList(staffGridList.getData());
+        //查询网格类型字典表数据
+        Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode());
+        Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
+        if (StringUtils.isNotBlank(griddetail.getGridType())) {
+            griddetail.setGridTypeName(statusMap.get(griddetail.getGridType()));
+        }
         return new Result<GridDetailResultDTO>().ok(griddetail);
     }
 
@@ -356,7 +367,23 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
      **/
     @Override
     public Result<List<GridBaseInfoResultDTO>> getAllGridsByAgency(CommonAgencyIdFormDTO agencyFormDTO) {
-        return new Result<List<GridBaseInfoResultDTO>>().ok(baseDao.selectGridListByAgencyId(agencyFormDTO.getAgencyId(),null));
+        //1.查询组织下网格列表数据
+        List<GridBaseInfoResultDTO> list = baseDao.selectGridListByAgencyId(agencyFormDTO.getAgencyId(),null);
+        if (org.springframework.util.CollectionUtils.isEmpty(list)) {
+            return new Result<List<GridBaseInfoResultDTO>>();
+        }
+
+        //2.查询网格类型字典表数据
+        Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode());
+        Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
+
+        //3.封装数据并返回
+        list.forEach(l->{
+            if (StringUtils.isNotBlank(l.getGridType())) {
+                l.setGridTypeName(statusMap.get(l.getGridType()));
+            }
+        });
+        return new Result<List<GridBaseInfoResultDTO>>().ok(list);
     }
 
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

@@ -479,6 +479,17 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
         return new ArrayList<>();
     }
 
+    /**
+     * @Description  党群服务中心详情
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/28 5:13 下午
+     */
+    @Override
+    public PartyServiceCenterListResultDTO partyServiceCenterDetail(PartyServiceCenterDetailFormDTO formDTO) {
+        return baseDao.partyServiceCenterDetail(formDTO.getPartyServiceCenterId());
+    }
+
     public List<TimeDTO> getTimeList(String start,String end,Integer interval){
         List<TimeDTO> result = new ArrayList<>();
         List<String> intervalTimeList = getIntervalTimeList(start, end, interval);

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml

@@ -67,4 +67,36 @@
             AND c.DEL_FLAG = 0
             AND c.ORG_ID = #{orgId}
     </select>
+
+    <!-- 查询党群服务中心详情 -->
+    <resultMap id="partyServiceCenterDetailMap" type="com.epmet.dto.result.PartyServiceCenterListResultDTO">
+        <result property="partyServiceCenterId" column="partyServiceCenterId"/>
+        <result property="centerName" column="centerName"/>
+        <result property="workPhone" column="workPhone"/>
+        <result property="address" column="address"/>
+        <result property="amStartTime" column="amStartTime"/>
+        <result property="amEndTime" column="amEndTime"/>
+        <result property="pmStartTime" column="pmStartTime"/>
+        <result property="pmEndTime" column="pmEndTime"/>
+        <result property="longitude" column="longitude"/>
+        <result property="latitude" column="latitude"/>
+        <collection property="matterList" ofType="com.epmet.dto.MatterListDTO"
+                    column="partyServiceCenterId" select="matterListByPartyServiceCenterId"/>
+    </resultMap>
+    <select id="partyServiceCenterDetail" resultMap="partyServiceCenterDetailMap">
+        SELECT
+            sc.ID AS partyServiceCenterId,
+            sc.CENTER_NAME AS centerName,
+            sc.ADDRESS AS address,
+            sc.WORK_PHONE AS workPhone,
+            sc.AM_START_TIME AS amStartTime,
+            sc.AM_END_TIME AS amEndTime,
+            sc.PM_START_TIME AS pmStartTime,
+            sc.PM_END_TIME AS pmEndTime,
+            sc.LONGITUDE AS longitude,
+            sc.LATITUDE AS latitude
+        FROM ic_party_service_center sc
+        WHERE sc.DEL_FLAG = 0
+          AND ID = #{centerId}
+    </select>
 </mapper>