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 257d89aa8..5eaff1083 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 @@ -180,5 +180,11 @@ public interface PushToCityGridConstant { + /** + * 市级青诉即办平台提供接口,区(市)平台调用 + */ + String HOTLINEROLLBACK = URL_PREFIX + "/rollBack"; + + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemBackHotlineDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemBackHotlineDTO.java new file mode 100644 index 000000000..eafcc0e23 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemBackHotlineDTO.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 推荐12345热线数据 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2024-06-26 + */ +@Data +public class ItemBackHotlineDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 推荐原因 + */ + private String cznr; + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/RollBackHotLineFromDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/RollBackHotLineFromDTO.java new file mode 100644 index 000000000..26052dd9b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/RollBackHotLineFromDTO.java @@ -0,0 +1,154 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 回退12345热线数据 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2024-06-26 + */ +@Data +public class RollBackHotLineFromDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * czsj : 2024-08-01 18:23:00 + * cznr : 退件原因 + * czr : {"lxdh":"联系电话","xm":"人员姓名","ssbmbm":"所属部门编码","id":"e2d096bd7e62462ebcaasfbdddddd","ssjgbm":"所属机构编码","ssjg":"所属机构","ssbm":"所属部门"} + * sqid : e2d096bd7e62462ebcaasfb89bdeff737 + */ + private Date czsj; + private String cznr; + private CzrEntity czr; + private String sqid; + + public void setCzsj(Date czsj) { + this.czsj = czsj; + } + + public void setCznr(String cznr) { + this.cznr = cznr; + } + + public void setCzr(CzrEntity czr) { + this.czr = czr; + } + + public void setSqid(String sqid) { + this.sqid = sqid; + } + + public Date getCzsj() { + return czsj; + } + + public String getCznr() { + return cznr; + } + + public CzrEntity getCzr() { + return czr; + } + + public String getSqid() { + return sqid; + } + + public static class CzrEntity { + /** + * lxdh : 联系电话 + * xm : 人员姓名 + * ssbmbm : 所属部门编码 + * id : e2d096bd7e62462ebcaasfbdddddd + * ssjgbm : 所属机构编码 + * ssjg : 所属机构 + * ssbm : 所属部门 + */ + private String lxdh; + private String xm; + private String ssbmbm; + private String id; + private String ssjgbm; + private String ssjg; + private String ssbm; + + public void setLxdh(String lxdh) { + this.lxdh = lxdh; + } + + 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 getLxdh() { + return lxdh; + } + + 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; + } + } +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java index 0fad1eff3..ba9fd44c8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java @@ -26,6 +26,9 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.ItemHotlineDTO; +import com.elink.esua.epdc.dto.item.form.HotLineFromDTO; +import com.elink.esua.epdc.dto.item.form.ItemBackHotlineDTO; +import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO; import com.elink.esua.epdc.modules.events.service.ItemHotlineService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -95,4 +98,19 @@ public class ItemHotlineController { return new Result(); } + + /** + * + * @description: 热线12345 退件 + * @author qushutong + * @date 2024/8/5 18:04 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Version1.0 + **/ + @PostMapping("backHotLine") + public Result backHotLine(@RequestBody ItemBackHotlineDTO dto) { + return itemHotlineService.backHotLine(dto); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java index 4de6472dc..425eca243 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java @@ -63,5 +63,7 @@ public class ItemHotlineEntity extends BaseEpdcEntity { private String streetId; + private String backFlag; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java index b10625e54..036ee5424 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java @@ -19,7 +19,9 @@ package com.elink.esua.epdc.modules.events.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.ItemHotlineDTO; +import com.elink.esua.epdc.dto.item.form.ItemBackHotlineDTO; import com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity; import java.util.List; @@ -97,6 +99,5 @@ public interface ItemHotlineService extends BaseService { void getHotLine(); - - + Result backHotLine(ItemBackHotlineDTO dto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java index 6ef2631af..1276edd6c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java @@ -26,12 +26,16 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.ImageConstant; import com.elink.esua.epdc.constant.PushToCityGridConstant; import com.elink.esua.epdc.dto.ItemHotlineDTO; +import com.elink.esua.epdc.dto.item.form.ItemBackHotlineDTO; +import com.elink.esua.epdc.dto.item.form.RollBackHotLineFromDTO; import com.elink.esua.epdc.dto.item.form.UpdateAppealSendDTO; import com.elink.esua.epdc.dto.item.result.CenterData; import com.elink.esua.epdc.dto.oss.UploadFormDTO; @@ -167,6 +171,8 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl