From 6f2bf1385dc57a001457861804ff3d3fcb141495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 18 Apr 2023 09:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E6=83=85=E5=86=B5=E5=8A=9F=E8=83=BD=EF=BC=8C=20?= =?UTF-8?q?=E5=B0=8624=E5=B0=8F=E6=97=B6=E8=87=AA=E5=8A=A8=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E6=94=B9=E4=B8=BA3=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-commons-shibei | 2 +- esua-epdc/epdc-cloud-gateway-shibei | 2 +- .../esua/epdc/dto/item/form/EvaluationFormDTO.java | 5 +++++ .../esua/epdc/dto/item/result/EvaluationResultDTO.java | 5 +++++ .../dto/item/result/ItemAppealDetailResultDTO.java | 5 +++++ .../esua/epdc/dto/item/result/ItemDetailResultDTO.java | 5 +++++ .../esua/epdc/modules/item/entity/ItemEntity.java | 5 +++++ .../modules/item/service/impl/ItemServiceImpl.java | 10 +++++++++- .../item/service/impl/PushToCityGridServiceImpl.java | 5 +++-- .../src/main/resources/mapper/item/ItemDao.xml | 5 +++++ 10 files changed, 44 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index f7b0609f3..acfb0b9cc 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit f7b0609f3afdc9fd59dfd2564bf1a6af227bac57 +Subproject commit acfb0b9ccee315c05a5bcf342f29ef16da914349 diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index fa2c20005..4ee6a3054 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit fa2c20005c4b52aa606b2433c38ce51d3111ff9e +Subproject commit 4ee6a3054b7c0cc5d5d36aa01abe5f6ae67663db diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java index 438c6ce3b..8e1765515 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java @@ -41,4 +41,9 @@ public class EvaluationFormDTO implements Serializable { */ private Long deptId; + /** + * 解决情况 + */ + private String solutionInfo; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EvaluationResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EvaluationResultDTO.java index 7b0f97f91..8048ccb45 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EvaluationResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EvaluationResultDTO.java @@ -43,6 +43,11 @@ public class EvaluationResultDTO implements Serializable { */ private String czyj; + /** + * 解决情况01 解决 02 基本解决 03 未解决 + */ + private String jjqk; + @NoArgsConstructor @Data public static class CzrBean { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java index 6595725c2..5b171cd47 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java @@ -146,4 +146,9 @@ public class ItemAppealDetailResultDTO implements Serializable { */ private String isFeedback = "0"; + /** + * 解决情况 + */ + private String solutionInfo; + } 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 3e8e15faa..165570f53 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 @@ -231,4 +231,9 @@ public class ItemDetailResultDTO implements Serializable { */ private List itemImges; + /** + * 解决情况 + */ + private String solutionInfo; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java index 4693d05ac..08e65a71f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java @@ -283,4 +283,9 @@ public class ItemEntity extends BaseEpdcEntity { * 是否典型案例：0否1是 */ private String isTypical; + + /** + * 解决情况 + */ + private String solutionInfo; } 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 46fc4fdf8..0d9d31328 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 @@ -1009,7 +1009,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setId(evaluationFormDTO.getItemId()); itemEntity.setEvaluationScore(evaluationFormDTO.getEvaluationScore()); itemEntity.setEvaluationContent(evaluationFormDTO.getEvaluationContent()); + // 4-10 新增解决情况 + itemEntity.setSolutionInfo(evaluationFormDTO.getSolutionInfo()); itemEntity.setEvaluationTime(new Date()); + // 新增解决情况 +// itemEntity.setSolutionInfo(evaluationFormDTO.getev); //2022.10.24 评价接口增加第一次评价不管第二次为满意时不管为不满意时将数据推到难点堵点的逻辑 if (evaluationFormDTO.getEvaluationScore() == 0) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -4065,7 +4069,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto); if ("0".equals(formDto.getState())) { //3.将数据放入redis，供24小时候定时任务自动结案使用 - itemAutoProcessRedis.produce(itemPlat.getReferenceId(), itemHandleProcessDto.getCreatedTime().getTime() + (24 * 60 * 60 * 1000)); + itemAutoProcessRedis.produce(itemPlat.getReferenceId(), itemHandleProcessDto.getCreatedTime().getTime() + (3 * 60 * 60 * 1000)); } //项目处理意见图片保存 @@ -4748,6 +4752,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem entity.setEvaluationScore(2); entity.setEvaluationContent("满意"); entity.setEvaluationTime(new Date()); + //2023-04新增 解决情况01 解决 02 基本解决 03 未解决 + entity.setSolutionInfo("02"); } entity.setEvaluationState("0"); updateById(entity); @@ -5145,6 +5151,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem item.setEvaluationScore(2); //item.setEvaluationContent(); item.setEvaluationTime(new Date()); + //2023-04新增 解决情况01 解决 02 基本解决 03 未解决 + item.setSolutionInfo("02"); } updateById(item); } 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 e6490960a..3646897ea 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 @@ -636,8 +636,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { data.setSqzt(CityPushStateEnum.DSH.getCode()); // 当前处理环节 data.setDqclhj(CityPushLinkEnum.SQSH.getCode()); - //处置标识 - data.setCzbs(getItemCzbs(item.getGridNextcantoncode())); + //处置标识 01 社区处置 02 街道处置 + data.setCzbs(item.getHandlerDeptId()==0?"02":"01"); // 执法类型添加类型，纪要，进度字段 if (item.getPeopleFlag().equals(NumConstant.TWO_STR)) { //办理进度 诉求分类是执法的时候 @@ -1031,6 +1031,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { dto.setSqid(item.getSqid()); dto.setSqzt(CityPushStateEnum.DJA.getCode()); dto.setDqclhj(CityPushLinkEnum.JA.getCode()); + dto.setJjqk(item.getSolutionInfo()); //评价结果 01：满意；02：基本满意；03：不满意 switch (item.getEvaluationScore()) { case NumConstant.ZERO: 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 8096a9715..20dd22530 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 @@ -38,6 +38,7 @@ + @@ -400,6 +401,7 @@ + @@ -431,6 +433,7 @@ item.ISSUE_ADDRESS, item.CATEGORY_CODE, item.FIRST_CATEGORY_CODE, + item.SOLUTION_INFO, eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.BROWSE_NUM, @@ -2377,6 +2380,7 @@ + @@ -2406,6 +2410,7 @@ item.ITEM_VOICE, item.DURATION, item.CONTACT_NAME, + item.SOLUTION_INFO, ifnull(EVALUATION_SCORE,2) as EVALUATION_SCORE, case EVALUATION_SCORE when '0' then '不满意'