From 423a8316182e7c4463c6e4a367ea3a4b0fe0d2bd Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 5 Sep 2022 17:53:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=89=80=E5=B1=9E=E7=BD=91=E6=A0=BC=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=BA=E4=BA=8B=E4=BB=B6=E6=89=80=E9=80=89=E7=9A=84=E7=BD=91?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/ItemServiceImpl.java | 4 ++-- .../com/elink/esua/epdc/dto/item/form/ExamineCaseFormDTO.java | 2 +- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index 43bc68bf1..18c5a6ae3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/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()); // } // 获取所有上级机构名称和ID拼接 - Result dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId()); + Result dtoResult = adminFeignClient.getParentAndAllDept(formDto.getGridId()); ParentAndAllDeptDTO deptDTO = dtoResult.getData(); // 父所有部门 formDto.setParentDeptIds(deptDTO.getParentDeptIds()); @@ -176,7 +176,7 @@ public class ItemServiceImpl implements ItemService { } else { formDto.setIsPartyMember(YesOrNoEnum.NO.value()); } -// formDto.setMobile(userDetail.getMobile()); + formDto.setMobile(userDetail.getMobile()); return itemFeignClient.submitItem(formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ExamineCaseFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ExamineCaseFormDTO.java index 272ad2ced..f53834272 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ExamineCaseFormDTO.java +++ b/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; /** - * 结案审批：0通过-并上报至网格化 1不通过-返回至网格 + * 结案审批：0同意-并上报至网格化 1驳回-返回至网格 */ @NotBlank(message = "结案审批标识不可为空") private String checkFlag; 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 1b83fda08..2af774902 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 @@ -2256,6 +2256,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem baseDao.insert(entity); //插入项目部门关联表 itemDeptService.savePeopleSubmitInfo(entity); + // 保存图片 imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ITEMS); return new Result();