From b121d8254cbf24297fb2e4d03bdb04574d2a355b Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Mon, 30 Jun 2025 09:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CoscoAnnualreviewTaskMapper.xml | 9 +++------ .../CoscoAnnualreviewTaskSupplierMapper.xml | 5 ++++- ...oscoAnnualreviewTaskSupplierUserMapper.xml | 10 ++++++++-- .../entity/CoscoAnnualreviewTemplate.java | 4 ++++ .../CoscoAnnualreviewTaskServiceImpl.java | 1 + .../vo/AnnualreviewTaskSupplierListVo.java | 7 +++++++ .../dao/mapper/CoscoBlacklistMapper.xml | 2 +- .../CoscoCategoryLibraryContainMapper.java | 7 +++++++ .../dao/CoscoCategoryMapper.java | 5 +++++ .../CoscoCategoryLibraryContainMapper.xml | 7 +++++++ ...oscoCategoryLibrarySupplierApplyMapper.xml | 7 +++++++ .../ICoscoCategoryLibraryContainService.java | 7 +++++++ ...oscoCategoryLibraryContainServiceImpl.java | 10 ++++++++++ ...tegoryLibrarySupplierApplyServiceImpl.java | 17 ++++++++++++++++- ...stCoscoCategoryLibrarySupplierApplyVo.java | 12 ++++++++++++ .../dao/mapper/CoscoEvaluateTaskMapper.xml | 19 +++++++++++++------ .../CoscoEvaluateTaskSupplierMapper.xml | 16 ++++++++++++++++ .../impl/CoscoEvaluateTaskServiceImpl.java | 1 + .../vo/CoscoEvaluateTemplateVo.java | 2 +- .../coscosupplier/vo/SupplierPageVo.java | 4 ++++ .../dao/mapper/CoscoSupplierBaseMapper.xml | 13 ++++++++++++- 21 files changed, 146 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml index c330dce..467cda2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml @@ -228,13 +228,10 @@ FROM cosco_annualreview_task cat - and cat.annualreview_theme = #{vo.annualreviewTheme} + and cat.annualreview_theme like concat('%',#{vo.annualreviewTheme},'%') - - and cat.start_time = #{vo.startTime} - - - and cat.end_time = #{vo.endTime} + + and cat.start_time between #{vo.startTime} and #{vo.endTime} and cat.status = #{vo.status} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml index e61673f..1d2db27 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml @@ -51,7 +51,7 @@ cosco_annualreview_task_supplier cats join cosco_annualreview_task cat on cats.annualreview_task_id = cat.id JOIN cosco_supplier_base csb ON cats.supplier_id = csb.id - left join cosco_category cc on cc.id = csb.category_id + left join cosco_category cc on cc.id = cat.category_id where cats.del_flag='normal' and csb.name like concat('%',#{vo.name},'%') @@ -62,6 +62,9 @@ and cats.review_result=#{vo.reviewResult} + + and cats.last_update_time between #{vo.startTime} and #{vo.endTime} + 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 ab357ad..a0f045b 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 @@ -47,6 +47,10 @@ public class CoscoAnnualreviewTemplate extends BaseEntity { * 品类id(cosco_category表主键) */ private String categoryId; + /** + * 创建单位 + */ + private String deptId; /** * 是否启用(0.草稿、1.启用、2.禁用) 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 fa187d6..374fcb3 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 @@ -62,6 +62,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS vo.setAnnualreviewTheme(coscoAnnualreviewTask.getAnnualreviewTheme()); vo.setTemplateId(coscoAnnualreviewTask.getTemplateId()); vo.setStartTime(coscoAnnualreviewTask.getStartTime()); + vo.setAnnualreviewYear(coscoAnnualreviewTask.getAnnualreviewYear()); vo.setEndTime(coscoAnnualreviewTask.getEndTime()); vo.setCategoryId(coscoAnnualreviewTask.getCategoryId()); vo.setCategoryLimitation(coscoAnnualreviewTask.getCategoryLimitation()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java index 7157827..761ca1c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.Date; @Data public class AnnualreviewTaskSupplierListVo implements Serializable { @@ -42,6 +43,12 @@ public class AnnualreviewTaskSupplierListVo implements Serializable { private String deptId; + /** + * 审查开始时间 + */ + private Date startTime; + private Date endTime; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml index 8b473e9..9c8248d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml @@ -232,7 +232,7 @@ + select cclc.category_id + from cosco_category_library_contain cclc + join cosco_category cc on cc.id= cclc.category_id + where cclc.category_library_id = #{libraryId} and cc.type=1 + + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml index 37c1e6e..dddb7b6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml @@ -50,6 +50,7 @@ select cclsa.id, ccl.name, ccl.area, + ccl.id as libraryId, '张三' as applyUser , ccl.create_time as applyTime, cclsa.approve_status as approveStatus @@ -206,6 +207,12 @@ and ccl.name like concat('%',#{vo.name},'%') + + and ccl.area = #{vo.area} + + + and ccl.area = #{vo.approveStatus} + GROUP BY cclsa.id diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java index 2ff4c77..c8aa8c1 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java @@ -96,4 +96,11 @@ public interface ICoscoCategoryLibraryContainService extends IBaseService coscoCategoryLibraryContain); + + /** + * 获取品类名称 + * @param libraryId + * @return + */ + List selectCoscoCateGoryIdByLibraryId(String libraryId); } 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 2598bdc..7484054 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 @@ -154,6 +154,16 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl selectCoscoCateGoryIdByLibraryId(String libraryId) { + return coscoCategoryLibraryContainMapper.selectCoscoCateGoryIdByLibraryId(libraryId); + } + /** * 递归构建树形结构 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java index c94d6dd..73d260a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java @@ -6,7 +6,10 @@ import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCoscoCategoryLibrarySupplierApplyVo; @@ -31,6 +34,10 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp private CoscoCategoryLibrarySupplierApplyMapper coscoCategoryLibrarySupplierApplyMapper; @Autowired private ICoscoCategoryLibrarySupplierService coscoCategoryLibrarySupplierService; + @Autowired + private ICoscoCategoryLibraryContainService coscoCategoryLibraryContainService; + @Autowired + private CoscoCategoryMapper coscoCategoryMapper; /** * 查询品类库_品类库入库供应商申请单 @@ -42,7 +49,15 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp public ListCoscoCategoryLibrarySupplierApplyVo selectCoscoCategoryLibrarySupplierApplyById(String id) { ListCoscoCategoryLibrarySupplierApplyVo vo = coscoCategoryLibrarySupplierApplyMapper.selectCoscoCategoryLibrarySupplierApplyById(id); //获取添加的供应商 - + List strings = coscoCategoryLibraryContainService.selectCoscoCateGoryIdByLibraryId(vo.getLibraryId()); + StringBuilder sb = new StringBuilder(); + for (String s : strings) { + if (sb.length() > 0) { + sb.append(","); + } + sb.append(coscoCategoryMapper.selectCategoryNameById(s)); + } + vo.setCategoryName(sb.toString()); vo.setCoscoCategoryLibrarySupplierVos(coscoCategoryLibrarySupplierService.selectSupplierByApplyId(id)); return vo; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java index e01f8d0..7e141b2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java @@ -17,6 +17,18 @@ public class ListCoscoCategoryLibrarySupplierApplyVo implements Serializable { * 品类库 */ private String name; + /** + * 部门名称 + */ + private String deptName="部门"; + /** + * 品类名称 + */ + private String categoryName; + /** + * 品类id + */ + private String libraryId; /** * 地域 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml index ee4c787..45f1516 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml @@ -122,14 +122,14 @@ select cet.id as taskId, case when cetad.status = 1 and cetad2.status is null then 1 else 2 end as division from cosco_evaluate_task cet - join cosco_evaluate_task_assign_dept cetad + join cosco_evaluate_task_assign_dept cetad on cet.id = cetad.evaluate_task_id and cetad.parent_dept_id = #{parentDeptId} and cetad.status = 1 left join cosco_evaluate_task_assign_dept cetad2 on cet.id = cetad2.evaluate_task_id and cetad2.parent_dept_id = #{deptId} - cet.id in ( + cet.id in ( #{item} @@ -353,10 +353,10 @@ cet.dept_id as deptId, cet.approve_status as approveStatus, case - when cet.approve_status = 0 then '审批中' - when cet.approve_status = 1 then '通过' - when cet.approve_status = 2 then '驳回' - else '未审批' end as approveName, + when cet.approve_status = 0 then '审批中' + when cet.approve_status = 1 then '通过' + when cet.approve_status = 2 then '驳回' + else '未审批' end as approveName, case when cet.status = 0 then '待评价' when cet.status = 1 then '评价中' @@ -376,6 +376,9 @@ and cet.status=#{vo.status} + + and cet.start_time between #{vo.startTime} and #{vo.endTime} + group by id @@ -407,6 +410,10 @@ and cet.status=#{vo.status} + + and (cet.start_time >= #{vo.startTime} and cet.end_time <= #{vo.endTime}) + + order by cet.create_time desc diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml index 7959296..06d4d9b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml @@ -79,6 +79,7 @@ and cets.last_update_time = #{lastUpdateTime} + @@ -122,6 +123,12 @@ and cets.last_update_time = #{vo.lastUpdateTime} + + and csb.name like concat('%',#{vo.supplierName},'%') + + + and csb.level_name = #{levelName} + @@ -289,6 +296,15 @@ LEFT JOIN cosco_supplier_base csb ON cets.supplier_id = csb.id and csb.del_flag='normal' and cetsu.del_flag = 'normal' + + and (csb.name like concat('%',#{vo.name},'%') or cet.evaluate_theme like concat('%',#{vo.name},'%')) + + + and cets.start_time between #{vo.startTime} and #{vo.endTime} + + + and cets.status = #{vo.status} + and cetsu.user_id= #{vo.userId} and cet.id= #{vo.taskId} and cets.supplier_id= #{vo.supplierId} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java index 6dcb140..0351aae 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java @@ -155,6 +155,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { addCoscoEvaluateTaskVo.setBlackSupplierVos(blackSupplierVos); addCoscoEvaluateTaskVo.setIndicatorList(vos); } catch (Exception e) { + e.printStackTrace(); throw new RuntimeException(e); } return addCoscoEvaluateTaskVo; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java index bee2503..5b1a1de 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java @@ -21,7 +21,7 @@ public class CoscoEvaluateTemplateVo implements Serializable { /** * 品类id */ - private Long categoryId; + private String categoryId; /** * 创建单位 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java index c53345f..ce0e788 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java @@ -43,6 +43,10 @@ public class SupplierPageVo { /** 最新评价时间 */ private String supplierType; + /** + * 品类id + */ + private String categoryId; /** * 黑名单部门list 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 3de3028..5261c73 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 @@ -897,7 +897,7 @@ SELECT csb.id, MAX(csb.name) AS name, - csb.social_credit_code AS socialCreditCode, + MAX(csb.social_credit_code) AS socialCreditCode, MAX(cas.dept_id) AS deptId, MAX(caw.id) AS accessWorkId, MAX(caw.update_time) AS admissionTime, @@ -941,6 +941,7 @@ LEFT JOIN ( SELECT casc.supplier_id, + GROUP_CONCAT(casc.category_id SEPARATOR ', ') AS categoryId, GROUP_CONCAT(cc.category_name SEPARATOR ', ') AS categoryName FROM cosco_access_supplier_category casc @@ -987,6 +988,16 @@ ) + + and csb.name like concat('%',#{vo.name},'%') + + + and cas.dept_id = #{vo.deptId} + + + and category_info.categoryId like concat('%',#{vo.categoryId},'%') + + GROUP BY csb.id