diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTask.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTask.java index d757aff..4d7cf78 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTask.java +++ b/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; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java index acb30db..ee09482 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java +++ b/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 = "分页对象信息") diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java index e40e659..e726011 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java +++ b/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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java index 0915001..903a17d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java +++ b/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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibraryContain.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibraryContain.java index 14920d2..dd530c4 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibraryContain.java +++ b/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; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java index ea09294..5ce1fd2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java @@ -107,6 +107,7 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpllast_update_time, category_name, category_path_name, + category_path_id, #{id}, @@ -160,9 +161,9 @@ #{updateTime}, #{lastUpdateTime}, #{categoryName}, - - #{categoryPathName}, - + #{categoryPathName}, + #{categoryPathId}, + @@ -232,6 +233,9 @@ category_path_name = #{categoryPathName}, + category_path_id = + #{categoryPathId}, + where id = #{id} diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTemplateMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTemplateMapper.xml index 5d1c43c..12dcf8f 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTemplateMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTemplateMapper.xml @@ -140,6 +140,7 @@ org_id, category_name, category_path_name, + category_path_id, #{id}, @@ -158,6 +159,7 @@ #{orgId}, #{categoryName}, #{categoryPathName}, + #{categoryPathId}, @@ -217,6 +219,9 @@ category_path_name = #{categoryPathName}, + category_path_id = + #{categoryPathId}, + where id = #{id} diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml index 2ca4c79..34dacce 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml @@ -13,7 +13,7 @@ - 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 @@ -46,10 +46,11 @@ 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 - ( #{item.categoryLibraryId}, #{item.categoryId},#{item.categoryName},#{item.categoryType},#{item.categoryPathName}) + ( #{item.categoryLibraryId}, #{item.categoryId},#{item.categoryName},#{item.categoryType}, + #{item.categoryPathName},#{item.categoryPathId}) - + update cosco_category_library_contain set lock_type = #{lockType} where category_library_id = #{categoryLibraryId} @@ -108,10 +110,10 @@