elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

增加 街道提交申诉 区级审核，增加区级审核不通过

master
qushutong 9 months ago
parent
1522f11615
commit
e01a374e05
6 changed files with 577 additions and 442 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java
  2. 79
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  3. 16
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
  4. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  5. 68
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  6. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

16
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java
View File

@ -301,4 +301,20 @@ public class ItemDTO implements Serializable {
*/
private String evaluationContent;
/**
* 0，街道未申诉，1街道申诉，2区坐席驳回申诉
*/
private String streetAppealFlag;
/**
* 区驳回原因
*/
private String districtReject;
/**
* 申诉材料文件链接
*/
private String appealUrl;
}

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

@ -792,19 +792,6 @@ public class ItemController {
}
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @description: 诉求申诉
* @author qushutong
* @date 2023/9/14 15:06
* @Version1.0
**/
@PostMapping("sqAppeal")
public Result sqAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO) {
return itemService.sqAppeal(appealAuditFormDTO);
}
/**
* @param ’startTime endTime deptName
@ -914,6 +901,50 @@ public class ItemController {
}
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @description: 区级诉求申诉
* @author qushutong
* @date 2023/9/14 15:06
* @Version1.0
**/
@PostMapping("sqAppeal")
public Result sqAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO) {
return itemService.sqAppeal(appealAuditFormDTO);
}
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @description: 街道申诉
* @author qushutong
* @date 2023/9/14 15:06
* @Version1.0
**/
@PostMapping("streetAppeal")
public Result streetAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO) {
return itemService.streetAppeal(appealAuditFormDTO);
}
/**
*
* @description: 区级驳回申诉
* @author qushutong
* @date 2024/11/26 15:09
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Version1.0
**/
@PostMapping("backAppeal")
public Result backAppeal(@RequestBody Map<String, Object> params){
itemService.backAppeal(params);
return new Result();
}
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
@ -927,6 +958,10 @@ public class ItemController {
return itemService.getDissatisfied(params);
}
/**
*
* @description: 市级青诉即办平台审核诉求申诉申请的处置结果。
@ -944,5 +979,23 @@ public class ItemController {
}
/**
*
* @description: 诉求合并申请
* @author qushutong
* @date 2024/11/26 10:35
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Version1.0
**/
@PostMapping("case/merge")
public Result merge(@RequestBody ToCityMergeFormDTO mergeFormDTO){
itemService.merge(mergeFormDTO);
return new Result();
}
}

16
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
View File

@ -317,4 +317,20 @@ public class ItemEntity extends BaseEpdcEntity {
private String ssyy;
/**
* 0，街道未申诉，1街道申诉，2区坐席驳回申诉
*/
private String streetAppealFlag;
/**
* 区驳回原因
*/
private String districtReject;
/**
* 申诉材料文件链接
*/
private String appealUrl;
}

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

@ -869,4 +869,10 @@ public interface ItemService extends BaseService<ItemEntity> {
Result<PageData<ItemDTO>> getDissatisfied( Map<String, Object> params);
void backAudit(AppealResultDTO resultDTO);
void merge(ToCityMergeFormDTO mergeFormDTO);
Result streetAppeal(AppealAuditFormDTO appealAuditFormDTO);
void backAppeal(Map<String, Object> params);
}

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

@ -3368,7 +3368,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
* 组织机构信息处理
*
* @return java.util.List<com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity>
* @return java.util.List<com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity>
* @params [dto, eventsList]
* @author liuchuang
* @since 2020/3/7 1:17
@ -3565,6 +3564,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
/**
* 新新向党的事件推送过来，调用此方法。
* 此方法与上面的submitMsFzItemResi逻辑一致，只是返参返回epdc_item.id
*
* @param formDto
* @return
*/
@ -4236,7 +4236,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
private EventRejectDoResultDto eventsRejectDo(ItemHandleSubmitFormDTO dto, String recid) throws Exception {
ItemEntity entity = baseDao.selectById(dto.getId());
// 组装上报信息（图片和处理流程）
@ -4646,6 +4645,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
return list.stream().collect(Collectors.toMap(ItemHandleProcessDTO::getItemId, ItemHandleProcessDTO::getHandlerDeptId, (key1, key2) -> key2));
}
/**
* 处理中流程的当前处理部门名称
*
@ -6169,6 +6169,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
/**
* 获取民生诉求，处理进展
*
* @param itemId
* @return
*/
@ -6179,6 +6180,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
/**
* 新新向党的语音url，上传到本地url
*
* @param itemVoiceUrl,新新向党语音url示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/audio/2023-05-30/3619422864240813849.mp3
* @return 返回示例：
*/
@ -6194,6 +6196,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
/**
* 新新向党的图片url上传到本地的oss
*
* @param images:新新向党图片url示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/image/2023-05-26/3618657367924684031.jpg
* @return 返回示例：https://epdc-shibei.elinkservice.cn/files-pro/20230530/8ed41af545e04e0cae0d4398d80c704e.jpg
*/
@ -6211,7 +6214,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
@Override
public Result getClosePage(Map<String, Object> params) {
IPage<ItemPendingHandleDTO> page = getPage(params);
@ -6221,19 +6223,19 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Override
public Result sqAppeal(AppealAuditFormDTO appealAuditFormDTO) {
// ItemDTO itemDTO = baseDao.selectOneItemByIssueId(appealAuditFormDTO.getItemId());
UserDetail userDetail = SecurityUser.getUser();
ItemEntity itemDTO = baseDao.selectById(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());
czrEntity.setXm(userDetail.getRealName());
czrEntity.setSsjgbm(userDetail.getDeptId() + "");
czrEntity.setSsjg(userDetail.getDeptName());
czrEntity.setSsbm(userDetail.getDeptName());
czrEntity.setSsbmbm(userDetail.getDeptId() + "");
AppealFormDTO appealFormDTO = new AppealFormDTO();
appealFormDTO.setCzr(czrEntity);
appealFormDTO.setCzsj(appealAuditFormDTO.getCzsj());
appealFormDTO.setFiles("");
appealFormDTO.setFiles(appealAuditFormDTO.getFiles());
appealFormDTO.setJjqk(appealAuditFormDTO.getJjqk());
appealFormDTO.setPjjg(appealAuditFormDTO.getPjjg());
appealFormDTO.setShjg(appealAuditFormDTO.getShjg());
@ -6460,8 +6462,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
ItemEntity itemEntity = new ItemEntity();
itemEntity.setSerialNum(itemHotlineEntity.getCode());
@ -6699,7 +6699,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
} catch (Exception e) {
StringBuffer str = new StringBuffer();
str.append("12345数据发展");
@ -6855,8 +6854,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemAutoProcessRedis.produce(itemHandleProcessEntity.getId().concat(":8"), System.currentTimeMillis() + (59 * 1000));
// }catch (Exception e){
//
// }
@ -6865,7 +6862,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Override
public Result updataCaseEvaluation(QsjbEvaluation formDTO) {
log.info(formDTO.getPjjg()+"111111111111111111111111111111"+formDTO.toString());
ItemEntity itemBySqid = baseDao.getItemBySqid(formDTO.getSqid());
if (null == itemBySqid) {
return new Result().error(1, "sqid：" + formDTO.getSqid() + "不存在");
@ -7315,7 +7311,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
@Override
@Transactional
public void backItem(ItemDTO dto) {
@ -7347,4 +7342,43 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
baseDao.updateById(item);
}
@Override
public void merge(ToCityMergeFormDTO mergeFormDTO) {
}
@Override
public Result streetAppeal(AppealAuditFormDTO appealAuditFormDTO) {
ItemEntity itemDTO = baseDao.selectById(appealAuditFormDTO.getItemId());
itemDTO.setStreetAppealFlag("1");
itemDTO.setAppealUrl(appealAuditFormDTO.getFiles());
itemDTO.setJjqk(appealAuditFormDTO.getJjqk());
if ("01".equals(appealAuditFormDTO.getPjjg())) {
itemDTO.setPjjg(2);
} else if ("03".equals(appealAuditFormDTO.getPjjg())) {
itemDTO.setPjjg(0);
} else {
itemDTO.setPjjg(1);
}
itemDTO.setAppealFlag(1);
itemDTO.setSsyy(appealAuditFormDTO.getSsyy());
ItemEntity itemEntity = ConvertUtils.sourceToTarget(itemDTO, ItemEntity.class);
baseDao.updateById(itemEntity);
return new Result();
}
@Override
public void backAppeal(Map<String, Object> params) {
String districtReject = (String) params.get("districtReject");
String id = (String) params.get("id");
ItemEntity itemEntity = new ItemEntity();
itemEntity.setId(id);
itemEntity.setStreetAppealFlag("2");
itemEntity.setDistrictReject(districtReject);
baseDao.updateById(itemEntity);
}
}

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

@ -4338,6 +4338,16 @@
AND appeal_source != '3'
AND DEL_FLAG = '0'
and ITEM_STATE = '10'
<if test="streetAppealFlag != null and streetAppealFlag != ''">
<choose>
<when test="streetAppealFlag == '0'">
and i.STREET_APPEAL_FLAG != '2'
</when >
<when test="streetAppealFlag == '1'">
and i.STREET_APPEAL_FLAG != '1'
</when >
</choose>
</if>
<if test="serialNum != null and serialNum != ''">
and i.SERIAL_NUM like CONCAT('%', #{serialNum}, '%')
</if>

Write Preview
Loading…
Cancel
Save