update:增加处理措施

adcbs-check/src/main/java/com/adc/da/dto/resDTO/CheckResultFalseResDTO.java

@@ -17,8 +17,11 @@ class CheckResultFalseResDTO extends BasePage {
     private String paramData;
     private String fromData;
     private String checkResult;
+    private String checkEnd;
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date checkTime;
     private String ent;
     private String id;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
 }

adcbs-check/src/main/java/com/adc/da/system/controller/CheckDataCheckResultController.java

@@ -86,11 +86,11 @@ public class CheckDataCheckResultController extends BaseController {
      */
     @ApiOperation(value = "|CheckDataCheckResult|处理随车文件一致性对比不一致数据")
     @GetMapping("/updateCheckFalse")
-    public ResponseMessage updateCheckFalse(String id) {
+    public ResponseMessage updateCheckFalse(String id,String checkEnd) {
         if (StringUtils.isBlank(id)) {
             return Result.error("操作失败");
         }
-        if (iCheckDataCheckResultService.updateCheckFalse(id)) {
+        if (iCheckDataCheckResultService.updateCheckFalse(id, checkEnd)) {
             return Result.success("200","操作成功","");
         }
         return Result.error("操作失败");

adcbs-check/src/main/java/com/adc/da/system/entity/CheckRealVehicleVerResult.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("NERDS.CHECK_REAL_VEHICLE_VER_RESULT")
+@TableName("CHECK_REAL_VEHICLE_VER_RESULT")
 public class CheckRealVehicleVerResult extends BaseReqPageEntity {
 
     private static final long serialVersionUID = 1L;

adcbs-check/src/main/java/com/adc/da/system/entity/CheckRealVehicleVerification.java

@@ -193,4 +193,9 @@ public class CheckRealVehicleVerification extends BaseReqPageEntity {
      */
     @TableField(exist = false)
     private String detailType;
+    @TableField("CHECK_END")
+    private String checkEnd;
+    @TableField("END_DATE")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
 }

adcbs-check/src/main/java/com/adc/da/system/service/ICheckDataCheckResultService.java

@@ -65,9 +65,10 @@ public interface ICheckDataCheckResultService extends IService<CheckDataCheckRes
     /**
      *
      * @param id
+     * @param checkEnd
      * @return
      */
-    Boolean updateCheckFalse(String id);
+    Boolean updateCheckFalse(String id, String checkEnd);
 
     List<DownCheckFalseDTO> downCheckFalse(String address, String project, String isHandel , String carGroup, String editionCode, String paramName);
 

adcbs-check/src/main/java/com/adc/da/system/service/impl/CheckDataCheckResultServiceImpl.java

@@ -105,11 +105,13 @@ public class CheckDataCheckResultServiceImpl extends ServiceImpl<CheckDataCheckR
     }
 
     @Override
-    public Boolean updateCheckFalse(String id) {
+    public Boolean updateCheckFalse(String id, String checkEnd) {
         UpdateWrapper wrapper = new UpdateWrapper();
         wrapper.set("CHECK_RESULT","2");
         wrapper.eq("ID",id);
+        wrapper.set("CHECK_END",checkEnd);
         wrapper.set("CHECK_DATE",new Date());
+        wrapper.set("END_DATE",new Date());
         return this.update(wrapper);
     }
 

adcbs-check/src/main/java/com/adc/da/system/service/impl/CheckRealVehicleVerificationImpl.java

@@ -1221,6 +1221,7 @@ public class CheckRealVehicleVerificationImpl
             checkRealVehicleVerificationDao.updateCheckModelSeriesListTime(checkRealVehicleVerificationDto);//修改时间和操作人
         }
         checkRealVehicleVer.setHandleType("1");
+        checkRealVehicleVer.setEndDate(new Date());
 //        UpdateWrapper<CheckRealVehicleVerification> wrapper = new UpdateWrapper();
 //        wrapper.set("HANDLE_TYPE", "1");
 //        wrapper.eq("ID", checkRealVehicleVer.getId());

adcbs-check/src/main/resources/mybatis/mapper/system/CheckDataCheckResultMapper.xml

@@ -19,6 +19,8 @@
         CDCR.PARAM_NAME as paramName,
         CDCR.CHECK_FORM_DATA AS fromData,
         CDCR.CHECK_RESULT AS checkResult,
+        CDCR.CHECK_END AS checkEnd,
+        CDCR.END_DATE AS endDate,
         CASE CDCR.CHECK_TYPE
         WHEN '2' THEN
         '合格证'

adcbs-check/src/main/resources/mybatis/mapper/system/CheckRealVehicleVerificationDao.xml

@@ -9,7 +9,7 @@
     </resultMap>
 
     <select id="selectByVehicleSeriesId" parameterType="String" resultMap="CheckRealVVDTO">
-        select ID,PARAMETER_NAME,RECORD_FAULT_CODE FROM CHECK_REAL_VEHICLE_VER WHERE CHECK_TYPE = '1'
+        select ID,PARAMETER_NAME,RECORD_FAULT_CODE FROM NERDS.CHECK_REAL_VEHICLE_VER WHERE CHECK_TYPE = '1'
         <if test="vehicleSeriesId != null and vehicleSeriesId != ''">
             AND VEHICLE_SERIES_ID = #{vehicleSeriesId}
         </if>
@@ -70,7 +70,7 @@
             CMSL.KEY_TIME AS keyTime,
             CMSL.CREATION_TIME AS creationTime
         FROM
-            CHECK_REAL_VEHICLE_VER CRVV
+            NERDS.CHECK_REAL_VEHICLE_VER CRVV
                 LEFT JOIN CHECK_MODEL_SERIES_LIST CMSL
                     ON CMSL.ID = CRVV.ID
         WHERE
@@ -157,7 +157,9 @@
         SELECT
 			t1.ID,t2.VEHICLE_SERIES,t1.VEHICLE_SERIES_ID,t1.VEHICLE_TYPE,t1.PARAMETER_NAME,t1.PARAMETER,t1.DISCHARGE_STAGE,t1.TYPE,t1.RECORD_FAULT_CODE,
 			t1.HANDLE_TYPE,t1.CHECK_PICTURE_PATH_TWO,t1.REMARKS,t3.USERNAME,t2.CREATE_TIME,t1.PROJECT,t1.REGULATORY_REQUIREMENTS,
-			t1.VEHICLE_TYPE_NAME,t1.STANDARD_NAME,t1.CHECK_RESULT,t1.CHECK_PICTURE_PATH,t1.PARAM_CONFIG
+			t1.VEHICLE_TYPE_NAME,t1.STANDARD_NAME,t1.CHECK_RESULT,t1.CHECK_PICTURE_PATH,t1.PARAM_CONFIG,
+        t1.CHECK_END as checkEnd,
+        t1.END_DATE as endDate
         FROM
         NERDS.CHECK_REAL_VEHICLE_VER t1
         LEFT JOIN
@@ -205,7 +207,7 @@
         t1.HANDLE_TYPE,t1.CHECK_PICTURE_PATH_TWO,t1.REMARKS,t3.USNAME,t2.CREATE_TIME,t4.ORG_NAME,t1.PROJECT,t1.REGULATORY_REQUIREMENTS,
         t1.VEHICLE_TYPE_NAME,t1.STANDARD_NAME,t1.CHECK_RESULT,t1.CHECK_PICTURE_PATH
         FROM
-        CHECK_REAL_VEHICLE_VER t1
+        NERDS.CHECK_REAL_VEHICLE_VER t1
         LEFT JOIN
         CHECK_MODEL_SERIES_LIST t2
         ON t1.VEHICLE_SERIES_ID = t2.ID
@@ -239,7 +241,7 @@
         t1.HANDLE_TYPE,t1.CHECK_PICTURE_PATH_TWO,t1.REMARKS,t3.USNAME,t2.CREATE_TIME,t4.ORG_NAME,t1.PROJECT,t1.REGULATORY_REQUIREMENTS,
         t1.VEHICLE_TYPE_NAME,t1.STANDARD_NAME,t1.CHECK_RESULT,t1.CHECK_PICTURE_PATH
         FROM
-        CHECK_REAL_VEHICLE_VER t1
+        NERDS.CHECK_REAL_VEHICLE_VER t1
         LEFT JOIN
         CHECK_MODEL_SERIES_LIST t2
         ON t1.VEHICLE_SERIES_ID = t2.ID
@@ -273,7 +275,7 @@
         t1.HANDLE_TYPE,t1.CHECK_PICTURE_PATH_TWO,t1.REMARKS,t3.USNAME,t2.CREATE_TIME,t4.ORG_NAME,t1.PROJECT,t1.REGULATORY_REQUIREMENTS,
         t1.VEHICLE_TYPE_NAME,t1.STANDARD_NAME,t1.CHECK_RESULT,t1.CHECK_PICTURE_PATH
         FROM
-        CHECK_REAL_VEHICLE_VER t1
+        NERDS.CHECK_REAL_VEHICLE_VER t1
         LEFT JOIN
         CHECK_MODEL_SERIES_LIST t2
         ON t1.VEHICLE_SERIES_ID = t2.ID
@@ -310,7 +312,7 @@
         t1.HANDLE_TYPE,t1.CHECK_PICTURE_PATH_TWO,t1.REMARKS,t3.USNAME,t2.CREATE_TIME,t4.ORG_NAME,t1.PROJECT,t1.REGULATORY_REQUIREMENTS,
         t1.VEHICLE_TYPE_NAME,t1.STANDARD_NAME,t1.CHECK_RESULT,t1.CHECK_PICTURE_PATH
         FROM
-        CHECK_REAL_VEHICLE_VER t1
+        NERDS.CHECK_REAL_VEHICLE_VER t1
         LEFT JOIN
         CHECK_MODEL_SERIES_LIST t2
         ON t1.VEHICLE_SERIES_ID = t2.ID
@@ -372,7 +374,7 @@
             t2.VEHICLE_SERIES,
             t2.VEHICLE_TYPE_AND_GROUP
         FROM
-            CHECK_REAL_VEHICLE_VER t1
+            NERDS.CHECK_REAL_VEHICLE_VER t1
         LEFT JOIN CHECK_MODEL_SERIES_LIST t2
         ON t2.ID = t1.VEHICLE_SERIES_ID
         WHERE