Merge branch 'feature/pushCaseTo_city' of http://121.42.41.42:7070/r/esua-epdc-cloud into feature/pushCaseTo_city

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

@@ -2326,6 +2326,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 itemHandleProcessDto.setHandlerDept("网格化平台");
                 itemHandleProcessDto.setCreatedTime(insertTime);
                 itemHandleProcessDto.setUpdatedTime(insertTime);
+                //网格化平台字段
+                itemHandleProcessDto.setGridPartyid(dto.getPARTID());
+                itemHandleProcessDto.setGridPartyname(dto.getPARTNAME());
+                itemHandleProcessDto.setGridUnitid(dto.getUNITID());
+                itemHandleProcessDto.setGridUnitname(dto.getUNITNAME());
+                itemHandleProcessDto.setGridNextpartid(dto.getNEXTPARTID());
+                itemHandleProcessDto.setGridNextpartname(dto.getNEXTPARTNAME());
+                itemHandleProcessDto.setGridNextunitid(dto.getNEXTUNITID());
+                itemHandleProcessDto.setGridNextunitname(dto.getNEXTUNITNAME());
+                itemHandleProcessDto.setGridTaskcnname(dto.getTASKCNNAME());
                 itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto);
 
                 // 插入网格化平台处理记录表

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

@@ -3,8 +3,8 @@
 
 <mapper namespace="com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao">
     <insert id="insertItemHandleProcess">
-        INSERT INTO epdc_item_handle_process ( ID, ITEM_ID, STATE, HANDLE_ADVICE, OUT_HANDLE_ADVICE, HANDLER_DEPT, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DEL_FLAG )
-        VALUES (#{id}, #{itemId}, #{state}, #{handleAdvice}, #{outHandleAdvice}, #{handlerDept}, 0, '网格化平台', #{createdTime}, '网格化平台', #{updatedTime}, '0')
+        INSERT INTO epdc_item_handle_process ( ID, ITEM_ID, STATE, HANDLE_ADVICE, OUT_HANDLE_ADVICE, HANDLER_DEPT, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DEL_FLAG , GRID_PARTYID , GRID_PARTYNAME , GRID_UNITID , GRID_UNITNAME , GRID_NEXTPARTID , GRID_NEXTPARTNAME , GRID_NEXTUNITID , GRID_NEXTUNITNAME , GRID_TASKCNNAME)
+        VALUES (#{id}, #{itemId}, #{state}, #{handleAdvice}, #{outHandleAdvice}, #{handlerDept}, 0, '网格化平台', #{createdTime}, '网格化平台', #{updatedTime}, '0',#{gridPartyid} ,#{gridPartyname} , #{gridNextunitid}, #{gridNextunitname}, #{gridNextpartid},#{gridNextpartname} , #{gridNextunitid}, #{gridNextunitname}, #{gridTaskcnname})
     </insert>
 
     <update id="updateDeptNameByDeptId">