Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!276

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;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java

@@ -26,5 +26,5 @@ public interface IQualityEvaluationService extends IService<QualityEvaluation> {
     public List<QualityEvaluation> getEvaluationForm(QualityEvaluation query);
 
 
-    Map<String,Double> getScore(String lawId);
+    Map<String, Double> getScore(String lawId);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java

@@ -126,15 +126,24 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
         queryWrapper.eq("law_id",lawId)
                 .eq("`index`.value_type","number");
 
-//        List<QualityEvaluation> list = this.list(queryWrapper);
+                Page<QualityEvaluation> page = new Page<>(1, 1000);
-
-        Page<QualityEvaluation> page = new Page<>(1, 1000);
-
         List<QualityEvaluation> 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<String, Double> 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;
 
     }
 

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;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -236,7 +236,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
 
             switch (page.getOrderBy()){
                 case "itemsNum" : page.setOrderBy("ITEMS_NUM"); break;
-                default:page.setOrderBy("ITEMS_NUM"); page.setOrder("DESC");
+                default:page.setOrderBy("ITEMS_NUM"); page.setOrder("ASC");
             }
 
             switch (page.getOrder()){

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -390,10 +390,10 @@
                 and ITEMS_NAME like CONCAT('%', #{itemsName},'%')
             </if>
             <if test="XCXSSRQ !=null">
-                and XCXSSRQ=#{XCXSSRQ}
+                and XCXSSRQ like concat('%', #{XCXSSRQ},'%')
             </if>
             <if test="ZCCSSRQ !=null">
-                and ZCCSSRQ=#{ZCCSSRQ}
+                and ZCCSSRQ like concat('%',#{ZCCSSRQ},'%')
             </if>
         </where>
     </sql>

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