diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java index 90503fe29..5b16d0aaa 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java @@ -5,10 +5,7 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; -import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO; +import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.service.WorkItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -100,5 +97,16 @@ public class ApiWorkItemController { public Result> evaluationDept(@RequestBody EvaluationFormDTO evaluationFormDTO) { return workItemService.evaluationDept(evaluationFormDTO); } + /** + * 项目处理进度 + * @Params: [ItemProcessFormDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("processList") + public Result> processList(@RequestBody ItemProcessFormDTO dto) { + return workItemService.processList(dto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java index 11c432368..02cd340de 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java @@ -21,7 +21,7 @@ import java.util.List; * @Author LPF * @Date 2019/11/18 16:39 */ -@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class,url ="http://127.0.0.1:9066") +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class) public interface WorkItemFeignClient { @@ -91,4 +91,14 @@ public interface WorkItemFeignClient { @GetMapping(value = "events/work/item/evaluationDept", consumes = MediaType.APPLICATION_JSON_VALUE) Result> evaluationDept(EvaluationFormDTO evaluationFormDTO); + /** + * 项目处理进度 + * @Params: [ItemProcessFormDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping(value = "events/work/item/processList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> processList(ItemProcessFormDTO dto) ; + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java index eddfcd668..56995bd97 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java @@ -52,5 +52,9 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient { public Result> evaluationDept(EvaluationFormDTO evaluationFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluationDept", evaluationFormDTO); } + @Override + public Result> processList(ItemProcessFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "processList", dto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java index 9c2c95e9c..4634e197c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java @@ -4,11 +4,9 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; -import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO; +import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -74,6 +72,14 @@ public interface WorkItemService { * @Date: 2019/11/19 16:34 */ Result> evaluationDept(EvaluationFormDTO evaluationFormDTO); + /** + * 项目处理进度 + * @Params: [ItemProcessFormDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + Result> processList(ItemProcessFormDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java index cf26abc79..401f6bf9c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java @@ -69,5 +69,9 @@ public class WorkItemServiceImpl implements WorkItemService { public Result> evaluationDept(EvaluationFormDTO evaluationFormDTO) { return workItemFeignClient.evaluationDept(evaluationFormDTO); } + @Override + public Result> processList(ItemProcessFormDTO dto) { + return workItemFeignClient.processList(dto); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java index b55e5a770..d59c486d8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java @@ -26,4 +26,7 @@ public interface ImageConstant { * 图片类型-议题处理 */ public final static String TYPE_IMAGE_BIZ_ISSUE_HANDLE = "issueHandle"; + + public final static String TYPE_IMAGE_ITEM_HANDLE = "itemHandle"; + public final static String TYPE_IMAGE_ITEM_OUT_HANDLE = "itemOutHandle"; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java index 91290c199..e5fd3cc55 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java @@ -43,6 +43,16 @@ public class ItemHandleSubmitFormDTO implements Serializable { @NotNull(message = "处理结果不能为空") private int handleCategory; + /** + * 处理意见图片(内部) + */ + private List handleImages; + + /** + * 处理意见图片(外部) + */ + private List outHandleImages; + /** * 流转协助部门 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemProcessFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemProcessFormDTO.java new file mode 100644 index 000000000..69242992e --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemProcessFormDTO.java @@ -0,0 +1,16 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +@Data +public class ItemProcessFormDTO implements Serializable { + private static final long serialVersionUID = -3034807666143092535L; + + /** + * 项目ID + */ + @NotBlank(message = "项目ID不能为空") + private String itemId; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java index 55bfc6162..7e069e454 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java @@ -19,6 +19,10 @@ public class ItemHandleProgressResultDTO implements Serializable { * 状态名称 */ private String progressName; + /** + * 状态 + */ + private String state; /** * 时间 */ @@ -36,4 +40,9 @@ public class ItemHandleProgressResultDTO implements Serializable { * 吹哨部门 */ private List itemDeptDTOS; + + /** + * 吹哨部门 + */ + private List images; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java index 04c944a25..40563ab40 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java @@ -125,4 +125,16 @@ public class WorkItemController { List evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(evaluationFormDTO.getItemId(), SecurityUser.getDeptId()); return new Result>().ok(evaluateDeptDTOS); } + /** + * 工作端-获项目处理进度 + * @Params: [ItemProcessFormDTO] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("processList") + public Result> processList(@RequestBody ItemProcessFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return itemService.listOfItemHandleProgressByWork(formDTO); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 88699f0bc..0fda7dbea 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -126,6 +126,15 @@ public interface ItemDao extends BaseDao { */ List selectListOfItemHandleProgress(String issueId, String itemId, int outOrInside); + /** + * 业务端-项目处理进度 + * @Params: [itemId] + * @Return: com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO + * @Author: liuchuang + * @Date: 2019/9/16 18:37 + */ + List selectListOfItemHandleProgressByWork(String itemId); + /** * 项目内容详情 * @Params: [itemId] diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 41167303f..2cb32da53 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -270,4 +270,13 @@ public interface ItemService extends BaseService { * @Date: 2019/11/18 13:32 */ Result getItemStatistics(ItemStatisticsFormDTO formDto); + + /** + * 项目处理进度 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/18 13:32 + */ + Result> listOfItemHandleProgressByWork(ItemProcessFormDTO formDTO); } 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 15cee4ed8..3f54e38da 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 @@ -32,6 +32,7 @@ import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.EventIssueItemState; import com.elink.esua.epdc.constant.EventsNoticeConstant; +import com.elink.esua.epdc.constant.ImageConstant; import com.elink.esua.epdc.constants.MenuCodeConstant; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.MenuNoticeDTO; @@ -48,6 +49,7 @@ import com.elink.esua.epdc.enums.ItemHandleCategoryEnum; import com.elink.esua.epdc.modules.async.DeptRespondTask; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; +import com.elink.esua.epdc.modules.events.service.ImgService; import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.issue.service.IssueService; import com.elink.esua.epdc.modules.item.dao.ItemDao; @@ -97,6 +99,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private DeptRespondTask deptRespondTask; + @Autowired + private ImgService imgService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -450,6 +455,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemEntity entity = this.selectById(itemId); return baseDao.selectListOfItemHandleProgress(entity.getIssueId(), itemId, outOrInside); } + @Override + public Result> listOfItemHandleProgressByWork(ItemProcessFormDTO formDTO) { + List data = baseDao.selectListOfItemHandleProgressByWork(formDTO.getItemId()); + return new Result>().ok(data); + } @Override @Transactional(rollbackFor = Exception.class) @@ -470,6 +480,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity(); handleProcessEntity.setHandlerDeptId(user.getDeptId()); handleProcessEntity.setHandlerDept(user.getDeptName()); + if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { // 项目流转校验 Result checkResult = this.checkItemCirculation(dto); @@ -552,10 +563,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 吹哨部门操作-发送菜单消息 this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(user.getDeptId()), null); } + //项目外部处理意见图片保存 + if(dto.getOutHandleImages()!= null && dto.getOutHandleImages().size()>0){ + imgService.saveImages(dto.getOutHandleImages(),handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE); + } + //项目处理意见图片保存 + if(dto.getHandleImages()!= null && dto.getHandleImages().size()>0){ + imgService.saveImages(dto.getHandleImages(),handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE); + } } catch (Exception e) { e.printStackTrace(); } - return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index cd375a733..366a9a488 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -499,6 +499,49 @@ ORDER BY createdTime DESC + + + + + + + + + + + + +