From 81c642751733fb3f06b254420fa0199f76c85940 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 13 Sep 2022 10:46:05 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=AD=96=E7=95=A5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiWorkAdminController.java | 40 +++++++++++++++++++ .../esua/epdc/service/WorkAdminService.java | 25 ++++++++++++ .../service/impl/WorkAdminServiceImpl.java | 28 +++++++++++++ .../service/impl/CategoryServiceImpl.java | 6 ++- 4 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkAdminController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkAdminService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkAdminServiceImpl.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkAdminController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkAdminController.java new file mode 100644 index 000000000..bd570405a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkAdminController.java @@ -0,0 +1,40 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.service.WorkAdminService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 工作端，用户登录，用户管理相关接口 + * + * @author work@yujt.net.cn + * @date 2019/11/18 10:45 + */ +@RestController +@RequestMapping("work/admin") +public class ApiWorkAdminController { + + @Autowired + private WorkAdminService workAdminService; + + /** + * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单 + * + * @param dictType 数据字典类型 + * @return com.elink.esua.commons.tools.utils.Result> + * @author yujintao + * @date 2019/7/15 09:33 + */ + @GetMapping("listSimple/{dictType}") + public Result> listSimpleDictInfo(@PathVariable("dictType") String dictType) { + //字典分类数据 + return workAdminService.listSimpleDictInfo(dictType); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkAdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkAdminService.java new file mode 100644 index 000000000..cc3b27fda --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkAdminService.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; + +import java.util.List; + +/** + * 工作端，系统功能实现接口 + * + * @author work@yujt.net.cn + * @date 2019/11/18 10:48 + */ +public interface WorkAdminService { + + /** + * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单 + * + * @param dictType 数据字典类型 + * @return com.elink.esua.commons.tools.utils.Result> + * @author yujintao + * @date 2019/7/15 09:33 + */ + Result> listSimpleDictInfo(String dictType); +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkAdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkAdminServiceImpl.java new file mode 100644 index 000000000..50dfc056a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkAdminServiceImpl.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.service.impl; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.service.WorkAdminService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 工作端，系统功能实现 + * + * @author work@yujt.net.cn + * @date 2019/11/18 10:49 + */ +@Service +public class WorkAdminServiceImpl implements WorkAdminService { + + @Autowired + private AdminFeignClient adminFeignClient; + + @Override + public Result> listSimpleDictInfo(String dictType) { + return adminFeignClient.listSimpleDictInfo(dictType); + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java index dfde557d8..528ba7936 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java @@ -93,7 +93,11 @@ public class CategoryServiceImpl extends BaseServiceImpl list(Map params) { - List entityList = baseDao.getList(params); + if (!params.containsKey("infoCode")) { + params.put("infoCode", "0"); + } + + List entityList = baseDao.getList(params); List dtoList = ConvertUtils.sourceToTarget(entityList, CategoryDTO.class); From 5de92b609f5b2c29bccdfe0884caaa872da18caa Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 13 Sep 2022 14:04:33 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 010cb8091..0dad1efe2 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 @@ -399,7 +399,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setIsPeople("1");//诉求上报 itemEntity.setPeopleFlag("2");//执法诉求 // 流水号 - itemEntity.setSerialNum(getSerialNum("zf")); + itemEntity.setSerialNum(getSerialNum("ZF")); baseDao.insert(itemEntity); //插入项目部门关联表 itemDeptService.savePeopleSubmitInfo(itemEntity); @@ -2500,9 +2500,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem entity.setItemCode("PT" + System.currentTimeMillis());//项目编号 entity.setIsPeople("1");//诉求上报 if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) { - entity.setSerialNum(getSerialNum("ms")); + entity.setSerialNum(getSerialNum("MS")); } else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) { - entity.setSerialNum(getSerialNum("fz")); + entity.setSerialNum(getSerialNum("FZ")); } baseDao.insert(entity); //插入项目部门关联表 @@ -2850,7 +2850,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem return 0 == process.getState()?true:15 == process.getState(); } - /** * 领域类别处理 * From 22422572476a6d842c56d913ed14071194401d76 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 13 Sep 2022 15:31:37 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E9=87=8D=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/entity/ItemGridPlatformEntity.java | 6 +- .../item/service/impl/ItemServiceImpl.java | 116 +++++++++++++++--- 2 files changed, 107 insertions(+), 15 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemGridPlatformEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemGridPlatformEntity.java index 639fd358d..b9dc7900b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemGridPlatformEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemGridPlatformEntity.java @@ -18,7 +18,6 @@ package com.elink.esua.epdc.modules.item.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -58,4 +57,9 @@ public class ItemGridPlatformEntity extends BaseEpdcEntity { */ private Integer status; + /** + * 驳回上报时间 + */ + private Date rejectDoTime; + } 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 0dad1efe2..3ec79f76f 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 @@ -67,6 +67,7 @@ import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdItemDto; import com.elink.esua.epdc.gird.shibei.dto.form.*; import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessHisResultDto; import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessResultDto; +import com.elink.esua.epdc.gird.shibei.dto.result.EventRejectDoResultDto; import com.elink.esua.epdc.gird.shibei.dto.result.SendEventResultDto; import com.elink.esua.epdc.gird.shibei.util.XstreamUtil; import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask; @@ -1394,6 +1395,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem return false; } + private ItemGridPlatformEntity getReport(String id) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("REFERENCE_ID", id); + ItemGridPlatformEntity gridEntity = itemGridPlatformDao.selectOne(wrapper); + return gridEntity; + } + /** * 项目流转校验 * @@ -1640,6 +1648,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem return sendResult; } + /** * 保存接口调用日志 * @@ -1837,6 +1846,26 @@ public class ItemServiceImpl extends BaseServiceImpl implem return sendDto; } + /** + * @describe: 组装驳回重办数据 + * @author wangtong + * @date 2022/9/13 13:47 + * @params [itemEntity] + * @return com.elink.esua.epdc.gird.shibei.dto.form.EventRejectReDoFormDto + */ + private EventRejectReDoFormDto packeageSendRejectReInfo(ItemEntity itemEntity) throws Exception { + EventRejectReDoFormDto result = new EventRejectReDoFormDto(); + //事件处理进度 + List handleImagesList = new ArrayList<>(); + List handleList = getHandleList(itemEntity.getId(),handleImagesList); + result.setHandleList(handleList); + //图片 + List images = getImageFileNew(itemEntity.getEventId() == null?itemEntity.getId():itemEntity.getEventId(),handleImagesList);//事件图片+处理流程图片 + //时间处理进度图片 + result.setIMAGES(images); + return result; + } + private String getItemLawNote(String itemId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("item_id", itemId); @@ -2091,6 +2120,29 @@ public class ItemServiceImpl extends BaseServiceImpl implem gridPlatformHandleLogService.insert(logEntity); } + /** + * @describe: 保存项目驳回上报信息 + * @author wangtong + * @date 2022/9/13 10:52 + * @params [gridEntity, handleProcessEntity] + * @return void + */ + private void saveItemRejectReDoInfo(ItemGridPlatformEntity gridEntity, ItemHandleProcessEntity handleProcessEntity) { + UserDetail user = SecurityUser.getUser(); + gridEntity.setRejectDoTime(new Date()); + itemGridPlatformService.updateById(gridEntity); + + GridPlatformHandleLogEntity logEntity = new GridPlatformHandleLogEntity(); + logEntity.setItemGridPlatformId(gridEntity.getId()); + logEntity.setStatus(handleProcessEntity.getState()); + logEntity.setItemHandleProcessId(handleProcessEntity.getItemId()); + logEntity.setHandler(null == user?handleProcessEntity.getHandlerDept():user.getRealName()); + logEntity.setHandlingOpinions(handleProcessEntity.getHandleAdvice()); + logEntity.setHandlingDept(handleProcessEntity.getHandlerDept()); + logEntity.setHandlingTime(handleProcessEntity.getCreatedTime()); + gridPlatformHandleLogService.insert(logEntity); + } + @Override @Transactional(rollbackFor = Exception.class) @@ -2736,22 +2788,58 @@ public class ItemServiceImpl extends BaseServiceImpl implem */ @Transactional(rollbackFor = Exception.class) public void sendItemToDsf(ItemHandleSubmitFormDTO dto,ItemHandleProcessEntity process){ - boolean reportFlag = this.checkReport(dto.getId()); - if (reportFlag) { - throw new RenException("当前项目已上报网格化平台"); - } - SendEventResultDto sendResult = null; - try { - sendResult = this.reportCaseNew(dto); - } catch (Exception e) { - throw new RenException("上报网格化平台接口失败" + sendResult.getMessage()); + ItemGridPlatformEntity gridEntity = this.getReport(dto.getId()); + if (null != gridEntity) { + //驳回重办 + EventRejectDoResultDto reDoResult = null; + try { + reDoResult = this.eventsRejectDo(dto,gridEntity.getTaskid()); + } catch (Exception e) { + throw new RenException("上报驳回重办失败" + reDoResult.getMessage()); + } + if (null == reDoResult || !("0").equals(reDoResult.getCode())) { + // 接口没有返回信息，也没有异常信息 + throw new RenException("上报驳回重办失败" + reDoResult.getMessage()); + } + //记录平台上报信息 + this.saveItemRejectReDoInfo(gridEntity,process); + } else { + //事件第一次上报 + SendEventResultDto sendResult = null; + try { + sendResult = this.reportCaseNew(dto); + } catch (Exception e) { + throw new RenException("上报网格化平台接口失败" + sendResult.getMessage()); + } + if (null == sendResult || !("0").equals(sendResult.getCode())) { + // 接口没有返回信息，也没有异常信息 + throw new RenException("上报网格化平台接口失败" + sendResult.getMessage()); + } + // 记录平台上报信息 + this.saveItemGridPlatformInfo(sendResult, process); } - if (null == sendResult || !("0").equals(sendResult.getCode())) { - // 接口没有返回信息，也没有异常信息 - throw new RenException("上报网格化平台接口失败" + sendResult.getMessage()); + } + + private EventRejectDoResultDto eventsRejectDo(ItemHandleSubmitFormDTO dto,String recid) throws Exception { + ItemEntity entity = baseDao.selectById(dto.getId()); + // 组装上报信息（图片和处理流程） + SendEventFormDto sendEventFormDto = packageSendEventEntity(entity,dto); + EventRejectReDoFormDto rejectReDoDTO = packeageSendRejectReInfo(entity); + rejectReDoDTO.setRECID(recid); + // 接口请求返回实体，getCode 1失败 0成功（非空） + log.info("处理项目-进入上报驳回重办-发送"); + EventRejectDoResultDto sendResult = shiBeiCityGridApi.sendReDoEvent(rejectReDoDTO); + log.info("处理项目-进入上报驳回重办-结束："+sendResult); + // 保存接口调用日志 + String successFlag = YesOrNoEnum.NO.value(); + if (NumConstant.ZERO_STR.equals(sendResult.getCode())) { + successFlag = YesOrNoEnum.YES.value(); } - // 记录平台上报信息 - this.saveItemGridPlatformInfo(sendResult, process); + this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REJECT_RE_DO.getValue(), + ApiConstants.sendEventUrl, successFlag, XstreamUtil.objectToXml(sendEventFormDto), + XstreamUtil.objectToXml(sendResult)); + log.info("处理项目-进入上报驳回重办-存储日志结束"); + return sendResult; } /** From 5c6fb6f883f21204157308f41bdf0ed0a20ae3ae Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 13 Sep 2022 16:11:46 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 3ec79f76f..8304e355f 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 @@ -1836,10 +1836,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem List handleImagesList = new ArrayList<>(); log.info("处理项目-获取进度开始"); List handleList = getHandleList(itemEntity.getId(),handleImagesList); + log.info("事件进度图片："+handleImagesList); log.info("处理项目-获取进度结束"); sendDto.setHandleList(handleList); //图片 List images = getImageFileNew(itemEntity.getEventId() == null?itemEntity.getId():itemEntity.getEventId(),handleImagesList);//事件图片+处理流程图片 + log.info("图片组装结束："+images); //时间处理进度图片 sendDto.setIMAGES(images); log.info("处理项目-返回组装数据"); @@ -1858,6 +1860,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //事件处理进度 List handleImagesList = new ArrayList<>(); List handleList = getHandleList(itemEntity.getId(),handleImagesList); + log.info("事件进度图片："+handleImagesList); result.setHandleList(handleList); //图片 List images = getImageFileNew(itemEntity.getEventId() == null?itemEntity.getId():itemEntity.getEventId(),handleImagesList);//事件图片+处理流程图片 @@ -2823,7 +2826,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem private EventRejectDoResultDto eventsRejectDo(ItemHandleSubmitFormDTO dto,String recid) throws Exception { ItemEntity entity = baseDao.selectById(dto.getId()); // 组装上报信息（图片和处理流程） - SendEventFormDto sendEventFormDto = packageSendEventEntity(entity,dto); EventRejectReDoFormDto rejectReDoDTO = packeageSendRejectReInfo(entity); rejectReDoDTO.setRECID(recid); // 接口请求返回实体，getCode 1失败 0成功（非空） @@ -2836,7 +2838,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem successFlag = YesOrNoEnum.YES.value(); } this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REJECT_RE_DO.getValue(), - ApiConstants.sendEventUrl, successFlag, XstreamUtil.objectToXml(sendEventFormDto), + ApiConstants.sendEventUrl, successFlag, XstreamUtil.objectToXml(rejectReDoDTO), XstreamUtil.objectToXml(sendResult)); log.info("处理项目-进入上报驳回重办-存储日志结束"); return sendResult; From f241e126f3f3f83c5f73eb7993e95d5a838099c9 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 13 Sep 2022 16:23:46 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E5=BD=93=E9=A1=B9=E7=9B=AE=E6=B2=A1=E6=9C=89=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A4=84=E7=90=86=E6=84=8F=E8=A7=81=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B9=9F=E8=A6=81=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 8304e355f..e062873ec 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 @@ -2005,9 +2005,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem } //替换了诉求上传接口，现在无需压缩 // List imgUrlList = this.getUploadDTOListNew(handleImagesList); - return handleImagesList; } - return null; + return handleImagesList; } // 组装事件图片 From bb3ccc403fc6ecef5eac85de1528d6f244769e43 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 13 Sep 2022 17:20:59 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E5=8F=B7=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-commons-shibei | 2 +- .../esua/epdc/dto/item/result/ItemDetailResultDTO.java | 6 ++++++ .../com/elink/esua/epdc/dto/item/result/ItemResultDTO.java | 6 ++++++ .../src/main/resources/mapper/item/ItemDao.xml | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 896a3cc0f..8f098d155 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 896a3cc0f925815d096ba4b93c07a0e6bce662f4 +Subproject commit 8f098d15559c1f17a9c507eac39475620b667ac2 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java index e444c43b4..dae304754 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java @@ -150,4 +150,10 @@ public class ItemDetailResultDTO implements Serializable { * 满意度评价内容 */ private String evaluationContent; + + /** + * 流水号 + */ + private String serialNum; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java index 11417b757..9fff8e251 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java @@ -90,6 +90,12 @@ public class ItemResultDTO implements Serializable { * 是否是诉求上报:0否1是 */ private String isPeople; + + /** + * 流水号 + */ + private String serialNum; + /** * 最新进展 */ 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 144d6098f..81cde0ffe 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 @@ -22,6 +22,7 @@ + @@ -373,6 +374,7 @@ + @@ -389,6 +391,7 @@ (ua.attitude_flag = 1) userDislike, item.ID, + item.SERIAL_NUM, item.EVALUATION_SCORE, item.EVALUATION_CONTENT, item.EVENT_ID, @@ -1358,6 +1361,7 @@ eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.COMMENT_NUM, + item.SERIAL_NUM, ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum, cate.CATEGORY_NAME, img.IMG_URL, From 79ae32698f34368dd5bbd87735d3445633ccf4bf Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 13 Sep 2022 18:19:30 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AF=89=E6=B1=82=E6=BB=A1=E6=84=8F=E5=BA=A6?= =?UTF-8?q?=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiWorkItemController.java | 12 +++++++++++ .../esua/epdc/service/WorkItemService.java | 9 +++++++++ .../service/impl/WorkItemServiceImpl.java | 20 +++++++++++++++++++ .../item/service/impl/ItemServiceImpl.java | 4 ++-- .../main/resources/mapper/item/ItemDao.xml | 4 ++-- 5 files changed, 45 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java index 45b7c8431..3cd2f4db7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java @@ -169,4 +169,16 @@ public class ApiWorkItemController { public Result getLawItemDetail(@PathVariable String id) { return workItemService.getLawItemDetail(id); } + + /** + * @describe: 工作端-执法诉求-满意度评价 + * @author wangtong + * @date 2022/9/13 16:41 + * @params [evaluationFormDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("zfEvaluation") + public Result zfEvaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) { + return workItemService.zfEvaluation(evaluationFormDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java index b3c23d36b..ca0ebbbd9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java @@ -124,4 +124,13 @@ public interface WorkItemService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result getLawItemDetail(String id); + + /** + * @describe: 工作端-执法诉求-满意度评价 + * @author wangtong + * @date 2022/9/13 16:41 + * @params [evaluationFormDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result zfEvaluation(EvaluationFormDTO evaluationFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java index cae47a88e..edd7a8558 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java @@ -7,6 +7,8 @@ import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.feign.ItemFeignClient; +import com.elink.esua.epdc.feign.PointsFeignClient; import com.elink.esua.epdc.feign.WorkItemFeignClient; import com.elink.esua.epdc.service.WorkItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +27,12 @@ public class WorkItemServiceImpl implements WorkItemService { @Autowired private WorkItemFeignClient workItemFeignClient; + @Autowired + private ItemFeignClient itemFeignClient; + + @Autowired + private PointsFeignClient pointFeignClient; + /** * 项目统计 * @Params: [formDto] @@ -103,4 +111,16 @@ public class WorkItemServiceImpl implements WorkItemService { return workItemFeignClient.getLawItemDetail(id); } + @Override + public Result zfEvaluation(EvaluationFormDTO evaluationFormDTO) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RuntimeException("获取用户信息失败"); + } + evaluationFormDTO.setUserId("zfsq"+user.getId().toString()); + evaluationFormDTO.setUserName(user.getUsername()); + evaluationFormDTO.setDeptId(user.getDeptId()); + return itemFeignClient.evaluation(evaluationFormDTO); + } + } 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 e062873ec..f1ce162b7 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 @@ -2719,8 +2719,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem result.setLawDetail(ConvertUtils.sourceToTarget(itemLaw, ItemAppealLawDetailResultDTO.class)); } // 满意度评价部门 -// List evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(resultDTO.getId(), deptId); -// resultDTO.setEvaluateDeptDTOS(evaluateDeptDTOS); +// List evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(result.getId(), deptId); +// result.setEvaluateDeptDTOS(evaluateDeptDTOS); return new Result().ok(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 81cde0ffe..d284643d8 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 @@ -392,7 +392,7 @@ item.ID, item.SERIAL_NUM, - item.EVALUATION_SCORE, + ifnull(item.EVALUATION_SCORE,2) as EVALUATION_SCORE, item.EVALUATION_CONTENT, item.EVENT_ID, item.ISSUE_ID, @@ -1524,7 +1524,7 @@ item.ITEM_VOICE, item.DURATION, item.CONTACT_NAME, - EVALUATION_SCORE, + ifnull(EVALUATION_SCORE,2) as EVALUATION_SCORE, case EVALUATION_SCORE when '0' then '不满意' when '1' then '基本满意' From 81dbf81c986fce9c2d246d5bb2764822861a595e Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 13 Sep 2022 18:40:03 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E5=90=B9=E5=93=A8=E8=AF=9D=E6=9C=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 f1ce162b7..a18a8cb2d 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 @@ -2891,10 +2891,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem if("0".equals(formDto.getState())){ ItemEntity item = baseDao.selectById(itemPlat.getReferenceId()); itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); - //判断最后一条处理进展是吹哨还是结案，结案：取第一条处置意见；吹哨：取最后一条处置意见 - if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag()) || getItemIsCs(itemPlat.getReferenceId())){ + //判断最后一条处理进展是吹哨还是结案，结案：取第一条处置意见；吹哨：取平台处置意见 + if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag())){ //执法和发展填写网格化平台的意见 itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()); + }else if(getItemIsCs(itemPlat.getReferenceId())){ + //吹哨 + itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()+"h_s办理人："+item.getHandlePeopleName()+"，联系电话："+item.getHandlePeopleMobile()); }else{ //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！ ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId()); From 891ce3c0e60a22850a7120a13e62c7588b0e4715 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 13 Sep 2022 19:29:57 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=90=B9=E5=93=A8=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemHandleProcessDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml index 4ec707ac6..6808923ec 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml @@ -16,6 +16,7 @@ from epdc_item_handle_process where DEL_FLAG='0' and item_id=#{itemId} + and HANDLER_DEPT !='网格化平台' order by CREATED_TIME desc limit 1 From 9ad18f43ec0834d9e2be1dff0357767101f2912a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 13 Sep 2022 20:11:03 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BD=91=E6=A0=BC=E5=8C=96=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a18a8cb2d..7c2e9f733 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 @@ -2223,7 +2223,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem try { for (EventProcessResultDto dto : progressList) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date insertTime = sdf.parse(dto.getCREATEDATE()); // 拉取的记录增加30秒，防止出现排序问题 insertTime.setTime(insertTime.getTime() + 55000); From 163768e1787e9319c0fcc0bd40bce5fe0cb9503a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 13 Sep 2022 20:14:49 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AF=89=E6=B1=82?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E6=B0=B4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 d284643d8..7bfc10618 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 @@ -1543,8 +1543,6 @@