bugfix

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 762d085bcbdca1cc88e670956a3cd147537abec2
+Subproject commit 002e4550fa6be4e5921daa98e3a2bf77ca8b62fb

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

@@ -217,6 +217,16 @@ public class ItemDTO implements Serializable {
      */
     private String allDeptNames;
 
+    /**
+     * 分类code
+     */
+    private String categoryCode;
+
+    /**
+     * 12345平台原始code
+     */
+    private String categoryCodeOrigin;
+
     /**
      * 分类全称
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -45,6 +45,16 @@ import java.util.Map;
 @Mapper
 public interface ItemDao extends BaseDao<ItemEntity> {
 
+    /**
+     * 查询类别
+     *
+     * @param id
+     * @return ItemDTO
+     * @author
+     * @date
+     */
+    ItemDTO getCategoryInfo(@Param("id") String id);
+
     /**
      * 根据议题ID获取项目信息
      *

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

@@ -109,7 +109,7 @@ public interface ItemService extends BaseService<ItemEntity> {
     ItemDTO get(String id);
 
     /**
-     * 单条查询
+     * 查询类别
      *
      * @param id
      * @return ItemDTO

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

@@ -436,8 +436,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     @Override
     public ItemDTO getCategoryInfo(String id) {
-        ItemEntity entity = baseDao.getCategoryInfo(id);
+        return baseDao.getCategoryInfo(id);
-        return ConvertUtils.sourceToTarget(entity, ItemDTO.class);
     }
 
     @Override

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

@@ -581,7 +581,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         String id = processDTO.getId();
         String itemId = processDTO.getItemId();
         AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id, processDTO.getItemId());
-        ItemDTO itemDTO = itemService.get(itemId);
+        ItemDTO itemDTO = itemService.getCategoryInfo(itemId);
         if (null == item || itemDTO == null) {
             log.error("流程节点不存在");
             return new Result();
@@ -645,7 +645,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             data.setClfj(clfjList);
         }
         // 处理类型
-        data.setSqlx("itemDTO.getcate");
+        data.setSqlx(itemDTO.getCategoryCodeOrigin());
         // 处理时间
         data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
         // 处理内容

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

@@ -2,6 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.modules.item.dao.ItemDao">
+
+    <select id="getCategoryInfo" resultType="com.elink.esua.epdc.dto.item.ItemDTO">
+        SELECT
+            i.*,
+            c.category_code AS categoryCodeOrigin
+        FROM
+            epdc_item i
+                LEFT JOIN epdc_category c ON i.CATEGORY_CODE = c.id
+        WHERE
+            i.DEL_FLAG = '0'
+        AND i.id = #{id}
+    </select>
+
     <select id="selectOneItemByIssueId" resultType="com.elink.esua.epdc.dto.item.ItemDTO">
         SELECT * FROM epdc_item WHERE DEL_FLAG = '0' AND ISSUE_ID = #{issueId}
     </select>