Browse Source

诉求申诉

master
qushutong 2 years ago
parent
commit
6666925de1
  1. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java
  2. 75
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemClosedDTO.java
  3. 46
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AppealAuditFormDTO.java
  4. 167
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealFormDTO.java
  5. 18
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  6. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
  7. 13
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  8. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java
  9. 29
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  10. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
  11. 32
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

10
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";
}

75
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;
}

46
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;
}

167
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;
}
}
}

18
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);
}
}

3
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<ItemEntity> {
List<RsponseTotalLineDetailResultDTO> getResponseDataListByMonths(ScreenTotalFormDTO formDTO);
List<ItemPendingHandleDTO> selectselectClosePage();
List<ItemClosedDTO> selectselectClosePage();
}

13
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<ItemEntity> {
* @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<String, Object> 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);
}

10
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);
}

29
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<ItemDao, ItemEntity> implem
@Override
public Result getClosePage(Map<String, Object> params) {
IPage<ItemPendingHandleDTO> page = getPage(params);
List<ItemPendingHandleDTO> list = baseDao.selectselectClosePage();
return new Result<PageData<ItemPendingHandleDTO>>().ok(new PageData<>(list, page.getTotal()));
List<ItemClosedDTO> list = baseDao.selectselectClosePage();
return new Result<PageData<ItemClosedDTO>>().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();
}
}

10
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);
}
}

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

@ -3475,4 +3475,36 @@
</foreach>
</update>
<select id="selectselectClosePage" resultType="com.elink.esua.epdc.dto.item.ItemClosedDTO">
SELECT
item.ID,
item.ITEM_CONTENT,
item.REPEAT_FLAG,
item.CREATED_TIME,
item.NICK_NAME,
item.MOBILE,
item.ITEM_STATE,
item.grid AS gridName,
item.sqid,
SUBSTRING_INDEX( REPLACE ( item.parent_dept_names, '市北区委-', '' ), '-', 1 ) AS streetName,
SUBSTRING_INDEX( REPLACE ( item.parent_dept_names, '市北区委-', '' ), '-',- 1 ) AS communityName,
CASE
item.EVALUATION_SCORE
WHEN 0 THEN
'不满意'
WHEN 1 THEN
'基本满意'
WHEN 2 THEN
'非常满意' ELSE ''
END AS evaluationScore
FROM
epdc_item item
WHERE
item.DEL_FLAG = '0'
AND item.ITEM_STATE = '10'
AND (item.EVALUATION_SCORE = '0')
ORDER BY
item.CREATED_TIME DESC
</select>
</mapper>

Loading…
Cancel
Save