Merge branch 'feature/event'

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemHandleProcessDTO.java

@@ -160,6 +160,16 @@ public class ItemHandleProcessDTO implements Serializable {
      */
     private String delFlag;
 
+    /**
+     * 诉求标题
+     */
+    private String title;
+
+    /**
+     * 诉求性质
+     */
+    private String nature;
+
 
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java

@@ -99,4 +99,14 @@ public class ItemHandleSubmitFormDTO implements Serializable {
      * 办理人办公电话
      */
     private String handlePeopleMobile;
+
+    /**
+     * 诉求标题
+     */
+    private String title;
+
+    /**
+     * 诉求性质
+     */
+    private String nature;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java

@@ -28,6 +28,10 @@ public class AppealHandlingResultDTO {
     private String cznr;
     @JsonProperty("clzp")
     private String clzp;
+    @JsonProperty("sqbt")
+    private String sqbt;
+    @JsonProperty("sqxz")
+    private String sqxz;
     private List<ClfjDTO> clfj;
 
     @NoArgsConstructor

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemHandleProcessEntity.java

@@ -152,4 +152,14 @@ public class ItemHandleProcessEntity extends BaseEpdcEntity {
 	 */
 	private String nextDisCenterZoningCode;
 
+	/**
+	 * 诉求标题
+	 */
+	private String title;
+
+	/**
+	 * 诉求性质
+	 */
+	private String nature;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -1527,6 +1527,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         handleProcessEntity.setHandleAdvice(dto.getHandleAdvice());
         handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice());
         handleProcessEntity.setHandleAdviceRemark(dto.getHandleAdviceRemark());
+        handleProcessEntity.setTitle(dto.getTitle());
+        handleProcessEntity.setNature(dto.getNature());
         // 当前操作人部门tyeKey
         String sendTypeKey = "";
         log.info("处理项目-进入判断");
@@ -1883,7 +1885,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             SysDeptDTO dept = resultdept.getData();
             if (!OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dept.getTypeKey())) {
                 // 诉求处理，上报市平台
-                pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class), NumConstant.ZERO_STR);
+                ItemHandleProcessDTO processDTO = ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class);
+                processDTO.setTitle(dto.getTitle());
+                processDTO.setNature(dto.getNature());
+                pushToCityGridService.appealHandling(processDTO, NumConstant.ZERO_STR);
             }
             // 诉求审核，上报市平台
             //itemAutoProcessRedis.produce(handleProcessEntity.getId().concat(":3"), System.currentTimeMillis() + (131 * 1000));

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

@@ -630,6 +630,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         }
 
         AppealHandlingResultDTO data = new AppealHandlingResultDTO();
+        // 诉求标题
+        data.setSqbt(processDTO.getTitle());
+        // 诉求性质
+        data.setSqxz(processDTO.getNature());
         // 诉求id
         data.setSqid(getSqid(item.getItemId()));
         // 诉求状态