diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java index 3a68d2451..7f003641e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java @@ -44,6 +44,12 @@ public class PeopleItemFormDTO implements Serializable { * 编号 */ private String serialNum; + + /** + * 区分 0 网格员上报 1居民上报 + */ + private String appealSource; + /** * 页码,从1开始 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java index 4aac04f67..b110070b2 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java @@ -137,4 +137,13 @@ public class SubmitItemFormDTO implements Serializable { * 企业地址 */ private String enterpriseAddress; + + + /** + * 区分 0 网格员上报还是 1 居民上报 + */ + private String appealSource; + + + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java index 724e8cc8d..1a2b29bf7 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java @@ -293,4 +293,10 @@ public class ItemEntity extends BaseEpdcEntity { * 是否重复 */ private Integer repeatFlag; + + /** + * 区分 0 网格员上报还是 1居民上报 + */ + private String appealSource; + } 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 bd6bdacc7..d9efee2fa 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 @@ -3366,6 +3366,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem entity.setFirstCategoryCode("13"); entity.setItemCode("PT" + System.currentTimeMillis());//项目编号 entity.setIsPeople("1");//诉求上报 + entity.setAppealSource(formDto.getAppealSource()); String code = ""; if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) { //民生诉求所属网格对应的所属社区的市中心编码 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 2cbd0a31b..115f6e976 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 @@ -2097,6 +2097,9 @@ and t1.SERIAL_NUM like '%${serialNum}%' + + and t1.APPEAL_SOURCE = #{appealSource} + ORDER BY t1.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize} @@ -2250,6 +2253,9 @@ and i.EVALUATION_SCORE = #{evaluationScore} + + and i.APPEAL_SOURCE = #{appealSource} + AND DATE_FORMAT( i.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}