移动端议题模块接口BUG修改

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java

@@ -38,7 +38,7 @@ public class ApiIssueController {
      * @Date: 2019/9/8 15:36
      */
     @PostMapping("submit")
-    public Result submitEvent(@LoginUser TokenDto userDetail, EpdcEventSubmitFormDTO formDto) {
+    public Result submitEvent(@LoginUser TokenDto userDetail, @RequestBody EpdcEventSubmitFormDTO formDto) {
         return issueService.saveEvent(userDetail, formDto);
     }
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
 import com.elink.esua.epdc.feign.ItemFeignClient;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import java.util.List;
  * @Author LC
  * @Date 2019/9/9 16:39
  */
+@Component
 public class ItemFeignClientFallback implements ItemFeignClient {
 
     @Override

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -19,7 +20,7 @@ public class IssueFormDTO implements Serializable {
     /**
      * 用户所属网格ID
      */
-    @NotBlank(message = "用户网格ID不能为空")
+    @NotNull(message = "用户网格ID不能为空")
     private Long deptId;
     /**
      * 0: 获取最新列表，1: 获取最热列表

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

@@ -105,11 +105,11 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
     /**
      * 议题位置纬度
      */
-	private BigDecimal issueLatitude;
+	private double issueLatitude;
     /**
      * 议题位置经度
      */
-	private BigDecimal issueLongitude;
+	private double issueLongitude;
     /**
      * 友邻社区ID
      */

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

@@ -228,7 +228,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         issueEntity.setGridId(entity.getGridId());
         issueEntity.setIssueAddress(entity.getIssueAddress());
         issueEntity.setIssueCategoryId(entity.getIssueCategoryId());
-        issueEntity.setIssusLatitude(entity.getIssueLatitude());
+        issueEntity.setIssueLatitude(entity.getIssueLatitude());
         issueEntity.setIssueLongitude(entity.getIssueLongitude());
         issueEntity.setFriendlyCommunityId(entity.getFriendlyCommunityId());
         issueEntity.setIssueState(EventIssueItemState.ISSUE_REVIEW_PASS);

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java

@@ -127,12 +127,12 @@ public class IssueEntity extends BaseEpdcEntity {
     /**
      * 议题位置纬度
      */
-	private BigDecimal issusLatitude;
+	private double issueLatitude;
 
     /**
      * 议题位置经度
      */
-	private BigDecimal issueLongitude;
+	private double issueLongitude;
 
     /**
      * 友邻社区ID

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

@@ -160,7 +160,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         if (EventIssueItemState.ISSUE_CHANGE_TO_ITEM == dto.getState()) {
             updateById(issueEntity);
             // 插入项目表
-            ItemEntity itemEntity = initItemEntity(issueEntity);
+            ItemEntity itemEntity = initItemEntity(this.selectById(issueEntity.getId()));
             itemService.insert(itemEntity);
             // 插入项目处理流程表
             ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity();
@@ -269,7 +269,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         itemEntity.setIssueCategoryId(issueEntity.getIssueCategoryId());
         itemEntity.setIssueAddress(issueEntity.getIssueAddress());
         itemEntity.setIssueLongitude(issueEntity.getIssueLongitude());
-        itemEntity.setIssusLatitude(issueEntity.getIssusLatitude());
+        itemEntity.setIssueLatitude(issueEntity.getIssueLatitude());
         itemEntity.setFriendlyCommunityId(issueEntity.getFriendlyCommunityId());
         itemEntity.setItemState(EventIssueItemState.ITEM_WAITING_GRID_HANDLE);
         return itemEntity;

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

@@ -132,12 +132,12 @@ public class ItemEntity extends BaseEpdcEntity {
     /**
      * 议题位置纬度
      */
-	private BigDecimal issusLatitude;
+	private double issueLatitude;
 
     /**
      * 议题位置经度
      */
-	private BigDecimal issueLongitude;
+	private double issueLongitude;
 
     /**
      * 友邻社区ID

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

@@ -48,6 +48,7 @@
                 AND temp.grid_id = #{gridId}
             </if>
             AND temp.EVENT_STATE = 0
+        ORDER BY temp.CREATED_TIME DESC
     </select>
 
     <select id="selectListOfRejectEvents" resultType="com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO">

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -66,6 +66,7 @@
             WHERE
                 i.DEL_FLAG = '0'
                 AND i.ID = #{id}
+            ORDER BY h.CREATED_TIME DESC
     </select>
 
     <select id="selectOneIssueContentDetail" resultType="com.elink.esua.epdc.dto.issue.IssueContentDetailDTO">

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

@@ -28,7 +28,7 @@
             <result property="image" column="IMG_URL"/>
         </collection>
     </resultMap>
-    <select id="selectListOfItems" resultType="itemsMap">
+    <select id="selectListOfItems" resultMap="itemsMap">
         SELECT
         item.ID,
         item.EVENT_ID,