From 276f0a9726e04f8c576d1bc327ddcec2afc257a2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 13:45:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/QualityEvaluation.java | 17 +++++++++++++++ .../service/IQualityEvaluationService.java | 2 +- .../impl/QualityEvaluationServiceImpl.java | 21 +++++++++++++------ .../QualityEvaluationMapper.xml | 6 +++++- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java index 48272e92..db50f52a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java @@ -89,6 +89,23 @@ public class QualityEvaluation extends BaseEntity { @ApiModelProperty(value = "指标名称") private String indexTitle; + @ApiModelProperty(value = "一级指标名称") + @TableField(exist = false) + private String oneIndexTitle; + + @ApiModelProperty(value = "二级指标名称") + @TableField(exist = false) + private String twoIndexTitle; + + @ApiModelProperty(value = "三级指标名称") + @TableField(exist = false) + private String threeIndexTitle; + + + @ApiModelProperty(value = "指标权重") + @TableField(exist = false) + private String weight; + @TableField(exist = false) private Integer page; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java index c4984665..6eb17ced 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java @@ -26,5 +26,5 @@ public interface IQualityEvaluationService extends IService { public List getEvaluationForm(QualityEvaluation query); - Map getScore(String lawId); + Map getScore(String lawId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index 786abe9a..765241da 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -126,15 +126,24 @@ public class QualityEvaluationServiceImpl extends ServiceImpl list = this.list(queryWrapper); - - Page page = new Page<>(1, 1000); - + Page page = new Page<>(1, 1000); List list = qualityEvaluationDao.getHistory(page, queryWrapper).getRecords(); +// return list.stream() +// .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, +// Collectors.groupingBy(QualityEvaluation::getEvaluationIndex, +// Collectors.averagingDouble(item -> Double.valueOf(item.getScore())) +// ) +// )); - return list.stream() + + HashMap result = new HashMap<>(); + result.put("dynamic",0.0); + result.put("quality",0.0); + + result.putAll(list.stream() .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, - Collectors.averagingDouble(item ->Double.valueOf(item.getScore()) ))); + Collectors.averagingDouble(item ->Double.valueOf(item.getScore()) )))); + return result; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml index 4d603e7f..20dc0681 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -41,7 +41,11 @@ quality_evaluation.create_time AS createTime, quality_evaluation.modify_time AS modifyTime, `index`.value_type AS valueType, - `index`.three_index_title as indexTitle + `index`.three_index_title as indexTitle, + `index`.one_index_title as oneIndexTitle, + `index`.two_index_title as twoIndexTitle, + `index`.three_index_title as threeIndexTitle, + `index`.weight as weight FROM quality_evaluation LEFT JOIN ts_user `user` ON quality_evaluation.user_id = `user` .USID From 0cabb928d7c87658c09e918e327364894473f129 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 14:26:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=20=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java | 4 ++-- .../sarStandItems/service/impl/SarStandItemsServiceImpl.java | 2 +- .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java index 3833259b..6d387013 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -25,11 +25,11 @@ public class FindSarItemsPageReqDTO extends BasePage { @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date XCXSSRQ; + private String XCXSSRQ; @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date ZCCSSRQ; + private String ZCCSSRQ; @ApiModelProperty(value = "文件类型") private String fileType; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index e71dcf59..12b12d4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -236,7 +236,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl - and XCXSSRQ=#{XCXSSRQ} + and XCXSSRQ like concat('%', #{XCXSSRQ},'%') - and ZCCSSRQ=#{ZCCSSRQ} + and ZCCSSRQ like concat('%',#{ZCCSSRQ},'%') From fd9bf0f1304b3a38b8872ff286365f847b449490 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 9 Dec 2021 14:27:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=20=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarStandItems/entity/SarStandItems.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 06cd41a3..7d32b016 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -125,12 +125,12 @@ public class SarStandItems extends BaseEntity { @ApiModelProperty(value = "新车型实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @TableField("XCXSSRQ") - private Date xccssrq; + private String xccssrq; @ApiModelProperty(value = "在产车实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ZCCSSRQ") - private Date zccssrq; + private String zccssrq; @ApiModelProperty(value = "符合性要求-符合性状态")