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 fce8aab..f3cf20c 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 @@ -56,6 +56,10 @@ public class CoscoAnnualreviewTemplate extends BaseEntity { * 是否启用(0.草稿、1.启用、2.禁用) */ private Long status; + /** + * 单位id + */ + private String orgId; /** * 删除标识(normal.正常、deleted.已删除) 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 d6c57a2..82834d3 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 @@ -81,6 +81,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT BaseCacheUser currentUser = TokenUtil.getCurrentUser(); Date date = new Date(); coscoAnnualreviewTemplate.setCreateTime(date); + coscoAnnualreviewTemplate.setOrgId(currentUser.getOrganizationId()); coscoAnnualreviewTemplate.setUpdateTime(date); coscoAnnualreviewTemplate.setUpdateBy(currentUser.getUserId()); coscoAnnualreviewTemplate.setId(PropertyUtils.getSnowflakeId()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/entity/CoscoBlacklist.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/entity/CoscoBlacklist.java index db677e1..8be4880 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/entity/CoscoBlacklist.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/entity/CoscoBlacklist.java @@ -56,9 +56,15 @@ public class CoscoBlacklist extends BaseEntity { * 恢复审批工作流id */ private String restoreWorkFlowId; + /** + * 单位id + */ + private String orgId; private Date createTime; private Date updateTime; private String remark; + + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java index f2379d4..047ad77 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java @@ -101,6 +101,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { public int insertCoscoBlacklist(AddBlackListVo listVo) { BaseCacheUser currentUser = TokenUtil.getCurrentUser(); listVo.setCreateTime(new Date()); + listVo.setOrgId(currentUser.getOrganizationId()); listVo.setCreateBy(currentUser.getUserId()); listVo.setLastUpdateTime(LocalDateTime.now()); listVo.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java index f00b9a6..6c94163 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java @@ -51,6 +51,10 @@ public class BlackListVo implements Serializable { private String themeName; private String deptId; + /** + * 单位id + */ + private String orgId; @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java index 176309a..c99585a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java @@ -25,6 +25,10 @@ public class BlackSupplierVo implements Serializable { * 社会信用代码 */ private String socialCreditCode; + /** + * 社会信用代码 + */ + private String unifiedCode; /** * 部门名称 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrary.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrary.java index 36e5dd9..d9ab73a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrary.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrary.java @@ -55,5 +55,6 @@ public class CoscoCategoryLibrary extends BaseEntity { private LocalDateTime createTime; private LocalDateTime updateTime; + private String orgId; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java index b31df0a..a33caf6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java @@ -89,6 +89,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl + select cat.id, cat.template_name, cat.template_type, + cat.org_id, cat.copy_template_id, cat.category_limitation, cat.category_id, @@ -68,6 +70,9 @@ and cat.last_update_time = #{vo.lastUpdateTime} + + and cat.org_id = #{vo.orgId} + order by cat.create_time desc @@ -100,6 +105,9 @@ and cat.last_update_time = #{lastUpdateTime} + + and cat.org_id = #{orgId} + @@ -126,6 +134,7 @@ update_by, update_time, last_update_time, + org_id, #{id}, @@ -141,6 +150,7 @@ #{updateBy}, #{updateTime}, #{lastUpdateTime}, + #{orgId}, diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml index d2c4fc9..d632c69 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml @@ -22,6 +22,7 @@ + @@ -29,6 +30,7 @@ timelimit_type, start_time, end_time, + org_id, restore_approve_status, restore_work_flow_id, blacklist_reason, @@ -68,6 +70,9 @@ and last_update_time = #{lastUpdateTime} + + and org_id = #{orgId} + @@ -104,6 +109,7 @@ end_time, restore_approve_status, restore_work_flow_id, + org_id, #{id}, @@ -123,6 +129,7 @@ #{endTime}, #{restoreApproveStatus}, #{restoreWorkFlowId}, + #{orgId}, @@ -210,26 +217,30 @@ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml index 989fb47..50fbd4c 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml @@ -22,6 +22,7 @@ + @@ -29,6 +30,7 @@ name, apply_dept_id, approve_type, + org_id, term_of_validity, remark, dept_id, @@ -70,6 +72,10 @@ and last_update_time = #{lastUpdateTime} + + and org_id = #{orgId} + + @@ -98,6 +104,7 @@ last_update_time, approve_type, apply_dept_id, + org_id, #{id}, @@ -115,6 +122,8 @@ #{lastUpdateTime}, #{approveType}, #{applyDeptId}, + #{orgId}, + @@ -256,6 +265,9 @@ AND ccl.create_time between #{vo.startTime} and #{vo.endTime} + + AND ccl.org_id = #{vo.orgId} + GROUP BY ccl.id diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTemplateMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTemplateMapper.xml index ee8c96b..2d2e283 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTemplateMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTemplateMapper.xml @@ -23,16 +23,15 @@ - - - + select id, template_name, template_type, + org_id, copy_template_id, category_limitation, category_id, @@ -57,6 +56,7 @@ "单位" as tenantName, "部门" as deptName, cet.create_time as createTime, + cet.org_id as orgId, cet.status , cet.create_by as createBy, case status @@ -105,6 +105,9 @@ and last_update_time = #{lastUpdateTime} + + and org_id = #{orgId} + @@ -153,7 +156,7 @@ last_update_time, indicator_type_more, indicator_st_more, - indicator_nd_more, + org_id, #{id}, @@ -172,6 +175,7 @@ #{indicatorTypeMore}, #{indicatorStMore}, #{indicatorNdMore}, + #{orgId}, diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml index fce72c8..0039a39 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml @@ -1028,8 +1028,16 @@ resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo"> SELECT csb.id AS supplierId, - csb.name AS supplierName, + CASE + WHEN csb.supplier_type = 'ovs' THEN + csb.name_en ELSE csb.name END AS supplierName, csb.social_credit_code as socialCreditCode, + CASE + WHEN csb.supplier_type = 'dvs' THEN social_credit_code + WHEN csb.supplier_type = 'ovs' THEN vat + WHEN csb.supplier_type = 'pe' THEN id_card + ELSE NULL + END AS unifiedCode, '准入部门' AS deptName, category_info.categoryName AS categoryName, work_time.createTime AS createTime,