From d98a1128eada4d9f023444c9011d3f044ff3813e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 19 Oct 2022 09:16:09 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=8F=8B=E5=A5=BD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 8ab291b3b..d01380255 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -44,6 +44,7 @@ import com.elink.esua.epdc.user.dto.epdc.result.*; import com.elink.esua.epdc.user.enums.*; import com.elink.esua.epdc.utils.UserTagUtils; import com.elink.esua.epdc.utils.WxMaServiceUtils; +import com.google.gson.JsonSyntaxException; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; @@ -1429,6 +1430,10 @@ public class AppUserServiceImpl implements AppUserService { } catch (WxErrorException e) { e.printStackTrace(); log.error(e.getError().getErrorMsg()); + } catch (JsonSyntaxException e) { + e.printStackTrace(); + log.error(e.getMessage()); + return new Result().error("解析用户手机号失败，请重试"); } return new Result().error("解析用户手机号失败"); } From b056df0bdc9b58d545b3d9706341fe8d63b861f2 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 19 Oct 2022 09:29:15 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=95=88=E8=83=BD=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8E=92=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ScreenDeptEventEfficiencyServiceImpl.java | 6 +++--- .../mapper/screen/ScreenDeptEventEfficiencyDao.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java index 8a9af0d41..0fb116928 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java @@ -323,12 +323,12 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl - ORDER BY EVENT_COUNT DESC + ORDER BY CLOSED_RATIO+0 DESC @@ -505,7 +505,7 @@ - ORDER BY RESPONSE_RATIO+0 DESC, CLOSED_RATIO+0 DESC, SATISFIED_RATIO+0 DESC + ORDER BY SATISFIED_RATIO+0 DESC, CLOSED_RATIO+0 DESC, RESPONSE_RATIO+0 DESC From b915e19ef54ef6d526147b12e56e0eec94f5ac6d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 19 Oct 2022 09:40:41 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=8D=95=E8=8E=B7=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=8C=E8=AF=84=E4=BB=B7=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=BB=A1=E6=84=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 5 +++-- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index d01380255..7167d7778 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1430,10 +1430,11 @@ public class AppUserServiceImpl implements AppUserService { } catch (WxErrorException e) { e.printStackTrace(); log.error(e.getError().getErrorMsg()); - } catch (JsonSyntaxException e) { + return new Result().error("解析用户手机号失败"); + } catch (Exception e) { e.printStackTrace(); log.error(e.getMessage()); - return new Result().error("解析用户手机号失败，请重试"); + return new Result().error("解析用户手机号失败，请重新获取"); } return new Result().error("解析用户手机号失败"); } 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 7a5544165..1694fcdb4 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 @@ -3753,7 +3753,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridPartyname("结案"); itemHandleProcessDto.setGridTaskcnname("区中心"); item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue()); - // 可以进行评价了 + // 可以进行评价了，默认评分-满意 + item.setEvaluationScore(NumConstant.ONE); item.setEvaluationState(NumConstant.ONE_STR); updateById(item); } else if ("1".equals(formDto.getState())) { From 7d5c8b336133289c8a81aec1f000b33294c8d18c Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 19 Oct 2022 10:04:15 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CategoryServiceImpl.java | 46 ++++----------- .../service/impl/EpdcEventsServiceImpl.java | 34 +---------- .../impl/EventUserAttitudeServiceImpl.java | 2 +- .../issue/service/impl/IssueServiceImpl.java | 21 ------- .../item/dao/GridPlatformHandleLogDao.java | 22 ------- .../esua/epdc/modules/item/dao/ItemDao.java | 29 ---------- .../item/dao/ItemHandleProcessDao.java | 34 +---------- .../service/GridPlatformHandleLogService.java | 20 ------- .../GridPlatformHandleLogServiceImpl.java | 18 +----- .../mapper/item/GridPlatformHandleLogDao.xml | 8 --- .../main/resources/mapper/item/ItemDao.xml | 57 +------------------ .../mapper/item/ItemHandleProcessDao.xml | 29 ---------- 12 files changed, 20 insertions(+), 300 deletions(-) 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 528ba7936..7c73baf51 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 @@ -24,8 +24,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; +import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; @@ -48,7 +48,6 @@ import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; import com.elink.esua.epdc.modules.rocketmq.producer.CategoryModifyProducer; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -295,9 +294,7 @@ public class CategoryServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper(categoryEntity); List categoryEntityList = baseDao.selectList(wrapper); int numm = categoryEntityList.size(); - if(numm >= 0){ - numm -= 1; - } + numm -= 1; //一级分类 String firstClassName = "领域1"; Long firstClassId = 0L; @@ -399,7 +396,7 @@ public class CategoryServiceImpl extends BaseServiceImpl parentNameList = Lists.newArrayList(); String[] pidList = entity.getPids().split(StrConstant.COMMA); - if (null != pidList && pidList.length > NumConstant.ZERO) { + if (pidList.length > NumConstant.ZERO) { CategoryEntity parentEntity; - for (int i = 0; i < pidList.length; i++) { - parentEntity = baseDao.getById(Long.valueOf(pidList[i])); - if (null != parentEntity) { - parentNameList.add(parentEntity.getCategoryName()); - } - } + for (String s : pidList) { + parentEntity = baseDao.getById(Long.valueOf(s)); + if (null != parentEntity) { + parentNameList.add(parentEntity.getCategoryName()); + } + } } categoryInfoResult = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class); if (CollUtil.isNotEmpty(parentNameList)) { @@ -605,7 +581,7 @@ public class CategoryServiceImpl extends BaseServiceImpl list = baseDao.statEventReportAmount(eventReportAmountFormDto, issueLimitHour); - - return list; + return baseDao.statEventReportAmount(eventReportAmountFormDto, issueLimitHour); } @Override @@ -751,27 +745,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl parentDeptIds = Arrays.asList(events.getParentDeptIds().split(",")); -// List parentDeptNames = Arrays.asList(events.getParentDeptNames().split("-")); -// int index = parentDeptIds.indexOf(dto.getDeptId().toString()); -// if (index >= 0 && parentDeptNames.size() > index) { -// parentDeptNames.set(index, dto.getNewDeptName()); -// entity.setId(events.getId()); -// entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); -// } -// } -// -// if (StringUtils.isNotEmpty(events.getAllDeptIds()) && StringUtils.isNotEmpty(events.getAllDeptNames())) { -// List allDeptIds = Arrays.asList(events.getAllDeptIds().split(",")); -// List allDeptNames = Arrays.asList(events.getAllDeptNames().split("-")); -// int index = allDeptIds.indexOf(dto.getDeptId().toString()); -// if (index >= 0 && allDeptNames.size() > index) { -// allDeptNames.set(index, dto.getNewDeptName()); -// entity.setId(events.getId()); -// entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); -// } -// } entities.add(entity); } @@ -841,8 +814,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl rejectEventsExportList(Map params) { - List list = baseDao.selectListOfRejectEvents(params); - return list; + return baseDao.selectListOfRejectEvents(params); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java index a0fc5ffac..e0b9daa4e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java @@ -20,10 +20,10 @@ package com.elink.esua.epdc.modules.issue.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.constant.EventsNoticeConstant; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.issue.EventUserAttitudeDTO; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index bcfaff473..c2a6659c3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -617,27 +617,6 @@ public class IssueServiceImpl extends BaseServiceImpl imp entity.setParentDeptNames(dto.getAllDeptNames()); } -// if (StringUtils.isNotEmpty(issue.getParentDeptIds()) && StringUtils.isNotEmpty(issue.getParentDeptNames())) { -// List parentDeptIds = Arrays.asList(issue.getParentDeptIds().split(",")); -// List parentDeptNames = Arrays.asList(issue.getParentDeptNames().split("-")); -// int index = parentDeptIds.indexOf(dto.getDeptId().toString()); -// if (index >= 0 && parentDeptNames.size() > index) { -// parentDeptNames.set(index, dto.getNewDeptName()); -// entity.setId(issue.getId()); -// entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); -// } -// } -// -// if (StringUtils.isNotEmpty(issue.getAllDeptIds()) && StringUtils.isNotEmpty(issue.getAllDeptNames())) { -// List allDeptIds = Arrays.asList(issue.getAllDeptIds().split(",")); -// List allDeptNames = Arrays.asList(issue.getAllDeptNames().split("-")); -// int index = allDeptIds.indexOf(dto.getDeptId().toString()); -// if (index >= 0 && allDeptNames.size() > index) { -// allDeptNames.set(index, dto.getNewDeptName()); -// entity.setId(issue.getId()); -// entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); -// } -// } entities.add(entity); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java index aad309997..e437ad990 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java @@ -33,28 +33,6 @@ import java.util.List; @Mapper public interface GridPlatformHandleLogDao extends BaseDao { - /** - * - * 根据网格化平台项目关系表ID获取历史处理记录 - * - * @params [itemGridPlatformId] - * @return java.util.List - * @author liuchuang - * @since 2019/12/25 19:17 - */ - List selectListOfHandleProcessLogByItemGridPlatFormId(String itemGridPlatformId); - - /** - * - * 根据网格化平台项目关系表ID清空处理记录 - * - * @params [itemGridPlatformId] - * @return void - * @author liuchuang - * @since 2019/12/25 18:58 - */ - void deleteHandleProcessByItemGridPlatFormId(String itemGridPlatformId); - /** * * 获取网格化平台最新处理情况 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index e944a2eaa..6ae2d8aec 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -236,16 +236,6 @@ public interface ItemDao extends BaseDao { */ ItemContentForPCEndResultDTO selectItemContentForPCEnd(String itemId); - /** - * 项目处理发送菜单消息 - * - * @return int - * @params [deptId, state] - * @author liuchuang - * @since 2019/10/30 13:28 - */ - int selectCountOfItemDeptNotice(@Param("deptId") Long deptId, @Param("state") int state); - /** * 根据吹哨部门ID统计吹哨部门待处理项目数量 * @@ -329,16 +319,6 @@ public interface ItemDao extends BaseDao { List selectListItemCloseAmount(@Param("timeLimitList") List kpiItemTimeLimitByDeptList, @Param("metaDataCode") String metaDataCode); - /** - * 删除项目处理进度表历史记录 - * - * @return void - * @params [ids] - * @author liuchuang - * @since 2019/12/25 19:23 - */ - void deleteBatchItemHandleIds(@Param("ids") List ids); - /** * @Description: 根据项目id，查询当前登录人所在部门，以外的该项目关联的所有部门id * @Param: [itemId] 项目id @@ -409,15 +389,6 @@ public interface ItemDao extends BaseDao { */ void rejectItemSatisfactionInfo(@Param("id") String id); - /** - * @return java.lang.Integer - * @describe: 通过项目id查询项目所在的二级分类 - * @author wangtong - * @date 2020/12/16 18:26 - * @params [id] - */ - String selectSecondCateByItemId(@Param("id") String id); - /** * @return java.util.List * @describe: 北尚诉求列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java index 6a05f3abd..e01f3a881 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java @@ -37,16 +37,6 @@ import java.util.List; @Mapper public interface ItemHandleProcessDao extends BaseDao { - /** - * 保存处理进度 - * - * @return void - * @params [dto] - * @author liuchuang - * @since 2019/12/26 19:12 - */ - void insertItemHandleProcess(ItemHandleProcessDTO dto); - /** * 更新操作人部门名称 * @@ -76,16 +66,6 @@ public interface ItemHandleProcessDao extends BaseDao { */ ItemHandleProcessCaseClosedToCityDTO getHandler(@Param("id") String id); - - /** - * 诉求派遣 - * - * @param state - * @return - */ - List getProcessListByState(@Param("state") String state); - - /** * 根据流程编号和日期获取流程数据 * @@ -96,16 +76,6 @@ public interface ItemHandleProcessDao extends BaseDao { */ List listProcessByStateAndDate(@Param("state") String state, @Param("date") String date); - /** - * 派遣审核 - * - * @param state - * @return java.util.List - * @author LZN - * @date 2022/9/19 10:25 - */ - List getDispatchAudit(@Param("state") String state); - /** * 诉求上报 * @@ -118,6 +88,7 @@ public interface ItemHandleProcessDao extends BaseDao { /** * 上报驳回 + * * @param id * @return */ @@ -125,10 +96,11 @@ public interface ItemHandleProcessDao extends BaseDao { /** * 诉求处理 + * * @param id * @return */ - AppealHandlingToCityResultDTO getAppealHandling(@Param("id") String id,@Param("itemId") String itemId); + AppealHandlingToCityResultDTO getAppealHandling(@Param("id") String id, @Param("itemId") String itemId); List getURL(String itemId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java index ae2526a26..f9b0529ae 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java @@ -93,26 +93,6 @@ public interface GridPlatformHandleLogService extends BaseService - * @params [itemGridPlatformId] - * @author liuchuang - * @since 2019/12/25 19:17 - */ - List listOfHandleProcessLogByItemGridPlatFormId(String itemGridPlatformId); - - /** - * 根据网格化平台项目关系表ID清空处理记录 - * - * @return void - * @params [itemGridPlatformId] - * @author liuchuang - * @since 2019/12/25 18:56 - */ - void removeHandleProcessByItemGridPlatFormId(String itemGridPlatformId); - /** * 获取网格化平台最新处理情况 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java index 23cf8b022..708909937 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/GridPlatformHandleLogServiceImpl.java @@ -20,16 +20,14 @@ package com.elink.esua.epdc.modules.item.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.dto.item.GridPlatformHandleLogDTO; import com.elink.esua.epdc.modules.item.dao.GridPlatformHandleLogDao; import com.elink.esua.epdc.modules.item.entity.GridPlatformHandleLogEntity; -import com.elink.esua.epdc.modules.item.redis.GridPlatformHandleLogRedis; import com.elink.esua.epdc.modules.item.service.GridPlatformHandleLogService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,9 +44,6 @@ import java.util.Map; @Service public class GridPlatformHandleLogServiceImpl extends BaseServiceImpl implements GridPlatformHandleLogService { - @Autowired - private GridPlatformHandleLogRedis gridPlatformHandleLogRedis; - @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -101,17 +96,6 @@ public class GridPlatformHandleLogServiceImpl extends BaseServiceImpl listOfHandleProcessLogByItemGridPlatFormId(String itemGridPlatformId) { - return baseDao.selectListOfHandleProcessLogByItemGridPlatFormId(itemGridPlatformId); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void removeHandleProcessByItemGridPlatFormId(String itemGridPlatformId) { - baseDao.deleteHandleProcessByItemGridPlatFormId(itemGridPlatformId); - } - @Override public GridPlatformHandleLogDTO getLastHandleProcess(String itemGridPlatformId) { return baseDao.selectOneOfLastProcessLog(itemGridPlatformId); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml index d9fa49ab6..ccb859e60 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml @@ -35,14 +35,6 @@ - - - - DELETE FROM epdc_grid_platform_handle_log WHERE ITEM_GRID_PLATFORM_ID = #{itemGridPlatformId} - - - - - - DELETE FROM epdc_item_handle_process WHERE ID IN - - #{id} - - - - SELECT - case - when c3.category_code is null then c1.category_code - when c4.category_code is null then c2.category_code - when c5.category_code is null then c3.category_code - when c6.category_code is null then c4.category_code - when c7.category_code is null then c5.category_code - when c8.category_code is null then c6.category_code - end as category - FROM epdc_item t - left join `epdc_category` c1 on t.CATEGORY_CODE=c1.category_code and c1.enable_flag='1' and c1.del_flag='0' - left join epdc_category c2 on c1.pid=c2.id and c2.enable_flag='1' and c2.del_flag='0' - left join epdc_category c3 on c2.pid=c3.id and c3.enable_flag='1' and c3.del_flag='0' - left join epdc_category c4 on c3.pid=c4.id and c4.enable_flag='1' and c4.del_flag='0' - left join epdc_category c5 on c4.pid=c5.id and c5.enable_flag='1' and c5.del_flag='0' - left join epdc_category c6 on c5.pid=c6.id and c6.enable_flag='1' and c6.del_flag='0' - left join epdc_category c7 on c6.pid=c7.id and c7.enable_flag='1' and c7.del_flag='0' - left join epdc_category c8 on c7.pid=c8.id and c8.enable_flag='1' and c8.del_flag='0' - where - t.id=#{id} - and t.FIRST_CATEGORY_CODE!=t.category_code - + - - - - - SELECT a.id AS deptId, @@ -107,6 +114,8 @@ GROUP BY ALL_DEPT_IDS ) b ON b.ALL_DEPT_IDS LIKE CONCAT('%', a.id, '%') WHERE a.del_flag = '0' + AND a.type_key != 'street_dept' + AND a.type_key != 'district_dept' GROUP BY a.id + + + + + + \ No newline at end of file From 3a63795062ddc644fa36b44f2d6a4a6bfb019863 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 19 Oct 2022 16:07:39 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=8C=BA=E7=9B=B4?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml index 89daedbc0..1bd85d98c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml @@ -430,11 +430,12 @@ FROM screen_dept_event_efficiency WHERE DEL_FLAG = '0' - AND PID = #{deptId} + AND (DEPT_LEVEL = 'street_dept' OR DEPT_LEVEL = 'district_dept') + AND PID = #{deptId} AND DEPT_LEVEL != 'street_dept' AND DEPT_LEVEL != 'district_dept' From f514de44efb73cc57f99abeab2c7b77ed1a13acc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 20 Oct 2022 10:53:22 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 980cfcaa5..442af207c 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 @@ -2294,6 +2294,23 @@ AND SUBSTRING_INDEX(i.category_full_code,'-',1) = #{code} + + + and i.item_state='0' and getworkminute(i.created_time, now()) > 480 + + + and i.item_state='0' + and getworkminute(i.created_time, now()) > 360 + and getworkminute(i.created_time, now()) 480 + + + and i.item_state='0' and getworkminute(i.created_time, now()) 360 + + + + + AND i.evaluation_score = #{evaluationScore} + order by i.created_time DESC From e4995a2897212df0bee17b78121efd49479394c0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 20 Oct 2022 11:07:30 +0800 Subject: [PATCH 13/13] . --- .../src/main/resources/mapper/item/ItemDao.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 442af207c..1f95dab2a 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 @@ -2291,9 +2291,12 @@ AND DATE_FORMAT(i.created_time,'%Y-%m-%d') #{statDate} - + AND SUBSTRING_INDEX(i.category_full_code,'-',1) = #{code} + + AND SUBSTRING_INDEX(i.category_full_code,'-',2) = #{code} + and i.item_state='0' and getworkminute(i.created_time, now()) > 480