添加品类全id

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTask.java

@@ -68,5 +68,9 @@ public class CoscoAnnualreviewTask extends BaseEntity{
      * 模板名称
      */
     private String templateName;
+    /**
+     * 品类全id
+     */
+    private String categoryPathId;
 
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java

@@ -81,6 +81,10 @@ public class CoscoAnnualreviewTemplate extends BaseEntity {
      * 品类全名
      */
     private String categoryPathName;
+    /**
+     * 品类全id
+     */
+    private String categoryPathId;
 
 
     @ApiModelProperty(value = "分页对象信息")

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java

@@ -179,6 +179,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
             CoscoCategoryMaintenance category = coscoCategoryService.getCategoryNameById(taskVo.getCategoryId());
             taskVo.setCategoryName(category.getCategoryName());
             taskVo.setCategoryPathName(category.getPathName());
+            taskVo.setCategoryPathId(category.getPath());
         }
         taskVo.setStatus(AnnualreviewTaskConstant.NOT_START);
         coscoAnnualreviewTaskMapper.insertCoscoAnnualreviewTask(taskVo);
@@ -260,6 +261,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
             CoscoCategoryMaintenance category = coscoCategoryService.getCategoryNameById(taskVo.getCategoryId());
             taskVo.setCategoryName(category.getCategoryName());
             taskVo.setCategoryPathName(category.getPathName());
+            taskVo.setCategoryPathId(category.getPath());
         }
         coscoAnnualreviewTaskMapper.updateCoscoAnnualreviewTask(taskVo);
         addList(taskVo);

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java

@@ -95,6 +95,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
             CoscoCategoryMaintenance category = coscoCategoryService.getCategoryNameById(coscoAnnualreviewTemplate.getCategoryId());
             coscoAnnualreviewTemplate.setCategoryName(category.getCategoryName());
             coscoAnnualreviewTemplate.setCategoryPathName(category.getPathName());
+            coscoAnnualreviewTemplate.setCategoryPathId(category.getPath());
         }
         coscoAnnualreviewTemplateMapper.insertCoscoAnnualreviewTemplate(coscoAnnualreviewTemplate);
         coscoAnnualreviewTemplateIndicatorService.batchInsertCoscoAnnualreviewTemplateIndicator(coscoAnnualreviewTemplate);
@@ -116,6 +117,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
             CoscoCategoryMaintenance category = coscoCategoryService.getCategoryNameById(coscoAnnualreviewTemplate.getCategoryId());
             coscoAnnualreviewTemplate.setCategoryName(category.getCategoryName());
             coscoAnnualreviewTemplate.setCategoryPathName(category.getPathName());
+            coscoAnnualreviewTemplate.setCategoryPathId(category.getPath());
         }
         coscoAnnualreviewTemplateMapper.updateCoscoAnnualreviewTemplate(coscoAnnualreviewTemplate);
         coscoAnnualreviewTemplateIndicatorService.batchInsertCoscoAnnualreviewTemplateIndicator(coscoAnnualreviewTemplate);

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibraryContain.java

@@ -35,6 +35,10 @@ public class CoscoCategoryLibraryContain extends BaseEntity {
      * 品类全名
      */
     private String categoryPathName;
+    /**
+     * 品类全id
+     */
+    private String categoryPathId;
 
 
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java

@@ -107,6 +107,7 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<Cosc
             coscoCategoryLibraryContain.setCategoryId(categoryId.getId());
             coscoCategoryLibraryContain.setCategoryPathName(categoryId.getCategoryPathName());
             coscoCategoryLibraryContain.setLockType(categoryId.getLockType());
+            coscoCategoryLibraryContain.setCategoryPathId(categoryId.getCategoryPathId());
             coscoCategoryLibraryContain.setCategoryName(categoryId.getCategoryName());
             coscoCategoryLibraryContain.setCategoryType(categoryId.getCategoryType());
             coscoCategoryLibraryContain.setDeptId(TokenUtil.getCurrentUser().getOrganizationId());

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCategoryIdVo.java

@@ -27,6 +27,10 @@ public class AddCategoryIdVo implements Serializable {
      * 品类全名
      */
     private String categoryPathName;
+    /**
+     * 品类全id
+     */
+    private String categoryPathId;
 
 
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTask.java

@@ -111,6 +111,10 @@ public class CoscoEvaluateTask extends BaseEntity {
      * 品类路径名称
      */
     private String categoryPathName;
+    /**
+     * 品类全路径id
+     */
+    private String categoryPathId;
 
 
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTemplate.java

@@ -73,4 +73,8 @@ public class CoscoEvaluateTemplate extends BaseEntity {
      * 单位id
      */
     private String orgId;
+    /**
+     *  品类全名id
+     */
+    private String categoryPathId;
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java

@@ -236,6 +236,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
             CoscoCategoryMaintenance category = coscoCategoryService.getCategoryNameById(coscoEvaluateTask.getCategoryId());
             coscoEvaluateTask.setCategoryName(category.getCategoryName());
             coscoEvaluateTask.setCategoryPathName(category.getPathName());
+            coscoEvaluateTask.setCategoryPathId(category.getPath());
         }
         return coscoEvaluateTaskMapper.updateCoscoEvaluateTask(coscoEvaluateTask);
     }
@@ -554,6 +555,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         addCoscoEvaluateTaskVo.setDeptId(currentUser.getOrganizationId());
         if (addCoscoEvaluateTaskVo.getCategoryId() != null) {
             CoscoCategoryMaintenance category = coscoCategoryService.getCategoryNameById(addCoscoEvaluateTaskVo.getCategoryId());
+            addCoscoEvaluateTaskVo.setCategoryPathId(category.getPath());
 
             addCoscoEvaluateTaskVo.setCategoryName(category.getCategoryName());
             addCoscoEvaluateTaskVo.setCategoryPathName(category.getPathName());

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java

@@ -107,6 +107,7 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
             CoscoCategoryMaintenance category = coscoCategoryService.getCategoryNameById(templateVo.getCategoryId());
             templateVo.setCategoryName(category.getCategoryName());
             templateVo.setCategoryPathName(category.getPathName());
+            templateVo.setCategoryPathId(category.getPath());
         }
         coscoEvaluateTemplateMapper.insertCoscoEvaluateTemplate(templateVo);
         // 添加一级二级评价想信息
@@ -129,6 +130,7 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
             CoscoCategoryMaintenance category = coscoCategoryService.getCategoryNameById(templateVo.getCategoryId());
             templateVo.setCategoryName(category.getCategoryName());
             templateVo.setCategoryPathName(category.getPathName());
+            templateVo.setCategoryPathId(category.getPath());
         }
         coscoEvaluateTemplateMapper.updateCoscoEvaluateTemplate(templateVo);
         /**

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml

@@ -141,6 +141,7 @@
             <if test="lastUpdateTime != null">last_update_time,</if>
             <if test="categoryName != null">category_name,</if>
             <if test="categoryPathName != null">category_path_name,</if>
+            <if test="categoryPathId != null">category_path_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -160,9 +161,9 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="lastUpdateTime != null">#{lastUpdateTime},</if>
             <if test="categoryName != null">#{categoryName},</if>
-            <if test="categoryPathName != null">
+            <if test="categoryPathName != null">#{categoryPathName},</if>
-                #{categoryPathName},
+            <if test="categoryPathId != null">#{categoryPathId},</if>
-            </if>
+
         </trim>
     </insert>
     <insert id="batchCoscoAnnualreviewTask" parameterType="java.util.List">
@@ -232,6 +233,9 @@
             <if test="categoryPathName != null">category_path_name =
                 #{categoryPathName},
             </if>
+            <if test="categoryPathId != null">category_path_id =
+                #{categoryPathId},
+            </if>
         </trim>
         where id = #{id}
     </update>

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTemplateMapper.xml

@@ -140,6 +140,7 @@
             <if test="orgId != null">org_id,</if>
             <if test="categoryName != null">category_name,</if>
             <if test="categoryPathName != null">category_path_name,</if>
+            <if test="categoryPathId != null">category_path_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -158,6 +159,7 @@
             <if test="orgId != null">#{orgId},</if>
             <if test="categoryName != null">#{categoryName},</if>
             <if test="categoryPathName != null">#{categoryPathName},</if>
+            <if test="categoryPathId != null">#{categoryPathId},</if>
         </trim>
     </insert>
     <insert id="batchCoscoAnnualreviewTemplate" parameterType="java.util.List">
@@ -217,6 +219,9 @@
             <if test="categoryPathName != null">category_path_name =
                 #{categoryPathName},
             </if>
+            <if test="categoryPathId != null">category_path_id =
+                #{categoryPathId},
+            </if>
         </trim>
         where id = #{id}
     </update>

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml

@@ -13,7 +13,7 @@
     </resultMap>
 
     <sql id="selectCoscoCategoryLibraryContainVo">
-        select category_library_id, category_id,category_name,category_path_name
+        select category_library_id, category_id, category_name, category_path_name
         from cosco_category_library_contain
     </sql>
 
@@ -46,10 +46,11 @@
     </insert>
     <insert id="batchCoscoCategoryLibraryContain" parameterType="java.util.List">
         insert into cosco_category_library_contain
-        ( category_library_id, category_id,category_name,category_type,category_path_name)
+        ( category_library_id, category_id,category_name,category_type,category_path_name,category_path_id)
         values
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.categoryLibraryId}, #{item.categoryId},#{item.categoryName},#{item.categoryType},#{item.categoryPathName})
+            ( #{item.categoryLibraryId}, #{item.categoryId},#{item.categoryName},#{item.categoryType},
+            #{item.categoryPathName},#{item.categoryPathId})
         </foreach>
     </insert>
     <update id="updateCoscoCategoryLibraryContain"
@@ -100,7 +101,8 @@
         where cclc.category_library_id = #{categoryLibraryId}
     </select>
 
-    <update id="updateLockType" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibraryContain">
+    <update id="updateLockType"
+            parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibraryContain">
         update cosco_category_library_contain
         set lock_type = #{lockType}
         where category_library_id = #{categoryLibraryId}
@@ -108,10 +110,10 @@
     </update>
 
     <select id="selectCoscoCateGoryIdByLibraryId" parameterType="string" resultMap="CoscoCategoryLibraryContainResult">
-        select cclc.category_name,cclc.category_path_name
+        select cclc.category_name, cclc.category_path_name
         from cosco_category_library_contain cclc
         where cclc.category_library_id = #{libraryId}
-        and cclc.category_type=1
+          and cclc.category_type = 1
     </select>
 
     <select id="selectSupplierIdByLibraryId" parameterType="string" resultType="string">

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml

@@ -188,9 +188,7 @@
                cet.weight_dept,
                cet.weight_value,
                cet.status,
-               cet.category_path_name
+               cet.category_path_name cet.del_flag, cet.create_by,
-               cet.del_flag,
-               cet.create_by,
                cet.create_time,
                cet.update_by,
                cet.update_time,
@@ -229,6 +227,7 @@
             <if test="lastUpdateTime != null">last_update_time,</if>
             <if test="categoryName != null">category_name,</if>
             <if test="categoryPathName != null">category_path_name,</if>
+            <if test="categoryPathId != null">category_path_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -252,6 +251,7 @@
             <if test="lastUpdateTime != null">#{lastUpdateTime},</if>
             <if test="categoryName != null">#{categoryName},</if>
             <if test="categoryPathName != null">#{categoryPathName},</if>
+            <if test="categoryPathId != null">#{categoryPathId},</if>
 
         </trim>
     </insert>

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTemplateMapper.xml

@@ -163,6 +163,7 @@
             <if test="orgId != null">org_id,</if>
             <if test="categoryName != null">category_name,</if>
             <if test="categoryPathName != null">category_path_name,</if>
+            <if test="categoryPathId != null">category_path_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -184,6 +185,7 @@
             <if test="orgId != null">#{orgId},</if>
             <if test="categoryName != null">#{categoryName},</if>
             <if test="categoryPathName != null">#{categoryPathName},</if>
+            <if test="categoryPathId != null">#{categoryPathId},</if>
         </trim>
     </insert>
     <insert id="batchCoscoEvaluateTemplate" parameterType="java.util.List">
@@ -252,6 +254,9 @@
             <if test="categoryPathName != null">category_path_name =
                 #{categoryPathName},
             </if>
+            <if test="categoryPathId != null">category_path_id =
+                #{categoryPathId},
+            </if>
         </trim>
         where id = #{id}
     </update>