diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemHandleProcessDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemHandleProcessDTO.java index 80d1b6f28..d2d8ef4cd 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemHandleProcessDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemHandleProcessDTO.java @@ -30,6 +30,11 @@ public class ItemHandleProcessDTO implements Serializable { */ private String handleAdvice; + /** + * 意见备注 + */ + private String handleAdviceRemark; + /** * 处理意见(外部) */ 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 e36e92159..4873d14b4 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 @@ -31,6 +31,11 @@ public class ItemHandleSubmitFormDTO implements Serializable { @Size(min = 1, max = 500, message = "处理意见在500字以内") private String handleAdvice; + /** + * 意见备注 + */ + private String handleAdviceRemark; + /** * 处理意见(外部) */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemHandleProcessEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemHandleProcessEntity.java index 8f5f5e24a..11d1a9e04 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemHandleProcessEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemHandleProcessEntity.java @@ -51,6 +51,11 @@ public class ItemHandleProcessEntity extends BaseEpdcEntity { */ private String handleAdvice; + /** + * 意见备注 + */ + private String handleAdviceRemark; + /** * 处理意见(外部) */ 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 09121536e..16587ea1a 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 @@ -998,6 +998,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setItemId(dto.getId()); handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); + handleProcessEntity.setHandleAdviceRemark(dto.getHandleAdviceRemark()); // 当前操作人部门tyeKey String sendTypeKey = ""; log.info("处理项目-进入判断"); 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 d8ad75c8a..c4b1d5a75 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 @@ -618,8 +618,13 @@ left join epdc_item_fusing_delay_record d on d.ITEM_ID = item.ID and d.DEL_FLAG = '0' left join ( select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state - from epdc_item_handle_process b where b.STATE != 1001 and b.CREATED_TIME = ( - SELECT max(CREATED_TIME) from epdc_item_handle_process where b.ITEM_ID = ITEM_ID + from epdc_item_handle_process b where b.DEL_FLAG = '0' and b.STATE != 1001 and b.CREATED_TIME = ( + SELECT + max(CREATED_TIME) + from epdc_item_handle_process + where b.ITEM_ID = ITEM_ID + and HANDLER_DEPT != '网格化平台' + and DEL_FLAG = '0' ) ) process on process.ITEM_ID = item.ID WHERE item.DEL_FLAG = '0'