Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -64,11 +64,11 @@ public interface ItemDao extends BaseDao<ItemEntity> {
     List<ItemResultDTO> selectListOfItems(ItemFormDTO formDto, int[] states);
 
     /**
+     * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>
      * @describe: 居民端-北尚诉办-我的上报
      * @author wangtong
      * @date 2022/8/23 15:52
      * @params [formDto]
-    * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>
      */
     List<ItemResultDTO> getItemListByUserId(PeopleItemFormDTO formDto);
 
@@ -177,11 +177,10 @@ public interface ItemDao extends BaseDao<ItemEntity> {
     List<ItemHandleProgressResultDTO> selectListOfItemHandleProgressByWork(@Param("itemId") String itemId);
 
     /**
-     *
      * 居民端项目处理进度
      *
-     * @params [itemId]
      * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO>
+     * @params [itemId]
      * @author liuchuang
      * @since 2019/12/23 20:08
      */
@@ -289,12 +288,12 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      */
     List<KpiItemHandleAmountResultDTO> selectListItemCloseAmount(@Param("timeLimitList") List<KpiItemTimeLimitByDeptResultDTO> kpiItemTimeLimitByDeptList,
                                                                  @Param("metaDataCode") String metaDataCode);
+
     /**
-     *
      * 删除项目处理进度表历史记录
      *
-     * @params [ids]
      * @return void
+     * @params [ids]
      * @author liuchuang
      * @since 2019/12/25 19:23
      */
@@ -321,44 +320,40 @@ public interface ItemDao extends BaseDao<ItemEntity> {
     List<Long> queryParentDeptId(@Param("itemId") String itemId, @Param("deptId") Long deptId);
 
     /**
-     *
      * 查询需要修改组织机构信息事件
      *
-     * @params [deptId]
      * @return java.util.List<com.elink.esua.epdc.dto.item.ItemDTO>
+     * @params [deptId]
      * @author liuchuang
      * @since 2020/3/7 0:20
      */
     List<ItemDTO> 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<GroupFormDTO> groups);
 
     /**
-     *
      * 查询需要修改的分类信息
      *
-     * @params [oldCategoryName]
      * @return java.util.List<com.elink.esua.epdc.dto.events.ItemDTO>
+     * @params [oldCategoryName]
      * @author liuchuang
      * @since 2020/3/7 16:39
      */
@@ -366,56 +361,56 @@ public interface ItemDao extends BaseDao<ItemEntity> {
 
 
     /**
+     * @return void
      * @describe: 内容审核-驳回满意度评价
      * @author wangtong
      * @date 2020/8/17 10:41
      * @params [id]
-    * @return void
      */
     void rejectItemSatisfactionInfo(@Param("id") String id);
 
     /**
+     * @return java.lang.Integer
      * @describe: 通过项目id查询项目所在的二级分类
      * @author wangtong
      * @date 2020/12/16 18:26
      * @params [id]
-    * @return java.lang.Integer
      */
     String selectSecondCateByItemId(@Param("id") String id);
 
     /**
+     * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>
      * @describe: 北尚诉求列表
      * @author wangtong
      * @date 2022/9/3 15:48
      * @params [params]
-    * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>
      */
     List<ItemAppealPageResultDTO> getItemAppealPage(Map<String, Object> params);
 
     /**
+     * @return com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO
      * @describe: 北尚诉求详情
      * @author wangtong
      * @date 2022/9/3 16:21
      * @params [id]
-    * @return com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO
      */
     ItemAppealDetailResultDTO getItemAppealDetail(@Param("itemId") String id);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO>>
      * @describe: 工作端我的上报列表-执法诉求
      * @author wangtong
      * @date 2022/9/3 18:37
      * @params [evaluationFormDTO]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO>>
      */
     List<ItemResultDTO> getLawItemList(ItemAppealPageDTO formDto);
 
     /**
+     * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemExaminePageResultDTO>
      * @describe: 获取社区结案审批列表
      * @author wangtong
      * @date 2022/9/4 17:53
      * @params [params]
-    * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemExaminePageResultDTO>
      */
     List<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params);
 }

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;
 

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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> implem
     }
 
     /**
-     * 流水号
+     * 民生诉求流水号
      *
      * @param
      * @return java.lang.String
@@ -2559,12 +2559,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> 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;

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,