diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/PartyServiceCenterDetailFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/PartyServiceCenterDetailFormDTO.java new file mode 100644 index 0000000000..b7ec31560e --- /dev/null +++ b/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; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java index c8d547fe17..4bc56543a1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java +++ b/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 = ""; /** * 负责人 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java index bfb95d5c23..f9a2726a1a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java +++ b/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 = ""; /** * 负责人 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java index f6071938ce..3b2872a7f3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java +++ b/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>().ok(icPartyServiceCenterService.appointmentRecordMini(formDTO,tokenDto)); } + /** + * @Description 党群服务中心详情 + * @param formDTO + * @author zxc + * @date 2021/12/28 5:13 下午 + */ + @PostMapping("partyservicecenterdetail") + public Result partyServiceCenterDetail(@RequestBody PartyServiceCenterDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, PartyServiceCenterDetailFormDTO.PartyServiceCenterDetailForm.class); + return new Result().ok(icPartyServiceCenterService.partyServiceCenterDetail(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPartyServiceCenterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPartyServiceCenterDao.java index 52a90184cf..ad1ff57769 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPartyServiceCenterDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPartyServiceCenterDao.java @@ -43,6 +43,14 @@ public interface IcPartyServiceCenterDao extends BaseDao 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java index 3a4cbcec4c..37d93ce41a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java @@ -183,4 +183,12 @@ public interface IcPartyServiceCenterService extends BaseService appointmentRecordMini(AppointmentRecordMiniFormDTO formDTO,TokenDto tokenDto); + /** + * @Description 党群服务中心详情 + * @param formDTO + * @author zxc + * @date 2021/12/28 5:13 下午 + */ + PartyServiceCenterListResultDTO partyServiceCenterDetail(PartyServiceCenterDetailFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index bd83c240df..b358c04b81 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/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 page(Map params) { @@ -216,6 +221,12 @@ public class CustomerGridServiceImpl extends BaseServiceImpl> staffGridList = epmetUserFeignClient.getStaffGridList(customerStaffGridDTOS); griddetail.setStaffGridList(staffGridList.getData()); + //查询网格类型字典表数据 + Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode()); + Map 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().ok(griddetail); } @@ -356,7 +367,23 @@ public class CustomerGridServiceImpl extends BaseServiceImpl> getAllGridsByAgency(CommonAgencyIdFormDTO agencyFormDTO) { - return new Result>().ok(baseDao.selectGridListByAgencyId(agencyFormDTO.getAgencyId(),null)); + //1.查询组织下网格列表数据 + List list = baseDao.selectGridListByAgencyId(agencyFormDTO.getAgencyId(),null); + if (org.springframework.util.CollectionUtils.isEmpty(list)) { + return new Result>(); + } + + //2.查询网格类型字典表数据 + Result> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode()); + Map 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>().ok(list); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java index bba2cb0455..561ad068aa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java +++ b/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(); } + /** + * @Description 党群服务中心详情 + * @param formDTO + * @author zxc + * @date 2021/12/28 5:13 下午 + */ + @Override + public PartyServiceCenterListResultDTO partyServiceCenterDetail(PartyServiceCenterDetailFormDTO formDTO) { + return baseDao.partyServiceCenterDetail(formDTO.getPartyServiceCenterId()); + } + public List getTimeList(String start,String end,Integer interval){ List result = new ArrayList<>(); List intervalTimeList = getIntervalTimeList(start, end, interval); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml index 275a3be71b..dc979d5df6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml +++ b/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} + + + + + + + + + + + + + + + + \ No newline at end of file