Browse Source

北尚诉办-项目所属网格调整为事件所选的网格

feature/dangjian
Jackwang 3 years ago
parent
commit
423a831618
  1. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java
  2. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ExamineCaseFormDTO.java
  3. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java

@ -156,7 +156,7 @@ public class ItemServiceImpl implements ItemService {
// customEnterpriseServiceImpl.checkSmsCode(formDto.getMobile(), formDto.getSmsCode()); // customEnterpriseServiceImpl.checkSmsCode(formDto.getMobile(), formDto.getSmsCode());
// } // }
// 获取所有上级机构名称和ID拼接 // 获取所有上级机构名称和ID拼接
Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId()); Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(formDto.getGridId());
ParentAndAllDeptDTO deptDTO = dtoResult.getData(); ParentAndAllDeptDTO deptDTO = dtoResult.getData();
// 父所有部门 // 父所有部门
formDto.setParentDeptIds(deptDTO.getParentDeptIds()); formDto.setParentDeptIds(deptDTO.getParentDeptIds());
@ -176,7 +176,7 @@ public class ItemServiceImpl implements ItemService {
} else { } else {
formDto.setIsPartyMember(YesOrNoEnum.NO.value()); formDto.setIsPartyMember(YesOrNoEnum.NO.value());
} }
// formDto.setMobile(userDetail.getMobile()); formDto.setMobile(userDetail.getMobile());
return itemFeignClient.submitItem(formDto); return itemFeignClient.submitItem(formDto);
} }

2
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ExamineCaseFormDTO.java

@ -22,7 +22,7 @@ public class ExamineCaseFormDTO implements Serializable {
private String itemId; private String itemId;
/** /**
* 结案审批0通过-并上报至网格化 1不通过-返回至网格 * 结案审批0同意-并上报至网格化 1驳回-返回至网格
*/ */
@NotBlank(message = "结案审批标识不可为空") @NotBlank(message = "结案审批标识不可为空")
private String checkFlag; private String checkFlag;

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

@ -2256,6 +2256,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
baseDao.insert(entity); baseDao.insert(entity);
//插入项目部门关联表 //插入项目部门关联表
itemDeptService.savePeopleSubmitInfo(entity); itemDeptService.savePeopleSubmitInfo(entity);
// 保存图片 // 保存图片
imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ITEMS); imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ITEMS);
return new Result(); return new Result();

Loading…
Cancel
Save