给市平台提供的接口

esua-epdc/epdc-cloud-gateway-shibei

@@ -1 +1 @@
-Subproject commit 4a4caf14c35de0d4678fd94d141da3661b549c1e
+Subproject commit 93f353e1aed743c80b0c66938c0af142a806ef5b

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealSuperviseResultDTO.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+
 @NoArgsConstructor
 @Data
 public class AppealSuperviseResultDTO {
@@ -11,6 +13,7 @@ public class AppealSuperviseResultDTO {
     /**
      * 诉求标识
      */
+    @NotBlank(message = "诉求ID不能为空")
     @JsonProperty("sqid")
     private String sqid;
 

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleFeedbackResultDTO.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+
 @NoArgsConstructor
 @Data
 public class AppealWhistleFeedbackResultDTO {
@@ -11,6 +13,7 @@ public class AppealWhistleFeedbackResultDTO {
     /**
      * 唯一标识
      */
+    @NotBlank(message = "诉求ID不能为空")
     @JsonProperty("sqid")
     private String sqid;
 

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportRejectResultDTO.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+
 @NoArgsConstructor
 @Data
 public class AppealWhistleReportRejectResultDTO {
@@ -11,6 +13,7 @@ public class AppealWhistleReportRejectResultDTO {
     /**
      * 唯一标识
      */
+    @NotBlank(message = "诉求ID不能为空")
     @JsonProperty("sqid")
     private String sqid;
 

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java

@@ -52,6 +52,11 @@ public enum ItemGridPlatformHandleStatusEnum {
 	HANDLE_HCSB(1103, "上报核查"),
 	HANDLE_ZCZ(1104, "再处置"),
 
+	//**********市级青诉即办平台状态**********
+	HANDLE_QSJB_DB(2018, "诉求督办"),
+	HANDLE_QSJB_BH(2020, "吹哨驳回"),
+	HANDLE_QSJB_FK(2021, "吹哨反馈"),
+
 	HANDLE_OTHER(999, "派遣中");
 
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@@ -455,45 +455,45 @@ public class ItemController {
     }
 
     /**
-     * 接受市平台诉求督办
+     * 市级青诉即办平台对区（市）诉求进行在线督办
      *
-     * @param formDto
+     * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author zhy
      * @date 2022/10/21 16:13
      */
     @PostMapping("gov/case/supervise")
-    public Result supervise(@RequestBody AppealSuperviseResultDTO formDto) {
-        ValidatorUtils.validateEntity(formDto);
-        return itemService.supervise(formDto);
+    public Result supervise(@RequestBody AppealSuperviseResultDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return itemService.supervise(formDTO);
     }
 
     /**
-     * 接受市平台吹哨驳回
+     * 市级平台驳回区（市）上报的吹哨诉求
      *
-     * @param formDto
+     * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author zhy
      * @date 2022/10/21 16:13
      */
     @PostMapping("gov/case/whistle/reportreject")
-    public Result reportReject(@RequestBody AppealWhistleReportRejectResultDTO formDto) {
-        ValidatorUtils.validateEntity(formDto);
-        return itemService.reportReject(formDto);
+    public Result reportReject(@RequestBody AppealWhistleReportRejectResultDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return itemService.reportReject(formDTO);
     }
 
     /**
-     * 接受市平台吹哨反馈
+     * 市级平台向区（市）平台反馈吹哨诉求的处置结果
      *
-     * @param formDto
+     * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author zhy
      * @date 2022/10/21 16:13
      */
     @PostMapping("gov/case/whistle/feedback")
-    public Result feedback(@RequestBody AppealWhistleFeedbackResultDTO formDto) {
-        ValidatorUtils.validateEntity(formDto);
-        return itemService.feedback(formDto);
+    public Result feedback(@RequestBody AppealWhistleFeedbackResultDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return itemService.feedback(formDTO);
     }
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -455,6 +455,16 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      */
     String getSqid(@Param("itemId") String itemId);
 
+    /**
+     * 根据诉求ID查询项目信息
+     *
+     * @param sqid
+     * @return java.lang.String
+     * @author zhy
+     * @date 2022/9/19 10:51
+     */
+    ItemEntity getItemBySqid(@Param("sqid") String sqid);
+
     /**
      * 获取市平台诉求ID
      *

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@@ -666,31 +666,31 @@ public interface ItemService extends BaseService<ItemEntity> {
     /**
      * 接受市平台诉求督办
      *
-     * @param formDto
+     * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author zhy
      * @date 2022/10/21 16:16
      */
-    Result supervise(AppealSuperviseResultDTO formDto);
+    Result supervise(AppealSuperviseResultDTO formDTO);
 
     /**
      * 接受市平台吹哨驳回
      *
-     * @param formDto
+     * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author zhy
      * @date 2022/10/21 16:16
      */
-    Result reportReject(AppealWhistleReportRejectResultDTO formDto);
+    Result reportReject(AppealWhistleReportRejectResultDTO formDTO);
 
     /**
      * 接受市平台吹哨反馈
      *
-     * @param formDto
+     * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author zhy
      * @date 2022/10/21 16:16
      */
-    Result feedback(AppealWhistleFeedbackResultDTO formDto);
+    Result feedback(AppealWhistleFeedbackResultDTO formDTO);
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -4070,17 +4070,72 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     @Override
-    public Result supervise(AppealSuperviseResultDTO formDto){
+    public Result supervise(AppealSuperviseResultDTO formDTO) {
+        ItemHandleProcessEntity process = new ItemHandleProcessEntity();
+        ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid());
+        if (item == null) {
+            return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid());
+        }
+        process.setItemId(item.getId());
+        process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue());
+        process.setHandleAdvice(formDTO.getDbnr());
+        process.setOutHandleAdvice(formDTO.getDbnr());
+        process.setHandlerDept("青诉即办平台");
+        process.setHandlerDeptId(1L);
+        process.setGridPartyname(formDTO.getDbr());
+        itemHandleProcessDao.insert(process);
+
+        // 更新创建时间
+        process.setCreatedTime(DateUtils.parse(formDTO.getDbsj(), DateUtils.DATE_TIME_PATTERN));
+        itemHandleProcessDao.updateById(process);
         return new Result();
     }
 
     @Override
-    public Result reportReject(AppealWhistleReportRejectResultDTO formDto){
+    public Result reportReject(AppealWhistleReportRejectResultDTO formDTO) {
+        ItemHandleProcessEntity process = new ItemHandleProcessEntity();
+        ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid());
+        if (item == null) {
+            return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid());
+        }
+        process.setItemId(item.getId());
+        process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue());
+        process.setHandleAdvice(formDTO.getBhyy());
+        process.setOutHandleAdvice(formDTO.getBhyy());
+        process.setHandlerDept("青诉即办平台");
+        process.setHandlerDeptId(1L);
+        process.setGridPartyid(formDTO.getBhrId());
+        process.setGridPartyname(formDTO.getBhr());
+        itemHandleProcessDao.insert(process);
+
+        // 更新创建时间
+        process.setCreatedTime(DateUtils.parse(formDTO.getBhsj(), DateUtils.DATE_TIME_PATTERN));
+        itemHandleProcessDao.updateById(process);
         return new Result();
     }
 
     @Override
-    public Result feedback(AppealWhistleFeedbackResultDTO formDto){
+    public Result feedback(AppealWhistleFeedbackResultDTO formDTO) {
+        ItemHandleProcessEntity process = new ItemHandleProcessEntity();
+        ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid());
+        if (item == null) {
+            return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid());
+        }
+        process.setItemId(item.getId());
+        process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue());
+        process.setHandleAdvice(formDTO.getCljg());
+        process.setOutHandleAdvice(formDTO.getCljg());
+        process.setHandlerDept("青诉即办平台");
+        process.setHandlerDeptId(1L);
+        process.setGridPartyid(formDTO.getClrId());
+        process.setGridPartyname(formDTO.getClr());
+        process.setGridUnitid(formDTO.getCldwId());
+        process.setGridUnitname(formDTO.getCldw());
+        itemHandleProcessDao.insert(process);
+
+        // 更新创建时间
+        process.setCreatedTime(DateUtils.parse(formDTO.getFksj(), DateUtils.DATE_TIME_PATTERN));
+        itemHandleProcessDao.updateById(process);
         return new Result();
     }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -2143,6 +2143,18 @@
             AND id = #{itemId}
     </select>
 
+    <select id="getItemBySqid" resultType="com.elink.esua.epdc.modules.item.entity.ItemEntity">
+        SELECT
+            ID
+        FROM
+            epdc_item
+        WHERE
+            DEL_FLAG = '0'
+        AND SQID = #{sqid}
+        ORDER BY CREATED_TIME DESC
+        LIMIT 1
+    </select>
+
     <select id="listItemHandleDept" resultType="com.elink.esua.epdc.dto.item.ItemHandleProcessDTO">
         SELECT
             b.ID,