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 60d73fdde..4f1cac5ff 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 @@ -85,6 +85,44 @@ public class ApiWorkItemController { return workItemService.appealListEqPc( formDTO); } + /** + * @describe: 获取社区结案审批列表(工作端) + * @author wgf + * @date 2022/9/4 17:44 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result<> + */ + @GetMapping("getExaminePageEqPc") + public Result> getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO) { + return workItemService.getExaminePageEqPc( formDTO); + } + + /** + * 项目处理提交 + * + * @Params: [dto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: wgf + * @Date: 2022/09/22 11:34 + */ + @PostMapping("itemHandleSubmit") + public Result itemHandleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) { + return workItemService.itemHandleSubmit(dto); + } + + /** + * 社区审批结案申请 + * + * @Params: [dto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: wgf + * @Date: 2022/09/22 11:34 + */ + @PostMapping("examineCaseWork") + public Result examineCaseWork(@RequestBody ExamineCaseFormDTO dto) { + return workItemService.examineCaseWork(dto); + } + /** * 项目详情 * @Params: [id] @@ -96,6 +134,19 @@ public class ApiWorkItemController { public Result itemDetail(@PathVariable String id) { return workItemService.getItemDetail(id); } + + /** + * 网格化平台项目处理进展拉去 + * @Params: [id] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: wgf + * @Date: 2022/09/23 16:34 + */ + @GetMapping("getGridPlatformProcess/{itemId}") + public Result getGridPlatformProcess(@PathVariable String itemId) { + return workItemService.getGridPlatformProcess(itemId); + } + /** * 获取满意度评价结果 * @Params: [evaluationFormDTO] 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 00ae8be6b..f567bf1b9 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 @@ -78,6 +78,38 @@ public interface WorkItemFeignClient { @GetMapping(value = "events/work/item/appealListEqPc", consumes = MediaType.APPLICATION_JSON_VALUE) Result> appealListEqPc(ItemWorkAppealListFormDTO formDTO); + /** + * @describe: 获取社区结案审批列表(工作端) + * @author wgf + * @date 2022/9/4 17:44 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result<> + */ + @GetMapping(value = "events/work/item/getExaminePageEqPc", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO); + + /** + * 项目处理提交 + * + * @Params: [dto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: wgf + * @Date: 2022/09/22 11:34 + */ + @PostMapping(value = "events/work/item/itemHandleSubmit", consumes = MediaType.APPLICATION_JSON_VALUE) + Result itemHandleSubmit(ItemHandleSubmitFormDTO dto); + + /** + * 社区审批结案申请 + * + * @Params: [dto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: wgf + * @Date: 2022/09/22 11:34 + */ + @PostMapping(value = "events/work/item/examineCaseWork", consumes = MediaType.APPLICATION_JSON_VALUE) + Result examineCaseWork(ExamineCaseFormDTO dto); + /** * 项目详情 * @Params: [formDto] @@ -88,6 +120,16 @@ public interface WorkItemFeignClient { @GetMapping(value = "events/work/item/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getItemDetail(@PathVariable String id); + /** + * 网格化平台项目处理进展拉去 + * @Params: [id] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: wgf + * @Date: 2022/09/23 16:34 + */ + @GetMapping(value = "events/platform/item/get/{itemId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getGridPlatformProcess(@PathVariable String itemId); + /** * 获取满意度评价结果 * @Params: [evaluationFormDTO] 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 070ac2e06..f87696194 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 @@ -48,11 +48,31 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "appealListEqPc", formDTO); } + @Override + public Result> getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getExaminePageEqPc", formDTO); + } + + @Override + public Result itemHandleSubmit(ItemHandleSubmitFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "itemHandleSubmit", dto); + } + + @Override + public Result examineCaseWork(ExamineCaseFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "examineCaseWork", dto); + } + @Override public Result getItemDetail(@PathVariable String id) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemDetail", id); } + @Override + public Result getGridPlatformProcess(String itemId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "get", itemId); + } + @Override public Result> evaluation(EvaluationFormDTO evaluationFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluation", evaluationFormDTO); 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 077f95328..341e4f6dc 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 @@ -6,6 +6,8 @@ import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -62,6 +64,35 @@ public interface WorkItemService { */ Result> appealListEqPc(ItemWorkAppealListFormDTO formDTO); + /** + * @describe: 获取社区结案审批列表(工作端) + * @author wgf + * @date 2022/9/4 17:44 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result<> + */ + Result> getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO); + + /** + * 项目处理提交 + * + * @Params: [dto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: wgf + * @Date: 2022/09/22 11:34 + */ + Result itemHandleSubmit(ItemHandleSubmitFormDTO dto); + + /** + * 社区审批结案申请 + * + * @Params: [dto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: wgf + * @Date: 2022/09/22 11:34 + */ + Result examineCaseWork(ExamineCaseFormDTO dto); + /** * 项目详情 * @Params: [userDetail, itemId] @@ -70,6 +101,15 @@ public interface WorkItemService { * @Date: 2019/11/19 16:34 */ Result getItemDetail(String itemId); + + /** + * 网格化平台项目处理进展拉去 + * @Params: [id] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: wgf + * @Date: 2022/09/23 16:34 + */ + Result getGridPlatformProcess(String itemId); /** * 获取满意度评价结果 * @Params: [evaluationFormDTO] 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 ea88059a7..d1041529e 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 @@ -67,12 +67,32 @@ public class WorkItemServiceImpl implements WorkItemService { return workItemFeignClient.appealListEqPc(formDTO); } + @Override + public Result> getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO) { + return workItemFeignClient.getExaminePageEqPc(formDTO); + } + + @Override + public Result itemHandleSubmit(ItemHandleSubmitFormDTO dto) { + return workItemFeignClient.itemHandleSubmit(dto); + } + + @Override + public Result examineCaseWork(ExamineCaseFormDTO dto) { + return workItemFeignClient.examineCaseWork(dto); + } + @Override public Result getItemDetail(String itemId) { return workItemFeignClient.getItemDetail(itemId); } + @Override + public Result getGridPlatformProcess(String itemId) { + return workItemFeignClient.getGridPlatformProcess(itemId); + } + @Override public Result> evaluation(EvaluationFormDTO evaluationFormDTO) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemExamineWorkListFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemExamineWorkListFormDTO.java new file mode 100644 index 000000000..68ccd912c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemExamineWorkListFormDTO.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Author wgf + * @Date 2022/9/22 16:24 + */ +@Data +public class ItemExamineWorkListFormDTO implements Serializable { + private static final long serialVersionUID = -3034807666143092535L; + + /** + * 页码,从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private int pageIndex; + /** + * 页容量,默认20页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private int pageSize = 20; + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + + /** + * 是否超时 + */ + private Long deptId; + + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/GategoryInfoWorkDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/GategoryInfoWorkDetailResultDTO.java new file mode 100644 index 000000000..4d7fc2ddd --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/GategoryInfoWorkDetailResultDTO.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 分类信息 + * @Author wgf + */ +@Data +public class GategoryInfoWorkDetailResultDTO implements Serializable { + private static final long serialVersionUID = 2279022962345210851L; + + /** + * 部门ID + */ + private String id; + /** + * 部门名称 + */ + private String name; + + + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java index b46bead89..d1c6e0840 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java @@ -156,6 +156,16 @@ public class ItemDetailResultDTO implements Serializable { */ private String serialNum; + /** + * 办理人姓名 + */ + private String handlePeopleName; + + /** + * 办理人办公电话 + */ + private String handlePeopleMobile; + @@ -209,5 +219,11 @@ public class ItemDetailResultDTO implements Serializable { * 全部分类编码List */ private String[] categoryIds; + private List categoryDtos; + + /** + * 项目处理图片 + */ + private List itemImges; } 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 cf29b3b1d..2be4b6cc8 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 @@ -83,7 +83,45 @@ public class WorkItemController { return new Result>().ok(page); } + /** + * @describe: 获取社区结案审批列表 + * @author wgf + * @date 2022/9/23 17:44 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("getExaminePageEqPc") + public Result> getExaminePageEqPc(@RequestBody ItemExamineWorkListFormDTO formDTO) { + List page = itemService.getExaminePageEqPc(formDTO); + return new Result>().ok(page); + } + + /** + * 项目处理提交 + * + * @Params: [dto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: wgf + * @Date: 2022/9/21 9:56 + */ + @PostMapping("itemHandleSubmit") + public Result itemHandleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return itemService.modifyHandleResult(dto); + } + /** + * @describe: 社区审批结案申请 + * @author wgf + * @date 2022/9/23 10:18 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("examineCaseWork") + public Result examineCaseWork(@RequestBody ExamineCaseFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return itemService.examineCase(formDto); + } /** * 项目统计--工作端 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 ea5b75fc5..fe358d395 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 @@ -433,6 +433,7 @@ public interface ItemDao extends BaseDao { * @params [params] */ List getExaminePage(Map params); + List getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO); /** * @describe: 获取项目的第一个结案申请/吹哨的意见 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 3637bb313..7632cab85 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 @@ -568,6 +568,7 @@ public interface ItemService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result> */ PageData getExaminePage(Map params); + List getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO); /** * @describe: 社区审批结案申请 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 1f5158890..ecd0cd12a 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 @@ -18,7 +18,6 @@ package com.elink.esua.epdc.modules.item.service.impl; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; @@ -604,11 +603,27 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 解析分类全部编码[前端分类复显使用] if(StringUtils.isNotBlank(resultDTO.getCategoryFullCode())){ + List categoryDtos = new ArrayList(); + String categoryFullCode = resultDTO.getCategoryFullCode(); String[] categoryIds = categoryFullCode.split("-"); resultDTO.setCategoryIds(categoryIds); + + String categoryFullName = resultDTO.getCategoryName(); + String[] categoryNames = categoryFullName.split("-"); + + // 工作端复显使用 + for(int i = 0 ; i < categoryIds.length ; i++){ + GategoryInfoWorkDetailResultDTO gategoryDTO = new GategoryInfoWorkDetailResultDTO(); + gategoryDTO.setId(categoryIds[i]); + gategoryDTO.setName(categoryNames[i]); + categoryDtos.add(gategoryDTO); + } + resultDTO.setCategoryDtos(categoryDtos); + } + // 对于存在有操作记录的数据,进行复显字段赋值 if(resultDTO.getHandlerDeptId() != null){ // 根据操作人部门,获取上一级部门ID @@ -2932,6 +2947,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new PageData<>(list, page.getTotal()); } + @Override + public List getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RuntimeException("获取用户信息失败"); + } + formDTO.setDeptId(user.getDeptId()); + List list = baseDao.getExaminePageEqPc(formDTO); + return list; + } + @Override @Transactional(rollbackFor = Exception.class) public Result examineCase(ExamineCaseFormDTO formDto) { 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 53cca3192..2fd5ae287 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 @@ -357,6 +357,8 @@ + + @@ -382,6 +384,9 @@ + + + @@ -1043,6 +1048,9 @@ item.IS_PARTY_MEMBER, item.ITEM_STATE, item.ISSUE_ADDRESS, + item.HANDLE_PEOPLE_NAME, + item.HANDLE_PEOPLE_MOBILE, + imges.IMG_URL as IMG_ITEM_URL, eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.COMMENT_NUM, @@ -1050,7 +1058,7 @@ ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum, item.EVENT_ID, item.ISSUE_ID, - img.IMG_URL, + ifnull(img.IMG_URL,mi.IMG_URL) as IMG_URL, process.STATE, REPLACE(REPLACE(SUBSTRING_INDEX(process.HANDLE_ADVICE,' 办理人:',1),'您反映的诉求属于不予受理情形中的“',''),'”,不属于平台受理范围,感谢您对“北尚诉办”的支持!','') as HANDLE_ADVICE, process.OUT_HANDLE_ADVICE, @@ -1061,6 +1069,7 @@ FROM epdc_item item LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'events' + left join epdc_img mi on item.id = mi.REFERENCE_ID AND mi.DEL_FLAG = '0' AND mi.IMG_TYPE = 'events' LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' left join ( SELECT @@ -1079,6 +1088,7 @@ and ITEM_ID = #{itemId} order by CREATED_TIME desc LIMIT 1,1 ) process on process.ITEM_ID = item.ID + left join epdc_img imges on process.id=imges.REFERENCE_ID AND imges.DEL_FLAG = '0' AND imges.IMG_TYPE = 'itemHandle' WHERE item.DEL_FLAG = '0' AND item.ID = #{itemId} @@ -1927,6 +1937,31 @@ order by i.LAST_HANDLE_TIME desc + + +