From 599723627c81d26b799fedfd5a03ae5c297e2335 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Thu, 7 Aug 2025 11:20:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataStatisticeController.java | 30 ++++++--- .../vo/SupplierAnnualReviewStatisticsVo.java | 6 +- .../vo/SupplierEvaluateStatisticsVo.java | 2 - .../vo/SupplierQualificationExpireVo.java | 15 ++--- .../CoscoAnnualreviewTaskSupplierMapper.xml | 4 +- .../CoscoEvaluateTaskSupplierMapper.xml | 4 +- .../CoscoSupplierQualificationsMapper.xml | 7 ++- .../dao/mapper/CoscoSupplierexitMapper.xml | 63 ++++++++----------- 8 files changed, 70 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java index 94f5131..2bfe300 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java @@ -50,10 +50,15 @@ public class DataStatisticeController { try { List list = dataStatisticeService.getSupplierEvaluateStatisticsList(vo); String fileName = URLEncoder.encode("供应评价.xlsx", "UTF-8"); + Set includeFields = new HashSet<>(Arrays.asList( + "supplierName","area", "categoryName","evaluateYear","evaluateResult" + // 指定要导出的字段名 + )); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setCharacterEncoding("utf-8"); - EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) + EasyExcelFactory.write(response.getOutputStream(), SupplierEvaluateStatisticsVo.class) + .includeColumnFieldNames(includeFields) .sheet("供应评价") .doWrite(list); } catch (Exception e) { @@ -84,11 +89,15 @@ public class DataStatisticeController { List list = dataStatisticeService.getSupplierAnnualReviewStatisticsList(vo); String fileName = URLEncoder.encode("供应年审.xlsx", "UTF-8"); // 动态设置导出字段（忽略未标注字段） - + Set includeFields = new HashSet<>(Arrays.asList( + "supplierName","area", "categoryName","annualreviewYear","annualStatisticsResult" + // 指定要导出的字段名 + )); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setCharacterEncoding("utf-8"); - EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) + EasyExcelFactory.write(response.getOutputStream(), SupplierAnnualReviewStatisticsVo.class) + .includeColumnFieldNames(includeFields) .sheet("供应年审") .doWrite(list); } catch (Exception e) { @@ -120,11 +129,14 @@ public class DataStatisticeController { List list = dataStatisticeService.getSupplierExitStatisticsList(vo); String fileName = URLEncoder.encode("供应商退出信息.xlsx", "UTF-8"); // 动态设置导出字段（忽略未标注字段） - + Set includeFields = new HashSet<>(Arrays.asList( + "supplierName","area", "categoryName","accessUnit","accessDept","applyUser" // 指定要导出的字段名 + )); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setCharacterEncoding("utf-8"); - EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) + EasyExcelFactory.write(response.getOutputStream(), SupplierExitStatisticsVo.class) + .includeColumnFieldNames(includeFields) .sheet("供应商退出信息") .doWrite(list); } catch (Exception e) { @@ -154,11 +166,15 @@ public class DataStatisticeController { List list = dataStatisticeService.getSupplierQualificationExpireList(vo); String fileName = URLEncoder.encode("供应商资质.xlsx", "UTF-8"); // 动态设置导出字段（忽略未标注字段） - + Set includeFields = new HashSet<>(Arrays.asList( + "supplierName","area", "categoryName","accessUnit","accessDept","qualificationsName" + ,"termOfValidity"// 指定要导出的字段名 + )); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setCharacterEncoding("utf-8"); - EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) + EasyExcelFactory.write(response.getOutputStream(), SupplierQualificationExpireVo.class) + .includeColumnFieldNames(includeFields) .sheet("供应商资质") .doWrite(list); } catch (Exception e) { diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java index 866e163..dbc526a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java @@ -37,18 +37,18 @@ public class SupplierAnnualReviewStatisticsVo { /** * 准入单位 */ - @ExcelProperty("准入单位") + private String accessUnit="天津中远海运集装箱运输有限公司"; /** * 准入部门 */ - @ExcelProperty("准入部门") + private String accessDept="天津中远海运集装箱运输有限公司"; /** * 评价年度 */ @ExcelProperty("评价年度") - private String annualreviewYear="2025"; + private String annualreviewYear; private String supplierId; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java index 9677e98..df874f5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java @@ -33,12 +33,10 @@ public class SupplierEvaluateStatisticsVo { /** * 准入单位 */ - @ExcelProperty("准入单位") private String accessUnit="天津中远海运集装箱运输有限公司"; /** * 准入部门 */ - @ExcelProperty("准入部门") private String accessDept="天津中远海运集装箱运输有限公司"; /** * 评价年度 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java index 4e83c13..edd0a49 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java @@ -17,14 +17,10 @@ public class SupplierQualificationExpireVo { /** * 发证机构 */ - @ExcelProperty("发证机构") + private String authority; - /** - * 有效期截止日 - */ - @ExcelProperty("有效期截止日") - private Date termOfValidity; + /** * 供应商名称 @@ -74,8 +70,13 @@ public class SupplierQualificationExpireVo { /** * 资质名称 */ + @ExcelProperty("资质名称") private String qualificationsName; - + /** + * 有效期截止日 + */ + @ExcelProperty("资质到期时间") + private Date termOfValidity; /** * 部门id */ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml index 1c3bc4f..9bf7817 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml @@ -239,8 +239,8 @@ and cat.annualreview_year = #{annualreviewYear} - - and cat.org_id = #{vo.orgId} + + and cat.org_id = #{orgId} and review_result is not null diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml index 4b64948..eb6a04f 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml @@ -374,8 +374,8 @@ and cets.review_result = #{evaluateResult} - - and cet.org_id = #{vo.orgId} + + and cet.org_id = #{orgId} order by cets.create_time desc diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml index f065d94..53cdc57 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml @@ -243,8 +243,8 @@ WHERE casc.del_flag = 'normal' AND casc.supplier_id = csb.id - - and casc.org_id=#{vo.orgId} + + and casc.org_id=#{orgId} ) AS category, caw.dept_id , @@ -265,6 +265,9 @@ and csb.name like concat('%',#{supplierName},'%') + + and caw.org_id=#{orgId} + ORDER BY csq.term_of_validity ASC diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml index 04a3c92..543d892 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml @@ -216,33 +216,27 @@ resultMap="supplierExitResultMap" parameterType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo"> select - csb.name supplierName, + csb.name as supplierName, csb.id as supplierId, case when csb.supplier_type = 'ovs' then '境外' - when csb.supplier_type = 'ovs' then '境内' - else '境内' end as area , + else '境内' end as area, cse.id, - '天津中远海运集装箱运输有限公司' as accessUnit, - '天津中远海运集装箱运输有限公司' as accessDept, cse.create_by as applyUser, - (select GROUP_CONCAT( DISTINCT cssc.category_name SEPARATOR ', ' ) + + cse.update_time as applyTime, + (select IFNULL(GROUP_CONCAT(DISTINCT cssc.category_name SEPARATOR ', '), '') from cosco_supplierexit_supplier_category cssc - where cssc.supplier_id=csb.id and cssc.supplierexit_id=cse.id) as category, - cse.update_time as applyTime - from cosco_supplierexit_supplier_category cssc - join cosco_category cc - ON cc.id = cssc.category_id - where cssc.supplier_id=csb.id and cssc.supplierexit_id=cse.id) as categoryName - from cosco_supplierexit cse - join cosco_supplierexit_supplier css - on cse.id= css.supplierexit_id - join cosco_supplier_base csb on csb.id=css.supplier_id - where cse.approve_status=1 + where cssc.supplier_id=csb.id and cssc.supplierexit_id=cse.id) as category, + '1' as accessUnit + from cosco_supplierexit cse + join cosco_supplierexit_supplier css on cse.id = css.supplierexit_id + join cosco_supplier_base csb on csb.id = css.supplier_id + where cse.approve_status = 1 and csb.name like concat('%',#{supplierName},'%') - - and cse.org_id = #{vo.orgId} + + and cse.org_id = #{orgId} @@ -259,25 +253,22 @@