2023/12/27 不重复显示计算结果

cirs-biz/src/main/java/com/cirs/biz/controller/TVerificationScoretaskDetailController.java

@@ -71,7 +71,7 @@ public class TVerificationScoretaskDetailController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, @RequestBody List<Long> taskids)
     {
-        List<TVerificationScoretaskDetail> list = tVerificationScoretaskDetailService.selectTVerificationScoreaskDetailByTaskIds(taskids);
+        List<TVerificationScoretaskDetail> list = tVerificationScoretaskDetailService.selectTVerificationByTaskIds(taskids);
         ExcelUtil<TVerificationScoretaskDetail> util = new ExcelUtil<TVerificationScoretaskDetail>(TVerificationScoretaskDetail.class);
         util.exportExcel(response, list, "打分算法验证详情数据");
     }

cirs-biz/src/main/java/com/cirs/biz/controller/TVerificationTaskDetailController.java

@@ -74,7 +74,7 @@ public class TVerificationTaskDetailController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, @RequestBody List<Long> taskids)
     {
-        List<TVerificationTaskDetail> list = tVerificationTaskDetailService.selectTVerificationTaskDetailByTaskIds(taskids);
+        List<TVerificationTaskDetail> list = tVerificationTaskDetailService.selectTVerificationByTaskIds(taskids);
         ExcelUtil<TVerificationTaskDetail> util = new ExcelUtil<TVerificationTaskDetail>(TVerificationTaskDetail.class);
         util.exportExcel(response, list, "验证任务详情数据");
     }
@@ -216,7 +216,7 @@ public class TVerificationTaskDetailController extends BaseController
             tVerificationTaskService.updateTVerificationTask(task);
             tVerificationTaskDetailService.updateDetails(dataSet);
 
-            logger.info(result);
+//            logger.info(result);
             if(jsonObject.getIntValue("code")!=200){
 
                 throw new Exception();

cirs-biz/src/main/java/com/cirs/biz/domain/TVerificationScoretaskDetail.java

@@ -210,6 +210,7 @@ public class TVerificationScoretaskDetail extends BaseEntity
     @Excel(name = "算法计算的最终等级")
     private String calculatedGrade;
 
+    @Excel(name = "是否是训练数据")
     private Integer trained;
 
     public Integer getTrained() {
@@ -228,6 +229,7 @@ public class TVerificationScoretaskDetail extends BaseEntity
         this.tested = tested;
     }
 
+    @Excel(name = "是否为训练数据")
     private Integer tested;
 
     public void setId(Long id) 

cirs-biz/src/main/java/com/cirs/biz/domain/TVerificationTaskDetail.java

@@ -85,7 +85,9 @@ public class TVerificationTaskDetail extends BaseEntity
 
     private Long calculate5Id;
 
+    @Excel(name = "是否为训练数据")
     private Integer trained;
+    @Excel(name = "是否为测试数据")
     private Integer tested;
 
     public Long getId() {

cirs-biz/src/main/java/com/cirs/biz/mapper/TVerificationScoretaskDetailMapper.java

@@ -63,6 +63,7 @@ public interface TVerificationScoretaskDetailMapper
     public List<TVerificationScoretaskDetail> getByscoretaskid(Long taskid);
 
     public List<TVerificationScoretaskDetail> selectTVerificationScoreaskDetailByTaskIds(@Param("taskids") List<Long> taskids);
+    public List<TVerificationScoretaskDetail> selectTVerificationByTaskIds(@Param("taskids") List<Long> taskids);
 
     public List<TVerificationScoretaskDetail> selectTrainDetailByTaskIds(@Param("taskids") List<Long> taskids);
 }

cirs-biz/src/main/java/com/cirs/biz/mapper/TVerificationTaskDetailMapper.java

@@ -62,7 +62,7 @@ public interface TVerificationTaskDetailMapper
     public int deleteTVerificationTaskDetailByIds(Long[] ids);
 
     public List<TVerificationTaskDetail> selectTVerificationTaskDetailByTaskIds(@Param("taskids") List<Long> taskids);
-
+    public List<TVerificationTaskDetail> selectTVerificationByTaskIds(@Param("taskids") List<Long> taskids);
     public List<TVerificationTaskDetail> alldata(Long taskid);
 
 

cirs-biz/src/main/java/com/cirs/biz/service/ITVerificationScoretaskDetailService.java

@@ -65,6 +65,8 @@ public interface ITVerificationScoretaskDetailService
 
     public List<TVerificationScoretaskDetail> selectTVerificationScoreaskDetailByTaskIds(List<Long> taskids);
 
+    List<TVerificationScoretaskDetail> selectTVerificationByTaskIds(List<Long> taskids);
+
     public List<TVerificationScoretaskDetail> selectTrainDetailByTaskIds(List<Long> taskids);
 
     void updateDetails(List<TVerificationScoretaskDetail> dataset);

cirs-biz/src/main/java/com/cirs/biz/service/ITVerificationTaskDetailService.java

@@ -67,6 +67,8 @@ public interface ITVerificationTaskDetailService
 
     public List<TVerificationTaskDetail> selectTVerificationTaskDetailByTaskIds(List<Long> taskids);
 
+    public List<TVerificationTaskDetail> selectTVerificationByTaskIds(List<Long> taskids);
+
     public List<TVerificationTaskDetail> alldata(Long taskid);
 
     public Long setComponentId(String result);

cirs-biz/src/main/java/com/cirs/biz/service/impl/TVerificationScoretaskDetailServiceImpl.java

@@ -4,8 +4,6 @@ import java.util.Date;
 import java.util.List;
 
 import com.cirs.biz.domain.TVerificationScoretask;
-import com.cirs.biz.domain.TVerificationTask;
-import com.cirs.biz.domain.TVerificationTaskDetail;
 import com.cirs.biz.mapper.TVerificationScoretaskMapper;
 import com.cirs.common.exception.ServiceException;
 import com.cirs.common.utils.StringUtils;
@@ -179,6 +177,10 @@ public class TVerificationScoretaskDetailServiceImpl implements ITVerificationSc
     public List<TVerificationScoretaskDetail> selectTVerificationScoreaskDetailByTaskIds(List<Long> taskids) {
         return tVerificationScoretaskDetailMapper.selectTVerificationScoreaskDetailByTaskIds(taskids);
     }
+    @Override
+    public List<TVerificationScoretaskDetail> selectTVerificationByTaskIds(List<Long> taskids) {
+        return tVerificationScoretaskDetailMapper.selectTVerificationByTaskIds(taskids);
+    }
 
     @Override
     public List<TVerificationScoretaskDetail> selectTrainDetailByTaskIds(List<Long> taskids) {

cirs-biz/src/main/java/com/cirs/biz/service/impl/TVerificationTaskDetailServiceImpl.java

@@ -1,7 +1,9 @@
 package com.cirs.biz.service.impl;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import com.cirs.biz.domain.TVerificationTask;
 import com.cirs.biz.domain.VerificationData;
@@ -209,6 +211,11 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
     public List<TVerificationTaskDetail> selectTVerificationTaskDetailByTaskIds(List<Long> taskids) {
         return tVerificationTaskDetailMapper.selectTVerificationTaskDetailByTaskIds(taskids);
 
+    }
+    @Override
+    public List<TVerificationTaskDetail> selectTVerificationByTaskIds(List<Long> taskids) {
+        return tVerificationTaskDetailMapper.selectTVerificationByTaskIds(taskids);
+
     }
 
     @Override
@@ -240,18 +247,33 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
             for (VerificationData verificationData : dataset) {
 
                 TVerificationTaskDetail detail = this.selectTVerificationTaskDetailById(verificationData.getId());
+                if(verificationData.getTested()==1){
+                    Long[] CalculateIds ={verificationData.getCalculate1Id(),verificationData.getCalculate2Id(),verificationData.getCalculate3Id(),
+                            verificationData.getCalculate4Id(),verificationData.getCalculate5Id()};
+                    Arrays.sort(CalculateIds,0,5);
+
+                    detail.setCalculate1Id(CalculateIds[0]);
+                    int len = 1;
+                    for(int i=1;i<5;i++){
+                        if(!Objects.equals(CalculateIds[i], CalculateIds[i-1])){
+                            CalculateIds[len++] = CalculateIds[i];
+                        }
+                    }
+                    System.out.println("len:"+len);
+                    for(;len<5;len++){
+                        CalculateIds[len] = null;
+                    }
+                    detail.setCalculate2Id(CalculateIds[1]);
+                    detail.setCalculate3Id(CalculateIds[2]);
+                    detail.setCalculate4Id(CalculateIds[3]);
+                    detail.setCalculate5Id(CalculateIds[4]);
+                    detail.setCalculate1(getDetailInfoById(detail.getCalculate1Id()));
+                    detail.setCalculate2(getDetailInfoById(detail.getCalculate2Id()));
+                    detail.setCalculate3(getDetailInfoById(detail.getCalculate3Id()));
+                    detail.setCalculate4(getDetailInfoById(detail.getCalculate4Id()));
+                    detail.setCalculate5(getDetailInfoById(detail.getCalculate5Id()));
+                }
 
-                detail.setCalculate1Id(verificationData.getCalculate1Id());
-                detail.setCalculate2Id(verificationData.getCalculate2Id());
-                detail.setCalculate3Id(verificationData.getCalculate3Id());
-                detail.setCalculate4Id(verificationData.getCalculate4Id());
-                detail.setCalculate5Id(verificationData.getCalculate5Id());
-
-                detail.setCalculate1(getDetailInfoById(detail.getCalculate1Id()));
-                detail.setCalculate2(getDetailInfoById(detail.getCalculate2Id()));
-                detail.setCalculate3(getDetailInfoById(detail.getCalculate3Id()));
-                detail.setCalculate4(getDetailInfoById(detail.getCalculate4Id()));
-                detail.setCalculate5(getDetailInfoById(detail.getCalculate5Id()));
                 detail.setTrained(verificationData.getTrained());
                 detail.setTested(verificationData.getTested());
 

cirs-biz/src/main/resources/mapper/biz/TVerificationScoretaskDetailMapper.xml

@@ -131,6 +131,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item}
         </foreach>
     </select>
+    <select id="selectTVerificationByTaskIds" resultMap="TVerificationScoretaskDetailResult">
+        select id, task_id, factory_name, factor1, factor2, factor3, factor4, factor5, factor6, factor7, factor8, factor9, factor10, factor11, factor12, factor13, factor14, factor15, factor16, factor17, factor18, factor19, factor20, factor21, factor22, factor23, factor24, factor25, factor26, factor27, factor28, factor29, factor30, factor31, factor32, factor33, factor34, factor35, factor36, factor37, factor38, factor39, factor40, factor41, factor42, factor43, factor44, final_grade, calculated_grade,trained,tested from t_verification_scoretask_detail
+        where task_id in
+        <foreach item="item" collection="taskids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
     <select id="selectTrainDetailByTaskIds" resultMap="TVerificationScoretaskDetailResult">
         <include refid="selectTVerificationScoretaskDetailVo"/>
         where trained=1 AND task_id in

cirs-biz/src/main/resources/mapper/biz/TVerificationTaskDetailMapper.xml

@@ -103,6 +103,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item}
         </foreach>
 
+    </select>
+    <select id="selectTVerificationByTaskIds"
+            resultType="com.cirs.biz.domain.TVerificationTaskDetail" resultMap="TVerificationTaskDetailResult">
+        select task_id, use_scene,search_condition, result1, result2, result3, result4, result5, calculate1, calculate2, calculate3,calculate4,calculate5, trained,tested,create_by, create_time, update_by, update_time, remark from t_verification_task_detail
+        where task_id in
+        <foreach item="item" collection="taskids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
     </select>
     <select id="alldata" resultMap="TVerificationTaskDetailResult">
         select id,task_id, use_scene,search_condition, result1,result1_id, result2,result2_id, result3,result3_id, result4,result4_id, result5,result5_id, calculate1,calculate1_id, calculate2,calculate2_id, calculate3,calculate3_id,calculate4,calculate4_id,calculate5,calculate5_id, create_by, create_time, update_by, update_time, remark,trained,tested from t_verification_task_detail
@@ -195,16 +204,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="result4Id != null">result4_id = #{result4Id},</if>
             <if test="result5 != null">result5 = #{result5},</if>
             <if test="result5Id != null">result5_id = #{result5Id},</if>
-            <if test="calculate1 != null">calculate1 = #{calculate1},</if>
-            <if test="calculate1Id != null">calculate1_id = #{calculate1Id},</if>
-            <if test="calculate2 != null">calculate2 = #{calculate2},</if>
-            <if test="calculate2Id != null">calculate2_id = #{calculate2Id},</if>
-            <if test="calculate3 != null">calculate3 = #{calculate3},</if>
-            <if test="calculate3Id != null">calculate3_id = #{calculate3Id},</if>
-            <if test="calculate4 != null">calculate4 = #{calculate4},</if>
-            <if test="calculate4Id != null">calculate4_id = #{calculate4Id},</if>
-            <if test="calculate5 != null">calculate5 = #{calculate5},</if>
-            <if test="calculate5Id != null">calculate5_id = #{calculate5Id},</if>
+            calculate1 = #{calculate1},
+            calculate1_id = #{calculate1Id},
+            calculate2 = #{calculate2},
+            calculate2_id = #{calculate2Id},
+            calculate3 = #{calculate3},
+            calculate3_id = #{calculate3Id},
+            calculate4 = #{calculate4},
+            calculate4_id = #{calculate4Id},
+            calculate5 = #{calculate5},
+            calculate5_id = #{calculate5Id},
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

cirs-ui/src/views/biz/score/index.vue

@@ -153,7 +153,7 @@
 
     <!-- 添加或修改厂家得分对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="500px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="500px" label-position="top">
         <el-form-item label="厂家名称" prop="factoryName">
           <el-input v-model="form.factoryName" placeholder="请输入厂家名称" />
 

cirs-ui/src/views/biz/task/index.vue

@@ -693,6 +693,7 @@ export default {
     handleExport() {
 
       if(this.ids.length===0) {
+        this.$modal.msg("导出数据为空！")
         this.importTemplate()
       }else {
         // this.download('biz/detail/export', this.ids, `taskdetail_${new Date().getTime()}.xlsx`)