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

项目详情提交逻辑更改

feature/dangjian
wanggongfeng 3 years ago
parent
ce539c0d76
commit
8fdce2d528
5 changed files with 40 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java
  2. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java
  3. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java
  4. 48
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  5. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

5
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java
View File

@ -70,4 +70,9 @@ public class ItemPendingHandleDTO implements Serializable {
*/
private String isDelay;
/**
* 是否提醒社区处理(1:提示)
*/
private String isRemind;
}

6
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java
View File

@ -17,11 +17,11 @@ public enum ItemHandleCategoryEnum {
HANDLE_I_HANDLE_GRID(12, "响应拟办"),// 等同于网格回应 2022.9.4需求变更
HANDLE_I_HANDLE_COMMUNITY(13, "直接办理"),// 等同于社区回应 2022.9.4需求变更
HANDLE_CIRCULATION_ASSISTANCE(1, "吹哨"),
HANDLE_CLOSE(5, "不予受理"),
HANDLE_CLOSE(5, "不予受理"), // 之前的关闭 2022.9.4需求变更
HANDLE_CANCEL_CASE(8, "作废"),
HANDLE_CLOSING_CASE(10, "结案"),
HANDLE_CLOSING_CASE_APPLY(11, "结案申请"),
HANDLE_REPORT(15, "社区吹哨");// 之前的上报网格化平台
HANDLE_CLOSING_CASE_APPLY(11, "结案申请"), // 之前的结案 2022.9.4需求变更
HANDLE_REPORT(15, "社区吹哨");// 之前的上报网格化平台 2022.9.4需求变更
private int value;
private String name;

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

@ -70,8 +70,7 @@ public class ItemDeptServiceImpl extends BaseServiceImpl<ItemDeptDao, ItemDeptEn
@Transactional(rollbackFor = Exception.class)
public void saveItemDepts(Long createdDeptId, ItemHandleSubmitFormDTO formDTO, String itemHandleId) {
List<ItemDeptEntity> deptEntities = new ArrayList<>();
for (ItemCirculationDeptResultDTO dto:
formDTO.getDeptResultDTOS()) {
for (ItemCirculationDeptResultDTO dto: formDTO.getDeptResultDTOS()) {
ItemDeptEntity entity = new ItemDeptEntity();
entity.setItemId(formDTO.getId());
entity.setDeptId(dto.getDeptId());

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

@ -209,12 +209,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
//部门ID列表
List<Long> deptIdList = new ArrayList<>();
// 判断是否为网格，不为网格只能查看本部门下的项目数据
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) {
// 判断是否为社区网格，不为社区网格只能查看本部门下的项目数据
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())) {
deptIdList = user.getDeptIdList();
} else {
deptIdList.add(user.getDeptId());
}
if(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())){
params.put("isRemind", "isRemind");
}
params.put("deptIdList", null);
if (null != deptIdList && deptIdList.size() > 0) {
params.put("deptIdList", deptIdList);
@ -917,19 +920,22 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return new Result().error("请选择正确的处理部门");
}
// 项目流转校验
Result checkResult = this.checkItemCirculation(dto);
if (!checkResult.success()) {
return checkResult;
}
// 根据当前登录人部门，获取上一级部门ID
Long currentDeptId = SecurityUser.getDeptId();
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(currentDeptId);
// 根据操作人部门，获取上一级部门ID
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId());
SysDeptDTO sysDeptDTO = sysDeptInfo.getData();
// 手动拼接流转协助部门
ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO();
itemCirculationDeptResultDTO.setDeptId(sysDeptDTO.getPid());
itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName());
itemCirculationDeptResultDTO.setSelected(false);
itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey());
List<ItemCirculationDeptResultDTO> deptList = new ArrayList<ItemCirculationDeptResultDTO>();
deptList.add(itemCirculationDeptResultDTO);
dto.setDeptResultDTOS(deptList);
handleProcessEntity.setState(dto.getHandleCategory());
handleProcessEntity.setCloseCheckId(sysDeptDTO.getPid());
handleProcessEntity.setCloseCheckId(sysDeptDTO.getPid()); // todo 待确认
// 获取已流转部门信息
List<Long> oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandlerDeptId());
@ -956,12 +962,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null);
log.info("处理项目-结案申请-if结束");
} else {
if(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue() == dto.getHandleCategory()){
// 如果操作是【响应拟办】【直接办理】相当于之前逻辑的【回应】
handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue());
}else{
handleProcessEntity.setState(dto.getHandleCategory());
}
handleProcessEntity.setState(dto.getHandleCategory());
// if(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue() == dto.getHandleCategory()){
// // 如果操作是【响应拟办】【直接办理】相当于之前逻辑的【回应】
// handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue());
// }else{
// handleProcessEntity.setState(dto.getHandleCategory());
// }
// 更新项目状态
if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
@ -1051,9 +1058,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
// 结案申请
}else if(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()){
Long currentDeptId = SecurityUser.getDeptId();
// 根据当前登录人部门，获取上一级部门ID
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(currentDeptId);
// 根据操作人人部门，获取上一级部门ID
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId());
SysDeptDTO sysDeptDTO = sysDeptInfo.getData();
ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO();
itemCirculationDeptResultDTO.setDeptId(sysDeptDTO.getPid());

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

@ -502,6 +502,9 @@
eve.OPPOSE_NUM,
eve.COMMENT_NUM,
eve.BROWSE_NUM,
<if test="isRemind != null and isRemind != ''">
(case when (process.ID is null and HOUR( timediff( now(), item.CREATED_TIME) ) > 24) then '1' else '' end) as isRemind,
</if>
( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum,
(case when d.ID is not null then '1' else '0' end) as isDelay
FROM epdc_item item
@ -527,7 +530,7 @@
)
) process on process.ITEM_ID = item.ID
WHERE item.DEL_FLAG = '0'
and (item.PEOPLE_FLAG is null or (item.PEOPLE_FLAG = '0' and process.state not in (11,15)))
and (item.IS_PEOPLE = '0' or (item.PEOPLE_FLAG = '0' and (process.state is null or process.state not in (11,15))))
<if test="itemState != null and itemState != ''">
AND item.ITEM_STATE = #{itemState}

Write Preview
Loading…
Cancel
Save