新增网格员上报

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开始
      */

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;
+
+
+
 }

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;
+
 }

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<ItemDao, ItemEntity> 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())) {
             //民生诉求所属网格对应的所属社区的市中心编码

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -2097,6 +2097,9 @@
         <if test="serialNum != null and serialNum != ''">
             and t1.SERIAL_NUM like '%${serialNum}%'
         </if>
+        <if test="appealSource != null and appealSource != ''">
+            and t1.APPEAL_SOURCE = #{appealSource}
+        </if>
         ORDER BY
         t1.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
@@ -2250,6 +2253,9 @@
         <if test="evaluationScore != null and evaluationScore != ''">
             and i.EVALUATION_SCORE = #{evaluationScore}
         </if>
+        <if test="appealSource != null and appealSource != ''">
+            and i.APPEAL_SOURCE = #{appealSource}
+        </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( i.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>