bug修改

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

@@ -19,7 +19,7 @@ public class ItemHandleSubmitFormDTO implements Serializable {
     /**
      * 项目ID
      */
-    private String itemId;
+    private String id;
 
     /**
      * 处理意见（内部）

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

@@ -66,7 +66,7 @@ public class ItemDeptServiceImpl extends BaseServiceImpl<ItemDeptDao, ItemDeptEn
         for (ItemCirculationDeptResultDTO dto:
                 formDTO.getDeptResultDTOS()) {
             ItemDeptEntity entity = new ItemDeptEntity();
-            entity.setItemId(formDTO.getItemId());
+            entity.setItemId(formDTO.getId());
             entity.setDeptId(dto.getDeptId());
             entity.setDeptName(dto.getDeptName());
             entity.setCreatedDeptId(createdDeptId);

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

@@ -385,7 +385,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 handleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING);
 
                 // 删除已流转协助部门
-                itemDeptService.modifyItemDepts(SecurityUser.getDeptId(), dto.getItemId());
+                itemDeptService.modifyItemDepts(SecurityUser.getDeptId(), dto.getId());
                 // 新增流转协助部门
                 itemDeptService.saveItemDepts(SecurityUser.getDeptId(), dto);
             } else {
@@ -394,17 +394,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() ||
                         ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
                     ItemEntity itemEntity = new ItemEntity();
-                    itemEntity.setId(dto.getItemId());
+                    itemEntity.setId(dto.getId());
                     itemEntity.setItemState(dto.getHandleCategory());
                     this.insert(itemEntity);
                     // 结案 保存部门满意度评价
                     if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
-                        itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getItemId(), SecurityUser.getDeptId());
+                        itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getId(), SecurityUser.getDeptId());
                     }
                 }
             }
             // 记录处理记录
-            handleProcessEntity.setItemId(dto.getItemId());
+            handleProcessEntity.setItemId(dto.getId());
             handleProcessEntity.setHandleAdvice(dto.getHandleAdvice());
             handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice());
             handleProcessEntity.setHandlerDeptId(SecurityUser.getDeptId());
@@ -442,7 +442,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 return new Result().error("获取机构信息失败，请稍后重试");
             }
             // 获取街道党工委已流转协助部门
-            List<ItemDeptDTO> itemDeptDTOS = itemDeptService.listOfItemDept(dto.getItemId(), completeDept.getData().getStreetId());
+            List<ItemDeptDTO> itemDeptDTOS = itemDeptService.listOfItemDept(dto.getId(), completeDept.getData().getStreetId());
             if (null != itemDeptDTOS && itemDeptDTOS.size() > 0) {
                 return new Result().error(completeDept.getData().getStreet()+"已将该项目流转协助到其他部门，不能重新流转协助");
             }

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

@@ -262,7 +262,7 @@
         <result property="nickName" column="NICK_NAME"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="itemContent" column="ITEM_CONTENT"/>
-        <result property="address" column="ISSUE_ADDRESS"/>
+        <result property="issueAddress" column="ISSUE_ADDRESS"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>