From 6666925de1871ca11ed140e22390c406d1edb7c8 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Thu, 14 Sep 2023 15:50:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=89=E6=B1=82=E7=94=B3=E8=AF=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/constant/PushToCityGridConstant.java | 10 ++ .../esua/epdc/dto/item/ItemClosedDTO.java | 75 ++++++++ .../dto/item/form/AppealAuditFormDTO.java | 46 +++++ .../epdc/dto/item/result/AppealFormDTO.java | 167 ++++++++++++++++++ .../item/controller/ItemController.java | 18 +- .../esua/epdc/modules/item/dao/ItemDao.java | 3 +- .../modules/item/service/ItemService.java | 13 +- .../item/service/PushToCityGridService.java | 10 ++ .../item/service/impl/ItemServiceImpl.java | 29 ++- .../impl/PushToCityGridServiceImpl.java | 10 ++ .../main/resources/mapper/item/ItemDao.xml | 32 ++++ 11 files changed, 407 insertions(+), 6 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemClosedDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AppealAuditFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java index 81db0662c..473dd000a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java @@ -149,4 +149,14 @@ public interface PushToCityGridConstant { */ String RECEIVE = URL_PREFIX + "/receive"; + + + /** + * 诉求申诉 + */ + String APPEAL = URL_PREFIX + "/appeal"; + + + + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemClosedDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemClosedDTO.java new file mode 100644 index 000000000..b0799dbf5 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemClosedDTO.java @@ -0,0 +1,75 @@ +package com.elink.esua.epdc.dto.item; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @description: 诉求申诉 + * @author qushutong + * @date 2023/9/7 13:47 + * @return + * @Version1.0 + **/ +@Data +public class ItemClosedDTO implements Serializable { + private static final long serialVersionUID = 5198329021689964499L; + + /** + * 项目ID + */ + private String id; + + + /** + * 项目sqid + */ + private String sqid; + + + /** + * 项目内容 + */ + private String itemContent; + + /** + * 提交人 + */ + private String nickName; + + /** + * 手机号 + */ + private String mobile; + /** + * 项目满意度 + */ + private String evaluationScore; + + /** + * 属事街道 + */ + private String streetName; + /** + * 属事社区 + */ + private String communityName; + /** + * 属事网格 + */ + private String gridName; + /** + * 诉求类型 EVALUATION_CONTENT + */ + private String peopleFlag; + + /** + * 评价内容 + */ + private String evaluationContent; + + + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AppealAuditFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AppealAuditFormDTO.java new file mode 100644 index 000000000..c059ad0cf --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AppealAuditFormDTO.java @@ -0,0 +1,46 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @description: 诉求申诉审核 + * @author qushutong + * @date 2023/9/7 14:29 + * @return + * @Version1.0 + **/ +@NoArgsConstructor +@Data +public class AppealAuditFormDTO { + + + /** + * czsj : 2022-09-01 18:23:00 + * pjjg : 01 + * ssyy : 申诉原因 + * shjg : 01 + * files : http://ip:port/pic/20161228165121.png + * jjqk : 01 + * sqid : e2d096bd7e62462ebcaasfb89bdeff737 + */ + private String czsj; + + private String pjjg; + + private String ssyy; + + private String shjg; + + private String files; + + private String jjqk; + + private String itemId; + + private String sqid; + + + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealFormDTO.java new file mode 100644 index 000000000..44b5dfa08 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealFormDTO.java @@ -0,0 +1,167 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +/** + * + * @description: 诉求申诉 + * @author qushutong + * @date 2023/9/7 14:29 + * @return + * @Version1.0 + **/ +@NoArgsConstructor +@Data +public class AppealFormDTO { + + + /** + * czsj : 2022-09-01 18:23:00 + * pjjg : 01 + * ssyy : 申诉原因 + * shjg : 01 + * files : http://ip:port/pic/20161228165121.png + * czr : {"xm":"申诉人","ssbmbm":"所属部门编码","id":"e2d096bd7e62462ebcaasfbdddddd","ssjgbm":"所属机构编码","ssjg":"所属机构","ssbm":"所属部门"} + * jjqk : 01 + * sqid : e2d096bd7e62462ebcaasfb89bdeff737 + */ + private String czsj; + private String pjjg; + private String ssyy; + private String shjg; + private String files; + private CzrEntity czr; + private String jjqk; + private String sqid; + + public void setCzsj(String czsj) { + this.czsj = czsj; + } + + public void setPjjg(String pjjg) { + this.pjjg = pjjg; + } + + public void setSsyy(String ssyy) { + this.ssyy = ssyy; + } + + public void setShjg(String shjg) { + this.shjg = shjg; + } + + public void setFiles(String files) { + this.files = files; + } + + public void setCzr(CzrEntity czr) { + this.czr = czr; + } + + public void setJjqk(String jjqk) { + this.jjqk = jjqk; + } + + public void setSqid(String sqid) { + this.sqid = sqid; + } + + public String getCzsj() { + return czsj; + } + + public String getPjjg() { + return pjjg; + } + + public String getSsyy() { + return ssyy; + } + + public String getShjg() { + return shjg; + } + + public String getFiles() { + return files; + } + + public CzrEntity getCzr() { + return czr; + } + + public String getJjqk() { + return jjqk; + } + + public String getSqid() { + return sqid; + } + + + public static class CzrEntity { + /** + * xm : 申诉人 + * ssbmbm : 所属部门编码 + * id : e2d096bd7e62462ebcaasfbdddddd + * ssjgbm : 所属机构编码 + * ssjg : 所属机构 + * ssbm : 所属部门 + */ + private String xm; + private String ssbmbm; + private String id; + private String ssjgbm; + private String ssjg; + private String ssbm; + + public void setXm(String xm) { + this.xm = xm; + } + + public void setSsbmbm(String ssbmbm) { + this.ssbmbm = ssbmbm; + } + + public void setId(String id) { + this.id = id; + } + + public void setSsjgbm(String ssjgbm) { + this.ssjgbm = ssjgbm; + } + + public void setSsjg(String ssjg) { + this.ssjg = ssjg; + } + + public void setSsbm(String ssbm) { + this.ssbm = ssbm; + } + + public String getXm() { + return xm; + } + + public String getSsbmbm() { + return ssbmbm; + } + + public String getId() { + return id; + } + + public String getSsjgbm() { + return ssjgbm; + } + + public String getSsjg() { + return ssjg; + } + + public String getSsbm() { + return ssbm; + } + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index f83579877..85e04445f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -761,7 +761,7 @@ public class ItemController { * @description: S诉求申诉列表 * @author qushutong * @date 2023/9/4 14:02 - * @param [params] + * @param * @return com.elink.esua.epdc.commons.tools.utils.Result * @Version1.0 **/ @@ -770,5 +770,21 @@ public class ItemController { return itemService.getClosePage(params); } + + /** + * + * @description: 诉求申诉 + * @author qushutong + * @date 2023/9/14 15:06 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Version1.0 + **/ + @PostMapping("sqAppeal") + public Result sqAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO){ + + return itemService.sqAppeal(appealAuditFormDTO); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index ba4d52441..d95abfae8 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO; import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO; import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; +import com.elink.esua.epdc.dto.item.ItemClosedDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; @@ -567,5 +568,5 @@ public interface ItemDao extends BaseDao { List getResponseDataListByMonths(ScreenTotalFormDTO formDTO); - List selectselectClosePage(); + List selectselectClosePage(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 2b09f69d8..555030251 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -826,9 +826,20 @@ public interface ItemService extends BaseService { * @description: * @author qushutong * @date 2023/9/4 15:09 - * @param [params] + * @param * @return com.elink.esua.epdc.commons.tools.utils.Result * @Version1.0 **/ Result getClosePage(Map params); + + /** + * + * @description: 诉求申诉 + * @author qushutong + * @date 2023/9/14 15:07 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Version1.0 + **/ + Result sqAppeal(AppealAuditFormDTO appealAuditFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java index d1667a4a5..ef1f01065 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java @@ -20,8 +20,10 @@ package com.elink.esua.epdc.modules.item.service; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; +import com.elink.esua.epdc.dto.item.form.AppealAuditFormDTO; import com.elink.esua.epdc.dto.item.form.GetAbnormalDataFormDTO; import com.elink.esua.epdc.dto.item.form.ItemWhistle2GovFormDTO; +import com.elink.esua.epdc.dto.item.result.AppealFormDTO; /** * 青岛市青诉即办平台接入 @@ -261,4 +263,12 @@ public interface PushToCityGridService { * 虚构一个 执法发展响应节点 */ void receiveZFFZ(String itemId); + + + + + /** + * 诉求申诉 + */ + void appeal(AppealFormDTO appealFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 3d06926e2..a77a8e39b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -6164,9 +6164,32 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result getClosePage(Map params) { - IPage page = getPage(params); - List list = baseDao.selectselectClosePage(); - return new Result>().ok(new PageData<>(list, page.getTotal())); + List list = baseDao.selectselectClosePage(); + return new Result>().ok(new PageData<>(list, page.getTotal())); + } + + @Override + public Result sqAppeal(AppealAuditFormDTO appealAuditFormDTO) { + ItemDTO itemDTO = baseDao.selectOneItemByIssueId(appealAuditFormDTO.getItemId()); + + AppealFormDTO.CzrEntity czrEntity = new AppealFormDTO.CzrEntity(); + czrEntity.setId(appealAuditFormDTO.getItemId()); + czrEntity.setXm(itemDTO.getHandlePeopleName()); + czrEntity.setSsjgbm(itemDTO.getGrid()); + czrEntity.setSsjg(itemDTO.getGrid()); + czrEntity.setSsbm(itemDTO.getUpdatedBy()); + czrEntity.setSsbmbm(itemDTO.getGrid()); + AppealFormDTO appealFormDTO = new AppealFormDTO(); + appealFormDTO.setCzr(czrEntity); + appealFormDTO.setCzsj(appealAuditFormDTO.getCzsj()); + appealFormDTO.setFiles(""); + appealFormDTO.setJjqk(appealAuditFormDTO.getJjqk()); + appealFormDTO.setPjjg(appealAuditFormDTO.getPjjg()); + appealFormDTO.setShjg(appealAuditFormDTO.getShjg()); + appealFormDTO.setSqid(appealAuditFormDTO.getSqid()); + appealFormDTO.setSsyy(appealAuditFormDTO.getSsyy()); + pushToCityGridServiceImpl.appeal(appealFormDTO); + return new Result(); } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index ebe786eca..98429aed0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -41,6 +41,7 @@ import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO; import com.elink.esua.epdc.dto.events.result.PushToCityResultDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; +import com.elink.esua.epdc.dto.item.form.AppealAuditFormDTO; import com.elink.esua.epdc.dto.item.form.GetAbnormalDataFormDTO; import com.elink.esua.epdc.dto.item.form.ItemWhistle2GovFormDTO; import com.elink.esua.epdc.dto.item.result.*; @@ -1576,4 +1577,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { } + + + @Override + public void appeal(AppealFormDTO appealFormDTO) { + + String result = cityGridApi.sendItemToCity(appealFormDTO, PushToCityGridConstant.APPEAL, "诉求申诉"); + saveLog(appealFormDTO.getCzr().getId(), "", "诉求申诉", PushToCityGridConstant.APPEAL_AUDIT, JSONObject.toJSONString(appealFormDTO), result); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index c7674add0..6511b98a9 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -3475,4 +3475,36 @@ + +