elink-star
/
esua-epdc-cloud
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

feature/dangjian
wanggongfeng 3 years ago
parent
6810216aee b28b839a17
commit
cf20fe45f9
4 changed files with 53 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 97
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
  2. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
  3. 12
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  4. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

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

@ -64,12 +64,12 @@ public interface ItemDao extends BaseDao<ItemEntity> {
List<ItemResultDTO> selectListOfItems(ItemFormDTO formDto, int[] states); List<ItemResultDTO> selectListOfItems(ItemFormDTO formDto, int[] states);
/** /**
* @describe: 居民端-北尚诉办-我的上报 * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>
* @author wangtong * @describe: 居民端-北尚诉办-我的上报
* @date 2022/8/23 15:52 * @author wangtong
* @params [formDto] * @date 2022/8/23 15:52
* @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO> * @params [formDto]
*/ */
List<ItemResultDTO> getItemListByUserId(PeopleItemFormDTO formDto); List<ItemResultDTO> getItemListByUserId(PeopleItemFormDTO formDto);
/** /**
@ -177,11 +177,10 @@ public interface ItemDao extends BaseDao<ItemEntity> {
List<ItemHandleProgressResultDTO> selectListOfItemHandleProgressByWork(@Param("itemId") String itemId); List<ItemHandleProgressResultDTO> selectListOfItemHandleProgressByWork(@Param("itemId") String itemId);
/** /**
*
* 居民端项目处理进度 * 居民端项目处理进度
* *
* @params [itemId]
* @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO> * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO>
* @params [itemId]
* @author liuchuang * @author liuchuang
* @since 2019/12/23 20:08 * @since 2019/12/23 20:08
*/ */
@ -289,12 +288,12 @@ public interface ItemDao extends BaseDao<ItemEntity> {
*/ */
List<KpiItemHandleAmountResultDTO> selectListItemCloseAmount(@Param("timeLimitList") List<KpiItemTimeLimitByDeptResultDTO> kpiItemTimeLimitByDeptList, List<KpiItemHandleAmountResultDTO> selectListItemCloseAmount(@Param("timeLimitList") List<KpiItemTimeLimitByDeptResultDTO> kpiItemTimeLimitByDeptList,
@Param("metaDataCode") String metaDataCode); @Param("metaDataCode") String metaDataCode);
/** /**
*
* 删除项目处理进度表历史记录 * 删除项目处理进度表历史记录
* *
* @params [ids]
* @return void * @return void
* @params [ids]
* @author liuchuang * @author liuchuang
* @since 2019/12/25 19:23 * @since 2019/12/25 19:23
*/ */
@ -314,51 +313,47 @@ public interface ItemDao extends BaseDao<ItemEntity> {
* @Description: 根据项目id，当前登录人所在部门id, 查询当前项目是由哪个部门吹哨而来 * @Description: 根据项目id，当前登录人所在部门id, 查询当前项目是由哪个部门吹哨而来
* @Param: [itemId] 项目id * @Param: [itemId] 项目id
* @Param: [deptId] 部门id * @Param: [deptId] 部门id
* @return: java.util.List<java.lang.Long> 上级部门id * @return: java.util.List<java.lang.Long> 上级部门id
* @Author: zy * @Author: zy
* @Date: 2020-01-14 * @Date: 2020-01-14
*/ */
List<Long> queryParentDeptId(@Param("itemId") String itemId, @Param("deptId") Long deptId); List<Long> queryParentDeptId(@Param("itemId") String itemId, @Param("deptId") Long deptId);
/** /**
*
* 查询需要修改组织机构信息事件 * 查询需要修改组织机构信息事件
* *
* @params [deptId]
* @return java.util.List<com.elink.esua.epdc.dto.item.ItemDTO> * @return java.util.List<com.elink.esua.epdc.dto.item.ItemDTO>
* @params [deptId]
* @author liuchuang * @author liuchuang
* @since 2020/3/7 0:20 * @since 2020/3/7 0:20
*/ */
List<ItemDTO> selectListOfOrganizationInfo(String deptId); List<ItemDTO> selectListOfOrganizationInfo(String deptId);
/** /**
*
* 更新网格名称 * 更新网格名称
* *
* @params [newDeptName, deptId]
* @return void * @return void
* @params [newDeptName, deptId]
* @author liuchuang * @author liuchuang
* @since 2020/3/7 1:20 * @since 2020/3/7 1:20
*/ */
void updateGridByDeptId(String newDeptName, Long deptId); void updateGridByDeptId(String newDeptName, Long deptId);
/** /**
*
* 更新项目表党员群名称 * 更新项目表党员群名称
* *
* @params [groups]
* @return void * @return void
* @params [groups]
* @author liuchuang * @author liuchuang
* @since 2020/3/7 12:54 * @since 2020/3/7 12:54
*/ */
void updateBatchPartyGroupName(@Param("groups") List<GroupFormDTO> groups); void updateBatchPartyGroupName(@Param("groups") List<GroupFormDTO> groups);
/** /**
*
* 查询需要修改的分类信息 * 查询需要修改的分类信息
* *
* @params [oldCategoryName]
* @return java.util.List<com.elink.esua.epdc.dto.events.ItemDTO> * @return java.util.List<com.elink.esua.epdc.dto.events.ItemDTO>
* @params [oldCategoryName]
* @author liuchuang * @author liuchuang
* @since 2020/3/7 16:39 * @since 2020/3/7 16:39
*/ */
@ -366,56 +361,56 @@ public interface ItemDao extends BaseDao<ItemEntity> {
/** /**
* @describe: 内容审核-驳回满意度评价 * @return void
* @author wangtong * @describe: 内容审核-驳回满意度评价
* @date 2020/8/17 10:41 * @author wangtong
* @params [id] * @date 2020/8/17 10:41
* @return void * @params [id]
*/ */
void rejectItemSatisfactionInfo(@Param("id") String id); void rejectItemSatisfactionInfo(@Param("id") String id);
/** /**
* @describe: 通过项目id查询项目所在的二级分类 * @return java.lang.Integer
* @author wangtong * @describe: 通过项目id查询项目所在的二级分类
* @date 2020/12/16 18:26 * @author wangtong
* @params [id] * @date 2020/12/16 18:26
* @return java.lang.Integer * @params [id]
*/ */
String selectSecondCateByItemId(@Param("id")String id); String selectSecondCateByItemId(@Param("id") String id);
/** /**
* @describe: 北尚诉求列表 * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>
* @author wangtong * @describe: 北尚诉求列表
* @date 2022/9/3 15:48 * @author wangtong
* @params [params] * @date 2022/9/3 15:48
* @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO> * @params [params]
*/ */
List<ItemAppealPageResultDTO> getItemAppealPage(Map<String, Object> params); List<ItemAppealPageResultDTO> getItemAppealPage(Map<String, Object> params);
/** /**
* @describe: 北尚诉求详情 * @return com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO
* @author wangtong * @describe: 北尚诉求详情
* @date 2022/9/3 16:21 * @author wangtong
* @params [id] * @date 2022/9/3 16:21
* @return com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO * @params [id]
*/ */
ItemAppealDetailResultDTO getItemAppealDetail(@Param("itemId") String id); 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: 工作端我的上报列表-执法诉求 * @describe: 工作端我的上报列表-执法诉求
* @author wangtong * @author wangtong
* @date 2022/9/3 18:37 * @date 2022/9/3 18:37
* @params [evaluationFormDTO] * @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); List<ItemResultDTO> getLawItemList(ItemAppealPageDTO formDto);
/** /**
* @describe: 获取社区结案审批列表 * @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemExaminePageResultDTO>
* @author wangtong * @describe: 获取社区结案审批列表
* @date 2022/9/4 17:53 * @author wangtong
* @params [params] * @date 2022/9/4 17:53
* @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemExaminePageResultDTO> * @params [params]
*/ */
List<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params); List<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params);
} }

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
View File

@ -241,7 +241,7 @@ public class ItemEntity extends BaseEpdcEntity {
private String contactName; private String contactName;
/** /**
* 流水号 * 民生诉求编号
*/ */
private String serialNum; private String serialNum;

12
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -351,7 +351,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemEntity.setIsPeople("1");//诉求上报 itemEntity.setIsPeople("1");//诉求上报
itemEntity.setPeopleFlag("2");//执法诉求 itemEntity.setPeopleFlag("2");//执法诉求
// 流水号 // 流水号
itemEntity.setSerialNum(getSerialNum("ZF")); itemEntity.setSerialNum(getSerialNum("zf"));
baseDao.insert(itemEntity); baseDao.insert(itemEntity);
//插入项目部门关联表 //插入项目部门关联表
itemDeptService.savePeopleSubmitInfo(itemEntity); itemDeptService.savePeopleSubmitInfo(itemEntity);
@ -2330,9 +2330,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
entity.setItemCode("PT" + System.currentTimeMillis());//项目编号 entity.setItemCode("PT" + System.currentTimeMillis());//项目编号
entity.setIsPeople("1");//诉求上报 entity.setIsPeople("1");//诉求上报
if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) { if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) {
entity.setSerialNum(getSerialNum("MS")); entity.setSerialNum(getSerialNum("ms"));
} else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) { } else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) {
entity.setSerialNum(getSerialNum("FZ")); entity.setSerialNum(getSerialNum("fz"));
} }
baseDao.insert(entity); baseDao.insert(entity);
//插入项目部门关联表 //插入项目部门关联表
@ -2542,7 +2542,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
} }
/** /**
* 流水号 * 民生诉求流水号
* *
* @param * @param
* @return java.lang.String * @return java.lang.String
@ -2559,12 +2559,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
if (null != obj) { if (null != obj) {
int number = (int) obj; int number = (int) obj;
number = number + 1; number = number + 1;
String numStr = String.format("%03d", number); String numStr = String.format("%04d", number);
redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE); redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE);
return serialNum + numStr; return serialNum + numStr;
} }
int number = 1; int number = 1;
String numStr = "001"; String numStr = "0001";
redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE); redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE);
return serialNum + numStr; return serialNum + numStr;

1
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
View File

@ -761,7 +761,6 @@
hp.ID, hp.ID,
hp.CREATED_TIME AS createdTime, hp.CREATED_TIME AS createdTime,
hp.OUT_HANDLE_ADVICE AS advice, hp.OUT_HANDLE_ADVICE AS advice,
hp.HANDLE_ADVICE as deptAdvice,
hp.HANDLER_DEPT AS handlerDept, hp.HANDLER_DEPT AS handlerDept,
hp.STATE, hp.STATE,
itemDept.DEPT_NAME, itemDept.DEPT_NAME,

Write Preview
Loading…
Cancel
Save