From 7e2778bfb443cd2668fc58038d559a7803c3bcc9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 8 Sep 2022 08:59:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/dao/ItemDao.java | 97 +++++++++---------- 1 file changed, 46 insertions(+), 51 deletions(-) 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 92a69ca7e..5aa63737e 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 @@ -64,12 +64,12 @@ public interface ItemDao extends BaseDao { List selectListOfItems(ItemFormDTO formDto, int[] states); /** - * @describe: 居民端-北尚诉办-我的上报 - * @author wangtong - * @date 2022/8/23 15:52 - * @params [formDto] - * @return java.util.List - */ + * @return java.util.List + * @describe: 居民端-北尚诉办-我的上报 + * @author wangtong + * @date 2022/8/23 15:52 + * @params [formDto] + */ List getItemListByUserId(PeopleItemFormDTO formDto); /** @@ -177,11 +177,10 @@ public interface ItemDao extends BaseDao { List selectListOfItemHandleProgressByWork(@Param("itemId") String itemId); /** - * * 居民端项目处理进度 * - * @params [itemId] * @return java.util.List + * @params [itemId] * @author liuchuang * @since 2019/12/23 20:08 */ @@ -289,12 +288,12 @@ public interface ItemDao extends BaseDao { */ List selectListItemCloseAmount(@Param("timeLimitList") List kpiItemTimeLimitByDeptList, @Param("metaDataCode") String metaDataCode); + /** - * * 删除项目处理进度表历史记录 * - * @params [ids] * @return void + * @params [ids] * @author liuchuang * @since 2019/12/25 19:23 */ @@ -314,51 +313,47 @@ public interface ItemDao extends BaseDao { * @Description: 根据项目id，当前登录人所在部门id, 查询当前项目是由哪个部门吹哨而来 * @Param: [itemId] 项目id * @Param: [deptId] 部门id - * @return: java.util.List 上级部门id + * @return: java.util.List 上级部门id * @Author: zy * @Date: 2020-01-14 */ List queryParentDeptId(@Param("itemId") String itemId, @Param("deptId") Long deptId); /** - * * 查询需要修改组织机构信息事件 * - * @params [deptId] * @return java.util.List + * @params [deptId] * @author liuchuang * @since 2020/3/7 0:20 */ List selectListOfOrganizationInfo(String deptId); /** - * * 更新网格名称 * - * @params [newDeptName, deptId] * @return void + * @params [newDeptName, deptId] * @author liuchuang * @since 2020/3/7 1:20 */ void updateGridByDeptId(String newDeptName, Long deptId); /** - * * 更新项目表党员群名称 * - * @params [groups] * @return void + * @params [groups] * @author liuchuang * @since 2020/3/7 12:54 */ void updateBatchPartyGroupName(@Param("groups") List groups); /** - * * 查询需要修改的分类信息 * - * @params [oldCategoryName] * @return java.util.List + * @params [oldCategoryName] * @author liuchuang * @since 2020/3/7 16:39 */ @@ -366,56 +361,56 @@ public interface ItemDao extends BaseDao { /** - * @describe: 内容审核-驳回满意度评价 - * @author wangtong - * @date 2020/8/17 10:41 - * @params [id] - * @return void - */ + * @return void + * @describe: 内容审核-驳回满意度评价 + * @author wangtong + * @date 2020/8/17 10:41 + * @params [id] + */ void rejectItemSatisfactionInfo(@Param("id") String id); /** - * @describe: 通过项目id查询项目所在的二级分类 - * @author wangtong - * @date 2020/12/16 18:26 - * @params [id] - * @return java.lang.Integer - */ - String selectSecondCateByItemId(@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); /** - * @describe: 北尚诉求列表 - * @author wangtong - * @date 2022/9/3 15:48 - * @params [params] - * @return java.util.List - */ + * @return java.util.List + * @describe: 北尚诉求列表 + * @author wangtong + * @date 2022/9/3 15:48 + * @params [params] + */ List getItemAppealPage(Map params); /** - * @describe: 北尚诉求详情 - * @author wangtong - * @date 2022/9/3 16:21 - * @params [id] - * @return com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO - */ + * @return com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO + * @describe: 北尚诉求详情 + * @author wangtong + * @date 2022/9/3 16:21 + * @params [id] + */ ItemAppealDetailResultDTO getItemAppealDetail(@Param("itemId") String id); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @describe: 工作端我的上报列表-执法诉求 * @author wangtong * @date 2022/9/3 18:37 * @params [evaluationFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> */ List getLawItemList(ItemAppealPageDTO formDto); /** - * @describe: 获取社区结案审批列表 - * @author wangtong - * @date 2022/9/4 17:53 - * @params [params] - * @return java.util.List - */ + * @return java.util.List + * @describe: 获取社区结案审批列表 + * @author wangtong + * @date 2022/9/4 17:53 + * @params [params] + */ List getExaminePage(Map params); } From eb833d22b09ad6a266b88b7e096f2174409d4d2e Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 8 Sep 2022 09:31:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 1 - 1 file changed, 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 dd39664a1..7721ca5b2 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 @@ -761,7 +761,6 @@ hp.ID, hp.CREATED_TIME AS createdTime, hp.OUT_HANDLE_ADVICE AS advice, - hp.HANDLE_ADVICE as deptAdvice, hp.HANDLER_DEPT AS handlerDept, hp.STATE, itemDept.DEPT_NAME, From 380de84d4cf2bd916f825a63ddc2e1f9964434bf Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 8 Sep 2022 09:38:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=89=E6=B1=82=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=9B=9B=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/entity/ItemEntity.java | 2 +- .../modules/item/service/impl/ItemServiceImpl.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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 56a92fbf6..a43754368 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 @@ -241,7 +241,7 @@ public class ItemEntity extends BaseEpdcEntity { private String contactName; /** - * 流水号 + * 民生诉求编号 */ private String serialNum; 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 d24529724..a62987e12 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 @@ -351,7 +351,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); @@ -2330,9 +2330,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); //插入项目部门关联表 @@ -2542,7 +2542,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * 流水号 + * 民生诉求流水号 * * @param * @return java.lang.String @@ -2559,12 +2559,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (null != obj) { int number = (int) obj; number = number + 1; - String numStr = String.format("%03d", number); + String numStr = String.format("%04d", number); redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE); return serialNum + numStr; } int number = 1; - String numStr = "001"; + String numStr = "0001"; redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE); return serialNum + numStr;