Update: 修改核查整体流程

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

@@ -3,6 +3,7 @@ package com.adc.da.system.controller;
 import com.adc.da.dto.reqDTO.EnvBase64PictureRecognitionReqDTO;
 import com.adc.da.system.entity.CheckCertificateInfoDetail;
 import com.adc.da.system.service.ICheckCertificateInfoDetailService;
+import com.adc.da.system.service.ICheckDataCheckResultService;
 import com.adc.da.util.FileUtil;
 import com.adc.da.base.web.BaseController;
 import com.adc.da.util.http.ResponseMessage;
@@ -37,8 +38,8 @@ public class CheckCertificateInfoDetailController extends BaseController {
     @Autowired
     ICheckCertificateInfoDetailService detailService;
 
-//    @Autowired
-//    private ICheckDataCheckResultService iCheckDataCheckResultService;
+    @Autowired
+    private ICheckDataCheckResultService iCheckDataCheckResultService;
 
 //    @Autowired
 //    private ICheckOperationLogService iCheckOperationLogService;
@@ -92,18 +93,18 @@ public class CheckCertificateInfoDetailController extends BaseController {
      * @return
      * @throws Exception
      */
-//    @ApiOperation(value = "|CheckCertificateInfoDetail|图片识别数据查询")
-//    @GetMapping("/selectDetail")
-//    public ResponseMessage selectDetail(String certificateType, String infoId) throws Exception {
-//        if (StringUtils.isBlank(certificateType)) {
-//            Result.success("200", "查询成功", new CheckCertificateInfoDetail());
-//        }
-//        CheckCertificateInfoDetail detail = detailService.selectOne(certificateType, infoId);
-//        if (detail != null) {
-//            detail.setCheckResult(iCheckDataCheckResultService.selectByIdAndType(infoId, certificateType));
-//        }
-//        return Result.success("200", "查询成功", detail);
-//    }
+    @ApiOperation(value = "|CheckCertificateInfoDetail|图片识别数据查询")
+    @GetMapping("/selectDetail")
+    public ResponseMessage selectDetail(String certificateType, String infoId) throws Exception {
+        if (StringUtils.isBlank(certificateType)) {
+            Result.success("200", "查询成功", new CheckCertificateInfoDetail());
+        }
+        CheckCertificateInfoDetail detail = detailService.selectOne(certificateType, infoId);
+        if (detail != null) {
+            detail.setCheckResult(iCheckDataCheckResultService.selectByIdAndType(infoId, certificateType));
+        }
+        return Result.success("200", "查询成功", detail);
+    }
 
     /**
      * 功能描述: 修改参数

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

@@ -9,6 +9,7 @@ import com.adc.da.base.web.BaseController;
 import com.adc.da.util.http.ResponseMessage;
 import com.adc.da.util.http.Result;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.transaction.Transactional;
 
 /**
  * <p>
@@ -73,7 +75,7 @@ public class CheckCertificateMainInfoController extends BaseController {
     public ResponseMessage addCertificate(CheckCertificateMainInfo certificate) {
         int rows = certificateService.add(certificate);
         if (rows == 1) {
-            return Result.success("200", "复制成功");
+            return Result.success("200", "复制成功",true);
         } else {
             return Result.error("0", "复制失败");
         }
@@ -178,25 +180,25 @@ public class CheckCertificateMainInfoController extends BaseController {
      * @auther: 韩飞
      * @date: 2019/9/27
      */
-//    @ApiOperation(value = "|CheckCertificateMainInfo|修改备注")
-//    @GetMapping("/updateRemark")
-//    @Transactional
-//    public ResponseMessage updateRemark(String id, String remark) {
-//        if (StringUtils.isEmpty(id)) {
-//            return Result.error("参数缺失");
-//        }
-//        if (StringUtils.isEmpty(remark)) {
-//            return Result.error("参数缺失");
-//        }
-//        UpdateWrapper wrapper = new UpdateWrapper();
-//        wrapper.set("REMARK", remark);
-//        wrapper.eq("ID", id);
-//        boolean flag = certificateService.update(wrapper);
-//        if (flag) {
+    @ApiOperation(value = "|CheckCertificateMainInfo|修改备注")
+    @GetMapping("/updateRemark")
+    @Transactional
+    public ResponseMessage updateRemark(String id, String remark) {
+        if (StringUtils.isEmpty(id)) {
+            return Result.error("参数缺失");
+        }
+        if (StringUtils.isEmpty(remark)) {
+            return Result.error("参数缺失");
+        }
+        UpdateWrapper wrapper = new UpdateWrapper();
+        wrapper.set("REMARK", remark);
+        wrapper.eq("ID", id);
+        boolean flag = certificateService.update(wrapper);
+        if (flag) {
 //            iCheckOperationLogService.operationLog(request.getHeader("userId"),"修改随车文件备注");
-//            return Result.success("200", "操作成功","true");
-//        } else {
-//            return Result.error("操作失败");
-//        }
-//    }
+            return Result.success("200", "操作成功","true");
+        } else {
+            return Result.error("操作失败");
+        }
+    }
 }

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

+package com.adc.da.system.controller;
+
+
+import com.adc.da.base.web.BaseController;
+import com.adc.da.dto.resDTO.DownCheckFalseDTO;
+import com.adc.da.excel.poi.excel.ExcelExportUtil;
+import com.adc.da.excel.poi.excel.entity.ExportParams;
+import com.adc.da.excel.poi.excel.entity.enums.ExcelType;
+import com.adc.da.system.service.ICheckDataCheckResultService;
+import com.adc.da.util.ReadExcel;
+import com.adc.da.util.exception.AdcDaBaseException;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import com.adc.da.util.utils.DateUtils;
+import com.adc.da.util.utils.IOUtils;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@RestController
+@RequestMapping("/${restPath}/check-data-check-result")
+public class CheckDataCheckResultController extends BaseController {
+
+
+    @Autowired
+    private ICheckDataCheckResultService iCheckDataCheckResultService;
+
+
+    /**
+     * 根据证书核查ID和证书类型获取核查结果
+     * @param id
+     * @param type
+     * @return
+     */
+    @ApiOperation(value = "|CheckDataCheckResult|根据证书核查ID和证书类型获取核查结果")
+    @GetMapping("/selectByIdAndType")
+    public ResponseMessage selectByIdAndType(String id, String type) {
+        return Result.success(iCheckDataCheckResultService.selectByIdAndType(id, type));
+    }
+    /**
+     * 对比详情导出
+     * @param id
+     * @param type
+     * @return
+     */
+    @ApiOperation(value = "|CheckDataCheckResult|导出对比详情")
+    @GetMapping("/exportCheckResult")
+    public void exportCheckResult(HttpServletResponse response, HttpServletRequest request, String id, String type) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(type)) {
+            throw new AdcDaBaseException("导出随车文件对比详情时参数缺失");
+        }
+        iCheckDataCheckResultService.exportCheckResult(response,request,id,type);
+    }
+    /**
+     * 分页查询随车文件一致性对比不一致数据
+     * @return
+     */
+    @ApiOperation(value = "|CheckDataCheckResult|分页查询随车文件一致性对比不一致数据")
+    @GetMapping("/getCheckFalsePage")
+    public ResponseMessage getCheckFalsePage(int page,int limit,String address,String project,String isHandel,
+                                             String carGroup,String editionCode,String paramName) {
+        return Result.success("200","查询成功", iCheckDataCheckResultService.getListInfo(page,limit,address,project,isHandel
+                ,carGroup,editionCode,paramName));
+    }
+
+    /**
+     * 处理随车文件一致性对比不一致数据
+     * @return
+     */
+    @ApiOperation(value = "|CheckDataCheckResult|处理随车文件一致性对比不一致数据")
+    @GetMapping("/updateCheckFalse")
+    public ResponseMessage updateCheckFalse(String id) {
+        if (StringUtils.isBlank(id)) {
+            return Result.error("操作失败");
+        }
+        if (iCheckDataCheckResultService.updateCheckFalse(id)) {
+            return Result.success("200","操作成功","");
+        }
+        return Result.error("操作失败");
+    }
+    /**
+     * 导出随车文件一致性对比不一致数据
+     * @return
+     */
+    @ApiOperation(value = "|CheckDataCheckResult|导出随车文件一致性对比不一致数据")
+    @GetMapping("/downCheckFalse")
+    public void downCheckFalse(String address,String project,String isHandel, HttpServletResponse response, HttpServletRequest request,
+                               String carGroup,String editionCode,String paramName) {
+
+        OutputStream os = null;
+        Workbook workbook = null;
+        try {
+            response.setHeader("Content-Disposition",
+                    "attachment; filename=" + ReadExcel.encodeFileName( "随车文件待处理问题.xlsx", request));
+            response.setContentType("application/force-download");
+            ExportParams exportParams = new ExportParams();
+            exportParams.setType(ExcelType.XSSF);
+
+            List<DownCheckFalseDTO> datas =  iCheckDataCheckResultService.downCheckFalse(address,project,isHandel,
+                    carGroup,editionCode,paramName);
+            for (DownCheckFalseDTO downCheckFalseDTO : datas) {
+                downCheckFalseDTO.setCheckTimeStr(DateUtils.dateToString(downCheckFalseDTO.getCheckTime(),"yyyy-MM-dd HH:mm:ss"));
+                downCheckFalseDTO.setCheckResult(downCheckFalseDTO.getCheckResult().equals("2")?"处理完成":"不一致");
+            }
+            workbook = ExcelExportUtil.exportExcel(exportParams, DownCheckFalseDTO.class, datas);
+            os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+        } catch (Exception e) {
+            throw new AdcDaBaseException("下载文件失败，请重试");
+        } finally {
+            IOUtils.closeQuietly(os);
+        }
+    }
+}

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

+package com.adc.da.system.controller;
+
+
+import com.adc.da.base.web.BaseController;
+import com.adc.da.system.entity.CheckDetailObd;
+import com.adc.da.system.service.ICheckDetailObdService;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * OBD与OBD_DETAILS关联表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-04-08
+ */
+@RestController
+@RequestMapping("/${restPath}/check-detail-obd")
+public class CheckDetailObdController extends BaseController<CheckDetailObd> {
+
+    @Autowired
+    private ICheckDetailObdService iCheckDetailObdService;
+
+    @ApiOperation(value = "保存认证核查参数")
+    @PostMapping("/saveRealCheckParameter")
+    public ResponseMessage saveRealCheckParameter(@RequestBody CheckDetailObd checkDetailObd) {
+        List<String> codeList = new ArrayList<>();
+        if (checkDetailObd != null && StringUtils.isBlank(checkDetailObd.getDetailId())) {
+            checkDetailObd.setDetailId("");
+        }
+        if (checkDetailObd != null  && StringUtils.isNotBlank(checkDetailObd.getObdId())) {
+            codeList = Arrays.asList(checkDetailObd.getDetailId().split(","));
+        }
+        iCheckDetailObdService.saveRealCheckParameter(codeList,checkDetailObd.getObdId());
+        return Result.success();
+    }
+    @ApiOperation(value = "保存法规核查项关系")
+    @GetMapping("/saveStandCheckParameter")
+    public ResponseMessage saveStandCheckParameter(String mouldId,String detailId,String status) {
+
+        if(StringUtils.isBlank(mouldId)||StringUtils.isBlank(detailId)||StringUtils.isBlank(status)){
+            return Result.error();
+        }
+        return Result.success("200","保存成功",iCheckDetailObdService.saveStandCheckParameter(mouldId,detailId,status));
+
+    }
+}

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

@@ -25,6 +25,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -457,40 +458,41 @@ public class CheckModelSeriesListController {
      * @param checkModelSeriesList
      * @return
      */
-//    @ApiOperation(value = "|addCheckModelSeriesList|新增车型系列表数据")
-//    @PostMapping(value = "/addCheckModelSeriesList")
-//    public ResponseMessage addCheckModelSeriesList(@RequestBody CheckModelSeriesList checkModelSeriesList) {
-//        List<String> baseIdList = Arrays.asList(checkModelSeriesList.getBase().split(","));
-//        List<String> list2 = baseIdList.stream().distinct().collect(Collectors.toList());
-//        if (list2.size() > 1) {
-//            return Result.error("-1", "请选择同一生产地址车型创建车型系列");
-//        }
-//        QueryWrapper queryWrapper = new QueryWrapper();
-//        queryWrapper.eq("VEHICLE_SERIES", checkModelSeriesList.getVehicleSeries());
-//        queryWrapper.eq("BASE", checkModelSeriesList.getBase());
-//        queryWrapper.eq("EDITION_CODE","1");
-//        if (checkModelSeriesListService.getOne(queryWrapper) != null) {
-//            return Result.error("-2", "车型系列名称已存在");
+    @ApiOperation(value = "|addCheckModelSeriesList|新增车型系列表数据")
+    @PostMapping(value = "/addCheckModelSeriesList")
+    public ResponseMessage addCheckModelSeriesList(@RequestBody CheckModelSeriesList checkModelSeriesList) {
+        checkModelSeriesList.setBase(UserUtil.getQyId());
+        List<String> baseIdList = Arrays.asList(checkModelSeriesList.getBase().split(","));
+        List<String> list2 = baseIdList.stream().distinct().collect(Collectors.toList());
+        if (list2.size() > 1) {
+            return Result.error("-1", "请选择同一生产地址车型创建车型系列");
+        }
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("VEHICLE_SERIES", checkModelSeriesList.getVehicleSeries());
+        queryWrapper.eq("BASE", checkModelSeriesList.getBase());
+        queryWrapper.eq("EDITION_CODE","1");
+        if (checkModelSeriesListService.getOne(queryWrapper) != null) {
+            return Result.error("-2", "车型系列名称已存在");
+        }
+//        QueryWrapper queryWrapper1 = new QueryWrapper();
+//        queryWrapper1.eq("VEHICLE_TYPE_AND_GROUP", checkModelSeriesList.getVehicleTypeAndGroup());
+//        queryWrapper1.eq("BASE", list2.get(0));
+//        queryWrapper1.eq("EDITION_CODE", checkModelSeriesList.getEditionCode());
+//        if (checkModelSeriesListService.getOne(queryWrapper1) != null) {
+//            return Result.error("-1", "所选车型已创建/Vehicle type series  has been created for the selected vehicle type");
 //        }
-////        QueryWrapper queryWrapper1 = new QueryWrapper();
-////        queryWrapper1.eq("VEHICLE_TYPE_AND_GROUP", checkModelSeriesList.getVehicleTypeAndGroup());
-////        queryWrapper1.eq("BASE", list2.get(0));
-////        queryWrapper1.eq("EDITION_CODE", checkModelSeriesList.getEditionCode());
-////        if (checkModelSeriesListService.getOne(queryWrapper1) != null) {
-////            return Result.error("-1", "所选车型已创建/Vehicle type series  has been created for the selected vehicle type");
-////        }
-//        checkModelSeriesList.setRealVehicleIsCheck(0);
-//        checkModelSeriesList.setType(0);
-//        checkModelSeriesList.setBase(list2.get(0));
-//        boolean flag = checkModelSeriesListService.addCheckModelSeriesList(checkModelSeriesList);
+        checkModelSeriesList.setRealVehicleIsCheck(0);
+        checkModelSeriesList.setType(0);
+        checkModelSeriesList.setBase(list2.get(0));
+        checkModelSeriesListService.addCheckModelSeriesList(checkModelSeriesList);
 //        if (flag) {
 //            iCheckOperationLogService.operationLog(
 //                    request.getHeader("userId"),
 //                    "新增车型系列表数据");
 //            return Result.success("200", "操作成功", null);
 //        }
-//        return Result.error("-1", "操作失败");
-//    }
+        return Result.success("200", "操作成功", null);
+    }
 
     /**
      * 新增车型系列表数据
@@ -861,13 +863,13 @@ public class CheckModelSeriesListController {
      * 根据id删除车型系列
      */
     @ApiOperation(value = "根据id删除车型系列")
-    @GetMapping(value = "/deleteModelById")
+    @DeleteMapping(value = "/deleteModelById")
     public ResponseMessage deleteModelById(String ids) {
-        if (StringUtils.isNotEmpty(ids)) {
+        if (StringUtils.isEmpty(ids)) {
             return Result.error("-1","参数缺失");
         }
         List<String> list = Arrays.asList(ids.split(","));
         checkModelSeriesListService.removeByIds(list);
-        return Result.success("200", "操作成功");
+        return Result.success("200", "操作成功",true);
     }
 }

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

@@ -91,6 +91,7 @@ public class CheckObdController extends BaseController {
     @PostMapping("/insertObd")
     public ResponseMessage insertObd(@RequestBody CheckObd checkObd){
         checkObd.setBase(UserUtil.getQyId());
+        checkObd.setDistributionBase(UserUtil.getQyId());
         return Result.success("200","添加成功",checkObdService.insertObd(checkObd));
     }
 

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

+package com.adc.da.system.controller;
+
+
+import com.adc.da.system.entity.VehicleList;
+import com.adc.da.system.service.ICheckEnterpriseDataService;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 车型列表
+ */
+@RestController
+@Api(value = "车型列表")
+@RequestMapping("/${restPath}/vehicleList")
+public class VehicleListController {
+
+    /**
+     * checkEnterpriseDataService
+     */
+    @Autowired
+    private ICheckEnterpriseDataService checkEnterpriseDataService;
+
+    /**
+     * 车型列表分页查询
+     * @param vehicleList
+     * @return
+     */
+    @ApiOperation(value = "|queryVehicleListByPage|车型列表分页查询")
+    @GetMapping(value = "/queryVehicleListByPage")
+    public ResponseMessage queryVehcleListByPage(VehicleList vehicleList) {
+        Page page = new Page(vehicleList.getPage(),vehicleList.getPageSize());
+        if ( StringUtils.isNotEmpty(vehicleList.getVehicleModel())) {
+            vehicleList.setVehicleModel(vehicleList.getVehicleModel().toUpperCase());
+        }
+        if ( StringUtils.isNotEmpty(vehicleList.getProductNo())) {
+            vehicleList.setProductNo(vehicleList.getProductNo().toUpperCase());
+        }
+        IPage<VehicleList> checkVehicleListIPage = checkEnterpriseDataService.queryVehicleListByPage(page, vehicleList);
+        return Result.success("200", "车型列表分页查询", checkVehicleListIPage);
+    }
+
+}

adcbs-check/src/main/java/com/adc/da/system/dao/CheckCertificateInfoDetailDao.java

@@ -4,6 +4,7 @@ package com.adc.da.system.dao;
 import com.adc.da.system.entity.CdVehicles;
 import com.adc.da.system.entity.CheckCertificateInfoDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,7 +13,7 @@ import java.util.List;
  */
 public interface CheckCertificateInfoDetailDao extends BaseMapper<CheckCertificateInfoDetail> {
 
-    List<CdVehicles> getClcpZk(String carTypeCode,String group);
+    List<CdVehicles> getClcpZk(@Param("carTypeCode") String carTypeCode,@Param("group") String group);
 
 }
 

adcbs-check/src/main/java/com/adc/da/system/dao/CheckCertificateMainInfoDao.java

@@ -4,13 +4,16 @@ package com.adc.da.system.dao;
 import com.adc.da.dto.reqDTO.CertificateReqDTO;
 import com.adc.da.dto.resDTO.CertificateResDTO;
 import com.adc.da.system.entity.CheckCertificateMainInfo;
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * mapper
  */
+@SqlParser(filter = true)
 public interface CheckCertificateMainInfoDao extends BaseMapper<CheckCertificateMainInfo> {
 
     /**

adcbs-check/src/main/java/com/adc/da/system/dao/CheckDataCheckResultMapper.java

@@ -2,6 +2,7 @@ package com.adc.da.system.dao;
 
 import com.adc.da.dto.resDTO.DownCheckFalseDTO;
 import com.adc.da.system.entity.CheckDataCheckResult;
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +18,7 @@ import java.util.List;
  * @author jobob
  * @since 2019-10-17
  */
+@SqlParser(filter = true)
 public interface CheckDataCheckResultMapper extends BaseMapper<CheckDataCheckResult> {
     /**
      *

adcbs-check/src/main/java/com/adc/da/system/dao/CheckEnterpriseDataDao.java

+package com.adc.da.system.dao;
+
+
+import com.adc.da.dto.resDTO.CheckEnterpriseDTO;
+
+import com.adc.da.system.entity.CheckEnterpriseData;
+import com.adc.da.system.entity.VehicleList;
+import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * mapper
+ */
+@SqlParser(filter = true)
+public interface CheckEnterpriseDataDao extends BaseMapper<CheckEnterpriseData> {
+
+    /**
+     * 企业数据分页查询
+     * @param page
+     * @param checkEnterpriseData
+     * @return
+     */
+    IPage<CheckEnterpriseData> queryCheckEnterpriseDataByPage(@Param("page") Page page,
+                                                              @Param("checkEnterpriseData") CheckEnterpriseData checkEnterpriseData,
+                                                              @Param("baseIdList") List<String> baseIdList);
+
+    /**
+     * 车型列表分页查询
+     * @param page
+     * @param vehicleList
+     * @return
+     */
+    IPage<VehicleList> queryVehicleListByPage(
+            @Param("page") Page page,
+            @Param("vehicleList") VehicleList vehicleList,
+            @Param("baseIdList") List<String> baseIdList);
+
+    IPage<CheckEnterpriseData>queryInfoByCheckstatus(@Param("page")Page page);
+
+    IPage<CheckEnterpriseData> queryEnterpriseDataPage(@Param("page")Page page,@Param("checkEnterpriseData") CheckEnterpriseData checkEnterpriseData);
+
+    List<CheckEnterpriseDTO> queryEnterpriseData(@Param("vehicleType") String vehicleType, @Param("entryName") String entryName,
+                                                 @Param("checkStatus") String checkStatus, @Param("auditNumber") String auditNumber, @Param("versionNumber") String versionNumber);
+
+
+}

adcbs-check/src/main/java/com/adc/da/system/dao/CheckModelSeriesListDao.java

@@ -2,6 +2,7 @@ package com.adc.da.system.dao;
 
 
 import com.adc.da.system.entity.CheckModelSeriesList;
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,6 +13,7 @@ import java.util.List;
 /**
  * mapper
  */
+@SqlParser(filter = true)
 public interface CheckModelSeriesListDao extends BaseMapper<CheckModelSeriesList> {
 
     /**

adcbs-check/src/main/java/com/adc/da/system/dao/CheckObdMapper.java

@@ -2,7 +2,9 @@ package com.adc.da.system.dao;
 
 
 import com.adc.da.system.entity.CheckObd;
+import com.adc.da.system.entity.DataDetail;
 import com.adc.da.system.entity.TsOrg;
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,6 +20,7 @@ import java.util.List;
  * @author jobob
  * @since 2021-03-30
  */
+@SqlParser(filter = true)
 public interface CheckObdMapper extends BaseMapper<CheckObd> {
 
     /**
@@ -49,4 +52,8 @@ public interface CheckObdMapper extends BaseMapper<CheckObd> {
 
     int selectCountByBaseAndName(@Param("baseIds") List<String> baseIds, @Param("mouldName") String mouldName
             , @Param("id") String id,@Param("mouldType") String mouldType);
+
+    String getClcpZkId (@Param("cpxh") String cpxh,@Param("pc") String pc);
+
+    DataDetail getdataZrin (@Param("id") String id, @Param("cname") String cname);
 }

adcbs-check/src/main/java/com/adc/da/system/dao/CheckRealVehicleVerificationDao.java

@@ -8,13 +8,14 @@ import com.adc.da.dto.reqDTO.ScanCodeDTO;
 import com.adc.da.dto.resDTO.CheckRealVehicleVerificationDTO;
 import com.adc.da.system.entity.CheckRealVehicleVerAndMoedelSeriesList;
 import com.adc.da.system.entity.CheckRealVehicleVerification;
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+@SqlParser(filter = true)
 public interface CheckRealVehicleVerificationDao extends BaseMapper<CheckRealVehicleVerification> {
     /**
      * 根据车系ID查询CheckRealVehicleVerificationDTO

adcbs-check/src/main/java/com/adc/da/system/dao/CheckVehicleCheckMenuDao.java

@@ -2,12 +2,13 @@ package com.adc.da.system.dao;
 
 
 import com.adc.da.system.entity.CheckVehicleCheckMenu;
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+@SqlParser(filter = true)
 public interface CheckVehicleCheckMenuDao extends BaseMapper<CheckVehicleCheckMenu> {
 
     /**

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

@@ -32,22 +32,6 @@ public class CdVehicles extends BaseEntity {
     @TableField(exist = false)
     private String bacspc;
 
-    public String getBacspc() {
-        return bacspc;
-    }
-
-    public void setBacspc(String bacspc) {
-        this.bacspc = bacspc;
-    }
-
-    public String getBaseName() {
-        return baseName;
-    }
-
-    public void setBaseName(String baseName) {
-        this.baseName = baseName;
-    }
-
     @TableField("LEGAL")
     private String legal;
 
@@ -322,30 +306,6 @@ public class CdVehicles extends BaseEntity {
     @TableField("CD_TYPE")
     private String cdType;
 
-    public String getCdType() {
-        return cdType;
-    }
-
-    public void setCdType(String cdType) {
-        this.cdType = cdType;
-    }
-
-    public String getParameterValue() {
-        return parameterValue;
-    }
-
-    public void setParameterValue(String parameterValue) {
-        this.parameterValue = parameterValue;
-    }
-
-    public String getParameterName() {
-        return parameterName;
-    }
-
-    public void setParameterName(String parameterName) {
-        this.parameterName = parameterName;
-    }
-
     /**
      * 货厢栏板内尺寸（长×宽×高）宽（mm）
      */
@@ -414,6 +374,21 @@ public class CdVehicles extends BaseEntity {
     @TableField(exist = false)
     private String xzzp3 ;//选装部件3
 
+    /**
+     * 参数值
+     */
+    private transient String parameterValue;
+
+    /**
+     *  事业部名称集合
+     */
+    private transient String baseName;
+
+    /**
+     * 参数名称
+     */
+    private transient String parameterName;
+
     public String getDlChang() {
         return dlChang;
     }
@@ -574,22 +549,6 @@ public class CdVehicles extends BaseEntity {
         this.xzzp3 = xzzp3;
     }
 
-    /**
-     * 参数值
-     */
-    private transient String parameterValue;
-
-    /**
-     *  事业部名称集合
-     */
-    private transient String baseName;
-
-    /**
-     * 参数名称
-     */
-    private transient String parameterName;
-
-
     public String getId() {
         return id;
     }
@@ -1115,4 +1074,43 @@ public class CdVehicles extends BaseEntity {
     public void setDpid4(String dpid4) {
         this.dpid4 = dpid4;
     }
+    public String getBacspc() {
+        return bacspc;
+    }
+
+    public void setBacspc(String bacspc) {
+        this.bacspc = bacspc;
+    }
+
+    public String getBaseName() {
+        return baseName;
+    }
+
+    public void setBaseName(String baseName) {
+        this.baseName = baseName;
+    }
+
+    public String getCdType() {
+        return cdType;
+    }
+
+    public void setCdType(String cdType) {
+        this.cdType = cdType;
+    }
+
+    public String getParameterValue() {
+        return parameterValue;
+    }
+
+    public void setParameterValue(String parameterValue) {
+        this.parameterValue = parameterValue;
+    }
+
+    public String getParameterName() {
+        return parameterName;
+    }
+
+    public void setParameterName(String parameterName) {
+        this.parameterName = parameterName;
+    }
 }

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

+package com.adc.da.system.entity;
+
+import com.adc.da.base.BaseReqPageEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 企业数据实体
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("CHECK_ENTERPRISE_DATA")
+public class CheckEnterpriseData extends BaseReqPageEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 企业数据主键
+     */
+    @TableId("ID")
+    private String id;
+
+    /**
+     * 车辆型号
+     */
+    @TableField("CCC_ID")
+    private String cccId;
+
+    /**
+     * 车辆型号
+     */
+    @TableField("VEHICLE_TYPE")
+    private String vehicleType;
+
+    /**
+     * 版本号
+     */
+    @TableField("VERSION_NUMBER")
+    private String versionNumber;
+
+    /**
+     * 操作人
+     */
+    @TableField("FOUNDER")
+    private String founder;
+
+    /**
+     * 操作时间
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    /**
+     * 备注
+     */
+    @TableField("REMARKS")
+    private String remarks;
+
+    /**
+     * 是否创建过车型系列：0为创建，1已创建
+     */
+    @TableField("TYPE")
+    private int type;
+
+    /**
+     * 事业部Id
+     */
+    @TableField("BASE_ID")
+    private String baseId;
+
+    @TableField("CHECK_STATUS")
+    private String checkStatus;
+
+    @TableField("CHECK_USER")
+    private String checkUser;
+
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @TableField("CHECK_TIME")
+    private Date checkTime;
+
+    @TableField("AUDIT_STATUS")
+    private String auditStatus;
+    @TableField("COC_OR_CQC")
+    private String cocOrCqc;
+    private transient String checkUserName;
+
+    /**
+     * 项目名称
+     */
+    @TableField(exist = false)
+    private String entryName;
+
+    /**
+     * 项目参数
+     */
+    @TableField(exist = false)
+    private String entryParameter;
+
+    /**
+     * 核查状态
+     */
+    @TableField(exist = false)
+    private String checkResult;
+
+    /**
+     * 审核版本号
+     */
+    @TableField("AUDIT_NUMBER")
+    private String auditNumber;
+
+    @TableField("JUDGMENT")
+    private String judgment;
+//    @TableField("CHECK_IMAGE_ONE")
+    private transient String checkImageOne;
+
+//    @TableField("CHECK_IMAGE_TWO")
+    private transient String checkImageTwo;
+}

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

+package com.adc.da.system.entity;
+
+import com.adc.da.base.BaseReqPageEntity;
+import lombok.Data;
+
+@Data
+public class DataDetail extends BaseReqPageEntity {
+    /**
+     * 配置参数
+     */
+    private String itemVlaue;
+    /**
+     * 车辆型号
+     */
+    private String cpxh;
+}

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

+package com.adc.da.system.entity;
+
+import com.adc.da.base.BaseReqPageEntity;
+import lombok.Data;
+
+@Data
+public class VehicleList extends BaseReqPageEntity {
+    private String id;
+    /**
+     * 车辆型号
+     */
+    private String vehicleModel;
+
+    /**
+     * 产品号
+     */
+    private String productNo;
+
+    /**
+     * 产品名称
+     */
+    private String vehicleName;
+
+    /**
+     * 公告批次
+     */
+    private String vehicleGroup;
+
+    /**
+     * 是否创建过车型系列：0为创建，1已创建
+     */
+    private int type;
+
+    /**
+     * CCC系统编号
+     */
+    private String cccSystemNumber;
+
+    /**
+     * 环保公开编号
+     */
+    private String envPublicNumber;
+
+    /**
+     * 版本
+     */
+    private String editionCode;
+
+    private String baseId;
+
+    private String producingAddress;
+
+}

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

+package com.adc.da.system.service;
+
+
+import com.adc.da.dto.resDTO.CheckEnterpriseDTO;
+import com.adc.da.system.entity.CheckEnterpriseData;
+import com.adc.da.system.entity.VehicleList;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ICheckEnterpriseDataService extends IService<CheckEnterpriseData> {
+
+    /**
+     * 企业数据分页查询
+     * @param page
+     * @param checkEnterpriseData
+     * @return
+     */
+    IPage<CheckEnterpriseData> queryCheckEnterpriseDataByPage(Page page, CheckEnterpriseData checkEnterpriseData);
+
+    /**
+     * 车型列表分页查询
+     * @param page
+     * @param vehicleList
+     * @return
+     */
+    IPage<VehicleList> queryVehicleListByPage(Page page, VehicleList vehicleList);
+
+    /**
+     * 企业数据导入
+     * @return
+     */
+    Map<String, Object> importCheckEnterpriseData(MultipartFile file, String founder);
+
+    String getCCAPDataByCode(String certificateCode);
+
+    IPage<CheckEnterpriseData>queryInfoByCheckstatus(@Param("page")Page page);
+
+    IPage<CheckEnterpriseData> queryEnterpriseDataPage(Page page,CheckEnterpriseData checkEnterpriseData);
+
+    List<CheckEnterpriseDTO> queryEnterpriseData(String vehicleType, String entryName, String checkStatus, String auditNumber, String versionNumber);
+
+//    Integer updateEnterpriseData (CheckEnterpriseData checkEnterpriseData);
+
+}

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

@@ -68,7 +68,7 @@ public interface ICheckModelSeriesListService extends IService<CheckModelSeriesL
      * @param checkModelSeriesList
      * @return
      */
-//    Boolean addCheckModelSeriesList(CheckModelSeriesList checkModelSeriesList);
+    Boolean addCheckModelSeriesList(CheckModelSeriesList checkModelSeriesList);
 
     /**
      * 首页统计

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

@@ -3754,8 +3754,12 @@ public class CheckCertificateMainInfoServiceImpl
     }
     @SneakyThrows
     @Scheduled(cron = "0 0 2 * * ?")
+//    @Scheduled(cron = "0/5 * * * * ?")
     public void insertCertificateMainInfo() {
         String vehicleGroup = this.baseMapper.getMaxVehicleGroup();
+        if(StringUtils.isEmpty(vehicleGroup)){
+            vehicleGroup = "339";
+        }
 
         if(StringUtils.isNotEmpty(vehicleGroup)){
             List<CheckCertificateMainInfo> clcpZk = this.baseMapper.getClcpZk(vehicleGroup);

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

@@ -5,6 +5,7 @@ import com.adc.da.dto.reqDTO.CheckRealVehicleVerificationDto;
 import com.adc.da.dto.resDTO.ModelServiceItemDTO;
 import com.adc.da.system.dao.CheckModelSeriesListDao;
 import com.adc.da.system.dao.CheckModelSeriesListResultMapper;
+import com.adc.da.system.entity.CheckEnterpriseData;
 import com.adc.da.system.entity.CheckModelSeriesList;
 import com.adc.da.system.entity.CheckRealVehicleVerification;
 import com.adc.da.system.entity.CheckVehicleAndSeries;
@@ -552,11 +553,11 @@ public class CheckModelSeriesListServiceImpl extends ServiceImpl<CheckModelSerie
         return checkModelSeriesListDao.queryCheckedModelSeriesListByPage(page, checkModelSeriesList);
     }
 
-//    @Override
-//    public Boolean addCheckModelSeriesList(CheckModelSeriesList checkModelSeriesList) {
-//        String id = UUIDUtils.getUUID();
-//        checkModelSeriesList.setId(id);
-//        checkModelSeriesList.setCreationTime(new Date());
+    @Override
+    public Boolean addCheckModelSeriesList(CheckModelSeriesList checkModelSeriesList) {
+        String id = UUIDUtils.getUUID();
+        checkModelSeriesList.setId(id);
+        checkModelSeriesList.setCreationTime(new Date());
 //        DetailInfo detailInfo = detailInfoMapper.getByVehilceType(Arrays.asList(checkModelSeriesList.getVehicleType().split(",")));
 //        if (detailInfo != null) {
 //            checkModelSeriesList.setCccNumber(detailInfo.getItemId());
@@ -565,15 +566,15 @@ public class CheckModelSeriesListServiceImpl extends ServiceImpl<CheckModelSerie
 //        if (envDataEntity != null) {
 //            checkModelSeriesList.setEnvNumber(envDataEntity.getInfoDisclosureNo());
 //        }
-//        if (this.save(checkModelSeriesList)) {
-//            List<CheckVehicleAndSeries> checkVehicleAndSeriesList = new ArrayList<>();
-//            for (String vehicleId : checkModelSeriesList.getVehicleId()) {
-//                CheckVehicleAndSeries checkVehicleAndSeries = new CheckVehicleAndSeries();
-//                checkVehicleAndSeries.setId(UUIDUtils.getUUID());
-//                checkVehicleAndSeries.setVehicleSeriesId(id);
-//                checkVehicleAndSeries.setVehicleId(vehicleId);
-//                checkVehicleAndSeriesList.add(checkVehicleAndSeries);
-//            }
+        if (this.save(checkModelSeriesList)) {
+            List<CheckVehicleAndSeries> checkVehicleAndSeriesList = new ArrayList<>();
+            for (String vehicleId : checkModelSeriesList.getVehicleId()) {
+                CheckVehicleAndSeries checkVehicleAndSeries = new CheckVehicleAndSeries();
+                checkVehicleAndSeries.setId(UUIDUtils.getUUID());
+                checkVehicleAndSeries.setVehicleSeriesId(id);
+                checkVehicleAndSeries.setVehicleId(vehicleId);
+                checkVehicleAndSeriesList.add(checkVehicleAndSeries);
+            }
 //            if (checkVehicleAndSeriesService.saveBatch(checkVehicleAndSeriesList)) {
 //                List<CheckEnterpriseData> checkEnterpriseData = new ArrayList<>();
 //                List<CheckConsistencyCheck> list = new ArrayList<>();
@@ -589,11 +590,12 @@ public class CheckModelSeriesListServiceImpl extends ServiceImpl<CheckModelSerie
 //                }
 //                checkEnterpriseDataService.updateBatchById(checkEnterpriseData);
 //                checkConsistencyCheckService.updateBatchById(list);
-//                return true;
 //            }
-//        }
-//        return false;
-//    }
+            checkVehicleAndSeriesService.saveBatch(checkVehicleAndSeriesList);
+            return true;
+        }
+        return false;
+    }
 
     @Override
     public Map<String,Integer> stat(CheckModelSeriesList checkModelSeriesList) {

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

@@ -6,6 +6,7 @@ import com.adc.da.system.entity.CheckDetailObd;
 import com.adc.da.system.entity.CheckObd;
 import com.adc.da.system.entity.CheckObdOrg;
 import com.adc.da.system.entity.TsOrg;
+import com.adc.da.system.service.ICheckDetailObdService;
 import com.adc.da.system.service.ICheckObdOrgService;
 import com.adc.da.system.service.ICheckObdService;
 import com.adc.da.util.UUIDUtils;
@@ -42,8 +43,8 @@ public class CheckObdServiceImpl extends ServiceImpl<CheckObdMapper, CheckObd> i
     private HttpServletRequest request;
     @Autowired
     private ICheckObdOrgService obdOrgService;
-//    @Autowired
-//    private ICheckDetailObdService detailObdService;
+    @Autowired
+    private ICheckDetailObdService detailObdService;
     @Autowired
     private ICheckObdOrgService iCheckObdOrgService;
 
@@ -166,7 +167,7 @@ public class CheckObdServiceImpl extends ServiceImpl<CheckObdMapper, CheckObd> i
                 checkDetailObd.setDetailId(s);
                 list.add(checkDetailObd);
             }
-//            detailObdService.insertDetailObd(list);
+            detailObdService.insertDetailObd(list);
         }
         if(StringUtils.isNotBlank(checkObd.getDistributionBase())) {
             List<String> distributionBaseList = Arrays.asList(checkObd.getDistributionBase().split(","));
@@ -229,7 +230,7 @@ public class CheckObdServiceImpl extends ServiceImpl<CheckObdMapper, CheckObd> i
      */
     @Override
     public Integer deleteObd(String id) {
-        checkObdMapper.deleteDetailObd(id);
+//        checkObdMapper.deleteDetailObd(id);
         List<String> idList = Arrays.asList(id.split(","));
         for (String s : idList) {
                 checkObdMapper.deleteObdOrg(s);

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

@@ -71,6 +71,7 @@ public class CheckVehicleCheckMenuServiceImpl
                 checkMenu.setParameterData(data.getParameterData());
                 checkMenu.setParameterType(data.getParameterType());
                 checkMenu.setParameterCheckState(0);
+                checkMenu.setType("1");
                 if (data.getParameterName().length() > 2 && data.getParameterName().endsWith("型号") && data.getParameterType().equals("1")) {
                     checkMenu.setIsModel("型号");
                     checkMenu.setParameterName(data.getParameterName().replace("型号", ""));

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

@@ -4,17 +4,17 @@
 
     <select id="getNoticeParameter" resultType="com.adc.da.dto.resDTO.CheckMenuManagementResDTO">
         SELECT DISTINCT
-        gg.SEQ AS parameterCodeOne ,
-        gg.CNAME AS parameterName
-        FROM GGCAIN06.GGCSXM gg
+        gg.CHECK_NOTICE_CODE AS parameterCodeOne ,
+        gg.CHECK_NOTICE_NAME AS parameterName
+        FROM NERDS.CHECK_NOTICE_CODE gg
         WHERE 1=1
         <if test="parameterCode != null and parameterCode != '' ">
-            AND gg.SEQ LIKE '%' || #{parameterCode}|| '%'
+            AND gg.CHECK_NOTICE_CODE LIKE '%' || #{parameterCode}|| '%'
         </if>
         <if test="parameterName != null and parameterName != '' ">
-            AND gg.CNAME LIKE '%' || #{parameterName} || '%'
+            AND gg.CHECK_NOTICE_NAME LIKE '%' || #{parameterName} || '%'
         </if>
-        ORDER BY gg.SEQ
+        ORDER BY gg.CHECK_NOTICE_CODE
     </select>
 
 <!--    <select id="getPartFormCheck" resultType="com.adc.da.keypartsverificationlist.entity.KeyPartsCheckList">-->

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

@@ -2,15 +2,63 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.system.dao.CheckCertificateInfoDetailDao">
     <select id="getClcpZk" resultType="com.adc.da.system.entity.CdVehicles">
-        SELECT cz.*,dp1."底盘型号" AS DPXH1,dp2."底盘型号"AS DPXH2,dp3."底盘型号" AS DPXH3,dp4."底盘型号" AS DPXH4
-        FROM RETRIEVAL.CLCP_ZK cz
-				LEFT JOIN RETRIEVAL.CHPDPK_ZK dp1 ON cz."底盘ID1" = dp1.DPID
-				LEFT JOIN RETRIEVAL.CHPDPK_ZK dp2 ON cz."底盘ID2" = dp1.DPID
-				LEFT JOIN RETRIEVAL.CHPDPK_ZK dp3 ON cz."底盘ID3" = dp1.DPID
-				LEFT JOIN RETRIEVAL.CHPDPK_ZK dp4 ON cz."底盘ID4" = dp1.DPID
-        WHERE
-            cz."批次" = #{group}
-        AND cz."车辆型号" = #{carTypeCode}
+    SELECT
+         dp1."底盘型号" AS DPXH1,
+         dp2."底盘型号" AS DPXH2,
+         dp3."底盘型号" AS DPXH3,
+         dp4."底盘型号" AS DPXH4,
+         cz."产品号" AS productId,
+         cz."前悬后悬" AS overHang,
+         cz."接近离去角" AS appAndDepAngle,
+         cz."生效日期" AS effectiveDate,
+         cz."发布日期" AS issuedDate,
+         cz."轮胎规格" AS tyreSize,
+         cz."轮胎数" AS tyreCount,
+         cz."企业名称" AS entName,
+         cz."中文品牌" AS zwpp,
+         cz."轴距" AS wheelSpace,
+         cz."轴荷" AS axleLoad,
+         cz."总质量" AS totalMass,
+         cz."驾驶室" AS cabPopulation,
+         cz."油耗" AS yh,
+         cz."M发动机" AS fdjxh,
+         cz."额定质量" AS ratedContainedMass,
+         cz."依据标准" AS emissionStandard,
+         cz."货厢长" AS gateLength,
+         cz."产品型号" AS vehicleModel,
+         cz."整备质量" AS kerbMass,
+         cz."M功率" AS fdjgl,
+         cz."产品商标" AS brand,
+         cz."产品号" AS productNo,
+         cz."批次" AS vehicleGroup,
+         cz."高" AS height,
+         cz."M排量" AS fdjpl,
+         cz."企业ID" AS entId,
+         cz."轴数" AS axleCount,
+         cz."生产地址" AS producingAddress,
+         cz."货厢高" AS gateHeight,
+         cz."长" AS vehicleLength,
+         cz."最高车速" AS maxSpeed,
+         cz."后轮距" AS steeringType,
+         cz."前轮距" AS frontTrack,
+         cz."弹簧片数" AS springLeafCount,
+         cz."燃料种类" AS fuelType,
+         cz."车辆名称" AS vehicleName,
+         cz."宽" AS width,
+         cz."货厢宽" AS gateWidth,
+         cz."底盘ID1" AS dpid1,
+         cz."底盘ID2" AS dpid2,
+         cz."底盘ID3" AS dpid3,
+         cz."底盘ID4" AS dpid4
+    FROM
+        RETRIEVAL.CLCP_ZK cz
+    LEFT JOIN RETRIEVAL.CHPDPK_ZK dp1 ON cz."底盘ID1" = dp1.DPID
+    LEFT JOIN RETRIEVAL.CHPDPK_ZK dp2 ON cz."底盘ID2" = dp1.DPID
+    LEFT JOIN RETRIEVAL.CHPDPK_ZK dp3 ON cz."底盘ID3" = dp1.DPID
+    LEFT JOIN RETRIEVAL.CHPDPK_ZK dp4 ON cz."底盘ID4" = dp1.DPID
+    WHERE
+    cz."批次" = #{group}
+    AND cz."车辆型号" = #{carTypeCode}
     </select>
 
 </mapper>

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

@@ -51,14 +51,6 @@
         <if test="operator != null and operator != ''">
             and ru.USERNAME like '%'|| #{operator}||'%' escape '|'
         </if>
-<!--        <if test="address != null and address.size() > 0">-->
-<!--            and-->
-<!--            ccmi.BASE_ID IN-->
-<!--            <foreach collection="address" separator="," close=")" open="(" item="item" index="index">-->
-<!--                #{item}-->
-<!--            </foreach>-->
-<!--        </if>-->
-
         <if test="pager.orderCondition != null and pager.orderCondition != ''">
             <if test="orderBy != 'vehicleGroup' ">
                 order by NLSSORT(${orderBy},'NLS_SORT = SCHINESE_PINYIN_M')  ${order},
@@ -87,14 +79,12 @@
         ccmi.REMARK as remark,
         ccmi.CHECK_DATE as checkDate,
         ccmi.CHECK_STATE as checkState,
-        ru.USERNAME as operator,
         cz."产品号"	as productNo,
         cz."中文品牌" as zwpp,
         cz."车辆名称" as vehicleName,
         cz."发布日期" as announcementDate
         FROM
         NERDS.CHECK_CERTIFICATE_MAIN_INFO ccmi
-        LEFT JOIN RETRIEVAL.RET_USERS ru ON ( ru.ID = ccmi.OPERATOR )
         LEFT JOIN RETRIEVAL.CLCP_ZK cz ON (ccmi.VEHICLE_MODEL = cz.车辆型号 and ccmi.VEHICLE_GROUP = cz.批次)
         LEFT JOIN (
         SELECT
@@ -116,14 +106,6 @@
         <if test="vehicleModel != null and vehicleModel != ''">
             and ccmi.VEHICLE_MODEL like '%'|| #{vehicleModel}||'%' escape '|'
         </if>
-<!--        <if test="address != null and address.size() > 0">-->
-<!--            and-->
-<!--            ccmi.BASE_ID IN-->
-<!--            <foreach collection="address" separator="," close=")" open="(" item="item" index="index">-->
-<!--                #{item}-->
-<!--            </foreach>-->
-<!--        </if>-->
-
         <if test="vehicleGroup != null and vehicleGroup != ''">
             and ccmi.VEHICLE_GROUP = #{vehicleGroup}
         </if>
@@ -134,11 +116,6 @@
             and ru.USERNAME like '%'|| #{operator}||'%' escape '|'
         </if>
         order by CCCCC.count_id
---         CASE
---         WHEN CHECK_STATE = 1 THEN 1
---         WHEN CHECK_STATE = 0 THEN 2
---         WHEN CHECK_STATE = 2 THEN 3
---         END ,  CHECK_DATE DESC , to_number(ccmi.VEHICLE_GROUP) desc , ccmi.VEHICLE_MODEL , CCCCC.count_id desc,ccmi.ID
         ) tmp_tb where rownum &lt;= ${pager.endIndex})
         where rn &gt;= ${pager.startIndex}
     </select>
@@ -148,16 +125,7 @@
         count(*)
         from NERDS.CHECK_CERTIFICATE_MAIN_INFO ccmi
         LEFT JOIN RETRIEVAL.CLCP_ZK cz ON (ccmi.VEHICLE_MODEL = cz.车辆型号 and ccmi.VEHICLE_GROUP = cz.批次)
-        LEFT JOIN RETRIEVAL.RET_USERS ru ON ( ru.ID = ccmi.OPERATOR )
         where 1=1
-<!--        <if test="address != null and address.size() > 0">-->
-<!--            and-->
-<!--            ccmi.BASE_ID IN-->
-<!--            <foreach collection="address" separator="," close=")" open="(" item="item" index="index">-->
-<!--                #{item}-->
-<!--            </foreach>-->
-<!--        </if>-->
-
         <if test="vehicleModel != null and vehicleModel != ''">
             and ccmi.VEHICLE_MODEL like '%'|| #{vehicleModel}||'%' escape '|'
         </if>
@@ -198,6 +166,6 @@
     <select id="getClcpZk" resultType="com.adc.da.system.entity.CheckCertificateMainInfo">
         SELECT cz."车辆型号" AS vehicleModel,cz."批次"AS vehicleGroup,cz."企业ID" AS baseId
         FROM RETRIEVAL.CLCP_ZK cz
-        WHERE to_number(cz."批次") >= to_number(#{vehicleGroup})
+        WHERE to_number(cz."批次") = to_number(#{vehicleGroup})
     </select>
 </mapper>

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

@@ -27,17 +27,18 @@
     </update>
     <select id="selectNoticeParameterByCodes" resultType="com.adc.da.dto.reqDTO.CheckMenuManagementReqDTO" parameterType="java.util.List">
         SELECT DISTINCT
-        CNAME AS parameterName
-        FROM NERDS.GG_DATA_DETAIL
+        CHECK_NOTICE_CODE AS parameterCodeOne,
+        CHECK_NOTICE_NAME AS parameterName
+        FROM NERDS.CHECK_NOTICE_CODE
         WHERE 1=1
         AND
-<!--        PARAMETER_SEQ in-->
+<!--        CHECK_NOTICE_CODE in-->
 <!--        <foreach item="id" collection="codes" open="(" separator=","-->
 <!--                 close=")" index="index">-->
 <!--            #{id}-->
 <!--        </foreach>-->
 <!--        OR-->
-        CNAME in
+        CHECK_NOTICE_CODE in
         <foreach item="id" collection="codes" open="(" separator=","
                  close=")" index="index">
             #{id}

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

@@ -17,7 +17,6 @@
         CCMI."VERSION" AS editionCode,
         CDCR.CHECK_DATA AS paramData,
         CDCR.PARAM_NAME as paramName,
-        -- TS_ORG.org_name as ent,
         CDCR.CHECK_FORM_DATA AS fromData,
         CDCR.CHECK_RESULT AS checkResult,
         CASE CDCR.CHECK_TYPE
@@ -28,15 +27,11 @@
         ELSE ' '
         END as bookName
         FROM
-        CHECK_CERTIFICATE_MAIN_INFO CCMI
+        NERDS.CHECK_CERTIFICATE_MAIN_INFO CCMI
         LEFT JOIN NERDS.CHECK_DATA_CHECK_RESULT CDCR ON (
         CCMI."ID" = CDCR.CHECK_CERTIFICATE_MAIN_INFO_ID
         )
-        left join CHECK_CD_VEHICLE ccv
-        on (CCMI.VEHICLE_MODEL = ccv.VEHICLE_MODEL and CCMI.VEHICLE_GROUP = ccv.VEHICLE_GROUP and ccv.CD_TYPE = '1')
-        -- left join TS_ORG ON (TS_ORG.ID = CCMI.BASE_ID)
         WHERE CDCR.CHECK_RESULT NOT IN ('0')
-        --and TS_ORG.ORG_TYPE = 'FACTORY' and TS_ORG.DEL_FLAG = '0'
         <if test="carTypeCode != null and carTypeCode != ''">
             and CCMI.VEHICLE_MODEL like '%'||#{carTypeCode}||'%'
         </if>
@@ -66,33 +61,29 @@
     </select>
     <select id="downCheckFalse" resultType="com.adc.da.dto.resDTO.DownCheckFalseDTO">
         SELECT
+        CDCR."ID" AS ID,
         CCMI.VEHICLE_MODEL AS carTypeCode,
+        CCMI.CHECK_DATE AS checkTime,
+        CCMI.REMARK AS remark,
         ccmi.VEHICLE_GROUP AS carGroup,
         CCMI."VERSION" AS editionCode,
-        CCMI.REMARK AS remark,
+        CDCR.CHECK_DATA AS paramData,
+        CDCR.PARAM_NAME as paramName,
+        CDCR.CHECK_FORM_DATA AS fromData,
+        CDCR.CHECK_RESULT AS checkResult,
         CASE CDCR.CHECK_TYPE
         WHEN '2' THEN
         '合格证'
         when '1' THEN '一致性证书'
         when '3' then '环保随车清单'
         ELSE ' '
-        END as bookName,
-        CDCR.PARAM_NAME as paramName,
-        CDCR.CHECK_DATA AS paramData,
-        -- TS_ORG.org_name as ent,
-        CDCR.CHECK_FORM_DATA AS fromData,
-        CDCR.CHECK_RESULT AS checkResult,
-        CCMI.CHECK_DATE AS checkTime
+        END as bookName
         FROM
-        CHECK_CERTIFICATE_MAIN_INFO CCMI
+        NERDS.CHECK_CERTIFICATE_MAIN_INFO CCMI
         LEFT JOIN NERDS.CHECK_DATA_CHECK_RESULT CDCR ON (
         CCMI."ID" = CDCR.CHECK_CERTIFICATE_MAIN_INFO_ID
         )
-        left join CHECK_CD_VEHICLE ccv
-        on (CCMI.VEHICLE_MODEL = ccv.VEHICLE_MODEL and CCMI.VEHICLE_GROUP = ccv.VEHICLE_GROUP and ccv.CD_TYPE = '1')
-        -- left join TS_ORG ON (TS_ORG.ID = CCMI.BASE_ID)
         WHERE CDCR.CHECK_RESULT NOT IN ('0')
-        --and TS_ORG.ORG_TYPE = 'FACTORY' and TS_ORG.DEL_FLAG = '0'
         <if test="carTypeCode != null and carTypeCode != ''">
             and CCMI.VEHICLE_MODEL like '%'||#{carTypeCode}||'%'
         </if>
@@ -100,10 +91,10 @@
             and CDCR.CHECK_RESULT = #{result}
         </if>
         <if test="carGroup != null and carGroup != ''">
-            and CCMI.VEHICLE_GROUP = #{carGroup}
+            and CCMI.VEHICLE_GROUP =  #{carGroup}
         </if>
         <if test="editionCode != null and editionCode != ''">
-            and CCMI."VERSION" = #{editionCode}
+            and CCMI."VERSION" =  #{editionCode}
         </if>
         <if test="paramName != null and paramName != ''">
             and CDCR.PARAM_NAME like '%'||#{paramName}||'%'
@@ -114,7 +105,9 @@
             <foreach collection="address" separator="," close=")" open="(" item="item" index="index">
                 #{item}
             </foreach>
+
         </if>
+
         AND CCMI.CHECK_STATE = '2'
         ORDER BY CDCR.CHECK_RESULT ,CDCR.CHECK_DATE ,CDCR.ID
     </select>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.system.dao.CheckEnterpriseDataDao">
+
+    <select id="queryCheckEnterpriseDataByPage" resultType="com.adc.da.system.entity.CheckEnterpriseData">
+        select CHECK_ENTERPRISE_DATA.*,
+        TS_USER.USNAME AS checkUserName
+        from CHECK_ENTERPRISE_DATA
+        LEFT JOIN TS_USER ON CHECK_ENTERPRISE_DATA.CHECK_USER = TS_USER.USID
+        <where>
+            1=1
+            <if test="checkEnterpriseData.auditNumber == null">
+            and CHECK_ENTERPRISE_DATA.AUDIT_NUMBER = '1'
+            </if>
+            <if test='checkEnterpriseData.auditNumber != null and checkEnterpriseData.auditNumber == "1"'>
+            and CHECK_ENTERPRISE_DATA.AUDIT_NUMBER not IN ('1')
+            </if>
+            <if test="checkEnterpriseData.vehicleType != null and checkEnterpriseData.vehicleType != ''">
+                and (VEHICLE_TYPE like '%'||#{checkEnterpriseData.vehicleType}||'%' )
+            </if>
+            <if test="checkEnterpriseData.cccId != null and checkEnterpriseData.cccId != ''">
+                and (CCC_ID like '%'||#{checkEnterpriseData.cccId}||'%' or CCC_ID like upper('%'||#{checkEnterpriseData.cccId}||'%') or CCC_ID like lower('%'||#{checkEnterpriseData.cccId}||'%'))
+            </if>
+<!--            <if test="baseIdList.size() != 0">-->
+<!--                and BASE_ID IN-->
+<!--                <foreach collection="baseIdList" index="index" item="item" open="(" separator="," close=")">-->
+<!--                    #{item}-->
+<!--                </foreach>-->
+<!--            </if>-->
+            <if test="checkEnterpriseData.checkStatus != null and checkEnterpriseData.checkStatus != ''">
+                and CHECK_STATUS  = #{checkEnterpriseData.checkStatus}
+            </if>
+            <if test="checkEnterpriseData.judgment != null and checkEnterpriseData.judgment != ''">
+                and (CHECK_STATUS = '0'
+                or CHECK_STATUS IS NULL)
+            </if>
+        </where>
+            order by AUDIT_NUMBER desc,CCC_ID,ID
+    </select>
+    <select id="queryVehicleListByPage" resultType="com.adc.da.system.entity.VehicleList">
+        select * from (
+        SELECT
+        DISTINCT
+        gg.ID AS id,
+        cdv."车辆型号" AS VEHICLE_MODEL,
+        cdv."产品号" AS PRODUCT_NO,
+        cdv."车辆名称" AS VEHICLE_NAME,
+        cdv."批次" AS VEHICLE_GROUP,
+        cdv."生产地址" AS PRODUCING_ADDRESS
+        FROM
+        NERDS.CLCP_ZK cdv
+        LEFT JOIN NERDS.GG_DATA_ZRIN gg ON gg.CPXH = cdv."车辆型号" AND gg.PC = cdv."批次"
+        ) t
+        <where>
+            1=1
+            <if test="vehicleList.vehicleModel != null and vehicleList.vehicleModel != ''">
+                and t.VEHICLE_MODEL like '%'||#{vehicleList.vehicleModel}||'%'
+            </if>
+            <if test="vehicleList.productNo != null and vehicleList.productNo != ''">
+                and t.PRODUCT_NO like '%'||#{vehicleList.productNo}||'%'
+            </if>
+            <if test="vehicleList.vehicleGroup != null and vehicleList.vehicleGroup != ''">
+                and t.VEHICLE_GROUP = #{vehicleList.vehicleGroup}
+            </if>
+        </where>
+        <if test="vehicleList.orderBy != null and vehicleList.orderBy != ''">
+            order by t.id,${vehicleList.orderBy} ${vehicleList.order},t.VEHICLE_GROUP desc,t.VEHICLE_MODEL desc,t.PRODUCT_NO desc
+        </if>
+        <if test="vehicleList.orderBy == null or vehicleList.orderBy == ''">
+            order by t.id ,t.VEHICLE_GROUP desc,t.VEHICLE_MODEL desc,t.PRODUCT_NO desc
+        </if>
+    </select>
+    <select id="queryInfoByCheckstatus" resultType="com.adc.da.system.entity.CheckEnterpriseData">
+        SELECT
+            ID AS id,
+            CCC_ID AS cccId,
+            VEHICLE_TYPE AS vehicleType,
+            VERSION_NUMBER AS versionNumber,
+            FOUNDER AS founder,
+            CREATE_TIME AS createTime,
+            REMARKS AS remarks,
+            TYPE AS type,
+            BASE_ID AS baseId,
+            CHECK_STATUS AS checkStatus,
+            CHECK_USER AS checkUser,
+            CHECK_TIME AS checkTime,
+            AUDIT_STATUS AS auditStatus,
+            COC_OR_CQC AS cocOrCqc
+        FROM
+             CHECK_ENTERPRISE_DATA
+        WHERE CHECK_STATUS=1
+        ORDER BY
+                 CHECK_TIME DESC
+    </select>
+
+    <select id="queryEnterpriseDataPage" resultType="com.adc.da.system.entity.CheckEnterpriseData">
+        SELECT
+        *
+        FROM
+        (SELECT
+        t2.ID,t1.VEHICLE_TYPE,t1.VERSION_NUMBER,t2.REMARKS,t2.ENTRY_NAME,t2.ENTRY_PARAMETER,t2.CHECK_RESULT,t1.FOUNDER, t1.AUDIT_NUMBER,
+        t1.	CHECK_TIME,t2.CHECK_IMAGE_ONE,t2.CHECK_IMAGE_TWO
+        FROM
+        CHECK_ENTERPRISE_DATA t1
+        LEFT JOIN
+        CHECK_ENTERPRISE_DATA_DETAILS t2
+        ON t1.ID = t2.BUSIONESS_ID
+        WHERE
+            t1.CHECK_STATUS  = '1'
+            AND t2.CHECK_RESULT IN ('1','2')
+        ) a
+        WHERE 1=1
+        <if test="checkEnterpriseData.entryName != null and checkEnterpriseData.entryName != ''">
+            AND ENTRY_NAME like '%'||#{checkEnterpriseData.entryName}||'%'
+        </if>
+        <if test="checkEnterpriseData.vehicleType != null and checkEnterpriseData.vehicleType != ''">
+            AND VEHICLE_TYPE like '%'||#{checkEnterpriseData.vehicleType}||'%'
+        </if>
+        <if test="checkEnterpriseData.checkStatus != null and checkEnterpriseData.checkStatus != ''">
+            AND CHECK_RESULT = #{checkEnterpriseData.checkStatus}
+        </if>
+
+        <if test="checkEnterpriseData.auditNumber != null and checkEnterpriseData.auditNumber != ''">
+            AND AUDIT_NUMBER = #{checkEnterpriseData.auditNumber}
+        </if>
+
+        <if test="checkEnterpriseData.versionNumber != null and checkEnterpriseData.versionNumber != ''">
+            AND VERSION_NUMBER = #{checkEnterpriseData.versionNumber}
+        </if>
+        <if test="checkEnterpriseData.orderBy != null and checkEnterpriseData.orderBy != '' and checkEnterpriseData.order != null and checkEnterpriseData.order != ''">
+            order by ${checkEnterpriseData.orderBy} ${checkEnterpriseData.order},ID
+        </if>
+    </select>
+
+    <select id="queryEnterpriseData" resultType="com.adc.da.dto.resDTO.CheckEnterpriseDTO">
+        SELECT
+        *
+        FROM
+            (SELECT
+                t2.ID,t1.VEHICLE_TYPE,t1.VERSION_NUMBER,t1.REMARKS,t2.ENTRY_NAME,t2.ENTRY_PARAMETER,t2.CHECK_RESULT,t1.FOUNDER,t1.AUDIT_NUMBER,t2.CHECK_IMAGE_ONE,
+                    t2.CHECK_IMAGE_TWO,
+                t1.	CHECK_TIME
+            FROM
+                CHECK_ENTERPRISE_DATA t1
+            LEFT JOIN
+                CHECK_ENTERPRISE_DATA_DETAILS t2
+            ON t1.ID = t2.BUSIONESS_ID
+            WHERE
+                t1.CHECK_STATUS = '1'
+                AND t2.CHECK_RESULT IN ('1','2')
+            ) a
+        WHERE 1=1
+        <if test="entryName != null and entryName != ''">
+            AND ENTRY_NAME like '%'||#{entryName}||'%'
+        </if>
+        <if test="vehicleType != null and vehicleType != ''">
+            AND VEHICLE_TYPE like '%'||#{vehicleType}||'%'
+        </if>
+        <if test="checkStatus != null and checkStatus != ''">
+            AND CHECK_STATUS = #{checkStatus}
+        </if>
+        <if test="auditNumber != null and auditNumber != ''">
+            AND AUDIT_NUMBER = #{auditNumber}
+        </if>
+        <if test="versionNumber != null and versionNumber != ''">
+            AND VERSION_NUMBER = #{versionNumber}
+        </if>
+        order by CHECK_RESULT DESC
+    </select>
+</mapper>

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

@@ -9,23 +9,11 @@
         (
         select
         cmsl.*,
-        --         tso.ORG_NAME,
---         tsu.USERNAME as aoperator,
         tsucar.USERNAME as realMouldOperator,
---         tsukey.USERNAME as keyOperator,
---         tsuSCAN.USERNAME as scanCodeOperator,
---         tsuOBD.USERNAME as obdOperator,
---         tsuSTAND.USERNAME as standOperator,
         t1.USERNAME as carOperatorName
         FROM
         NERDS.CHECK_MODEL_SERIES_LIST cmsl
-        --         LEFT JOIN TS_ORG tso ON tso.ID = cmsl.BASE
---         left join RETRIEVAL.RET_USERS tsu on tsu.ID = cmsl.OPERATOR
         left join RETRIEVAL.RET_USERS tsucar on tsucar.ID = cmsl.CAR_OPERATOR
---         left join RETRIEVAL.RET_USERS tsuSCAN on tsuSCAN.ID = cmsl.SCAN_CODE_OPERATOR
---         left join RETRIEVAL.RET_USERS tsuOBD on tsuOBD.ID = cmsl.OBD_OPERATOR
---         left join RETRIEVAL.RET_USERS tsukey on tsukey.ID = cmsl.KEY_OPERATOR
---         left join RETRIEVAL.RET_USERS tsuSTAND on tsuSTAND.ID = cmsl.STAND_OPERATOR
         left join RETRIEVAL.RET_USERS t1 on t1.ID = cmsl.CAR_OPERATOR
         where  EDITION_CODE = '1'
         AND  ((REAL_MOULD_STATUS != '0' OR REAL_MOULD_STATUS  IS  NULL) AND  cmsl.IS_CHECK_OK IS NULL)
@@ -72,28 +60,11 @@
         (
         select
         cmsl.*,
-        tso.ORG_NAME,
-        tsu.USNAME as aoperator,
-        tsucar.USNAME as realMouldOperator,
-        tsukey.USNAME as keyOperator,
-        tsuSCAN.USNAME as scanCodeOperator,
-        tsuOBD.USNAME as obdOperator,
-        tsuSTAND.USNAME as standOperator
+        tsucar.USERNAME as realMouldOperator
         FROM
-        CHECK_MODEL_SERIES_LIST cmsl
-        LEFT JOIN TS_ORG tso ON tso.ID = cmsl.BASE
-        left join TS_USER tsu on tsu.USID = cmsl.OPERATOR
-        left join TS_USER tsucar on tsucar.USID = cmsl.CAR_OPERATOR
-        left join TS_USER tsuSCAN on tsuSCAN.USID = cmsl.SCAN_CODE_OPERATOR
-        left join TS_USER tsuOBD on tsuOBD.USID = cmsl.OBD_OPERATOR
-        left join TS_USER tsukey on tsukey.USID = cmsl.KEY_OPERATOR
-        left join TS_USER tsuSTAND on tsuSTAND.USID = cmsl.STAND_OPERATOR
-        where OBD_STATUS = '0'
-        or SCAN_CODE_STATUS = '0'
-        or REAL_MOULD_STATUS = '0'
-        or STAND_STATUS = '0'
-        or KEY_STATUS = '0'
-               or IS_CHECK_OK = '0'
+        NERDS.CHECK_MODEL_SERIES_LIST cmsl
+        left join RETRIEVAL.RET_USERS tsucar on tsucar.ID = cmsl.CAR_OPERATOR
+        where REAL_MOULD_STATUS = '0'
         <if test="baseIdList.size() != 0">
             and cmsl.BASE IN
             <foreach collection="baseIdList" index="index" item="item" open="(" separator="," close=")">
@@ -116,10 +87,10 @@
         <if test="checkModelSeriesList.vehicleSeries != null and checkModelSeriesList.vehicleSeries != ''">
             and VEHICLE_SERIES like '%'||#{checkModelSeriesList.vehicleSeries}||'%'
         </if>
-        <if test="checkModelSeriesList.type != null">
+        <if test="checkModelSeriesList.type != null and checkModelSeriesList.type != ''">
             and "TYPE" = #{checkModelSeriesList.type}
         </if>
-        <if test="checkModelSeriesList.editionCode != null">
+        <if test="checkModelSeriesList.editionCode != null and checkModelSeriesList.editionCode != ''">
             and "EDITION_CODE" = #{checkModelSeriesList.editionCode}
         </if>
         <if test="checkModelSeriesList.orderBy != null and checkModelSeriesList.orderBy != '' and checkModelSeriesList.order != null and checkModelSeriesList.order != ''">
@@ -137,26 +108,13 @@
         (
         select
         cmsl.*,
-        tso.ORG_NAME,
-        tsu.USNAME as aoperator,
-        tsucar.USNAME as realMouldOperator,
-        tsukey.USNAME as keyOperator,
-        tsuSCAN.USNAME as scanCodeOperator,
-        tsuOBD.USNAME as obdOperator,
-        tsuSTAND.USNAME as standOperator
+        tsucar.USERNAME as realMouldOperator
         FROM
-        CHECK_MODEL_SERIES_LIST cmsl
-        LEFT JOIN TS_ORG tso ON tso.ID = cmsl.BASE
-        left join TS_USER tsu on tsu.USID = cmsl.OPERATOR
-        left join TS_USER tsucar on tsucar.USID = cmsl.CAR_OPERATOR
-        left join TS_USER tsuSCAN on tsuSCAN.USID = cmsl.SCAN_CODE_OPERATOR
-        left join TS_USER tsuOBD on tsuOBD.USID = cmsl.OBD_OPERATOR
-        left join TS_USER tsukey on tsukey.USID = cmsl.KEY_OPERATOR
-        left join TS_USER tsuSTAND on tsuSTAND.USID = cmsl.STAND_OPERATOR
+        NERDS.CHECK_MODEL_SERIES_LIST cmsl
+        left join RETRIEVAL.RET_USERS tsucar on tsucar.ID = cmsl.CAR_OPERATOR
         where
             cmsl.EDITION_CODE > '1'
-        AND (( (OBD_STATUS != '0' OR  OBD_STATUS IS  NULL) OR (STAND_STATUS != '0' OR  STAND_STATUS IS  NULL) OR (SCAN_CODE_STATUS != '0' OR  SCAN_CODE_STATUS IS  NULL)
-        OR (KEY_STATUS != '0' OR KEY_STATUS IS  NULL)  OR (REAL_MOULD_STATUS != '0' OR REAL_MOULD_STATUS  IS  NULL)  ) AND cmsl.IS_CHECK_OK IS NULL)
+        AND  ((REAL_MOULD_STATUS != '0' OR REAL_MOULD_STATUS  IS  NULL) AND cmsl.IS_CHECK_OK IS NULL)
         <if test="baseIdList.size() != 0">
             and cmsl.BASE IN
             <foreach collection="baseIdList" index="index" item="item" open="(" separator="," close=")">
@@ -180,15 +138,10 @@
             and VEHICLE_SERIES like '%'||#{checkModelSeriesList.vehicleSeries}||'%'
         </if>
         <if test='checkModelSeriesList.type != null and checkModelSeriesList.type != "2"'>
-            AND (OBD_STATUS = #{checkModelSeriesList.type} OR SCAN_CODE_STATUS = #{checkModelSeriesList.type} OR REAL_MOULD_STATUS = #{checkModelSeriesList.type}
-            OR STAND_STATUS = #{checkModelSeriesList.type} OR KEY_STATUS = #{checkModelSeriesList.type})
+            AND REAL_MOULD_STATUS = #{checkModelSeriesList.type}
         </if>
         <if test='checkModelSeriesList.type == "2"'>
-            AND (OBD_STATUS IS NULL
-            OR SCAN_CODE_STATUS IS NULL
-            OR REAL_MOULD_STATUS IS NULL
-            OR STAND_STATUS IS NULL
-            OR KEY_STATUS IS NULL)
+            AND  REAL_MOULD_STATUS IS NULL
         </if>
         <if test="checkModelSeriesList.orderBy != null and checkModelSeriesList.orderBy != '' and checkModelSeriesList.order != null and checkModelSeriesList.order != ''">
             order by ${checkModelSeriesList.orderBy} ${checkModelSeriesList.order}, "TYPE" desc, CREATE_TIME DESC, VEHICLE_TYPE_AND_GROUP DESC

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

@@ -7,23 +7,11 @@
         t1.ID,
         t1.OBD_NAME,
         t1.MOULD_TYPE,
---         t2.ORG_NAME,
         t1.BASE,
         t1.CREATION_TIME,
         t1.CHANGE_TIME,
---         t3.USNAME AS OPERATOR,
         t1.REMARKS
---         LISTAGG ( t5.ORG_NAME, ',' ) within GROUP ( ORDER BY t5.ORG_NAME ) AS distributionName,
---         LISTAGG (t5.ID,',') within GROUP (ORDER BY t5.ID) AS DISTRIBUTION_BASE
         FROM NERDS.CHECK_OBD t1
---         LEFT JOIN TS_ORG t2
---         ON t2.ID = t1.BASE
---         LEFT JOIN TS_USER t3
---         ON t3.USID = t1.OPERATOR
---         LEFT JOIN CHECK_OBD_ORG t4
---         ON t4.OBD_ID = t1.ID
---         LEFT JOIN TS_ORG t5
---         ON t5.ID = t4.ORG_ID
         WHERE 1=1
         <if test="type !=null and type !=''">
         AND t1.TYPE = #{type}
@@ -46,7 +34,6 @@
                 #{list}
             </foreach>
         </if>
---         GROUP BY t1.ID,t1.OBD_NAME,t2.ORG_NAME,t1.BASE,t1.CREATION_TIME,t1.CHANGE_TIME,t3.USNAME,t1.REMARKS, t1.MOULD_TYPE
         <if test="sort != null and sort !='' and isAsc != null and isAsc != ''">
             ORDER BY ${sort} ${isAsc},t1.ID
         </if>
@@ -85,7 +72,7 @@
 
     <update id="updateObd" parameterType="com.adc.da.system.entity.CheckObd">
         UPDATE
-            CHECK_OBD
+        NERDS.CHECK_OBD
         <trim prefix="SET" suffixOverrides=",">
             ID = #{id},
             <if test="obdName != null and obdName != ''">OBD_NAME = #{obdName},</if>
@@ -97,14 +84,16 @@
 
     <delete id="deleteObdOrg" parameterType="java.lang.String">
         DELETE
-            CHECK_OBD_ORG
+        FROM
+            NERDS.CHECK_OBD_ORG
         WHERE
             OBD_ID = #{obdId}
     </delete>
 
     <delete id="deleteDetailObd" parameterType="java.lang.String">
         DELETE
-            CHECK_DETAIL_OBD
+        FROM
+            NERDS.CHECK_DETAIL_OBD
         WHERE
             OBD_ID = #{id}
     </delete>
@@ -126,4 +115,26 @@
               AND CHECK_OBD.ID != (#{id})
           </if>
     </select>
+
+    <select id="getClcpZkId" resultType="java.lang.String">
+        SELECT
+        ID
+        FROM NERDS.GG_DATA_ZRIN
+        WHERE
+        CPXH = #{cpxh}
+        AND
+        PC = #{pc}
+    </select>
+
+    <select id="getdataZrin" resultType="com.adc.da.system.entity.DataDetail">
+        SELECT
+        ITEM_VLAUE,CPXH
+        FROM NERDS.GG_DATA_DETAIL
+        LEFT JOIN NERDS.GG_DATA_ZRIN ON GG_DATA_ZRIN.ID = GG_DATA_DETAIL.GG_ID
+        WHERE
+        GG_ID = #{id}
+        AND
+        CNAME = #{cname}
+
+    </select>
 </mapper>

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

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.system.dao.CheckObdOrgMapper">
     <select id="getBaseNameByOrgIds" resultType="string">
-        SELECT ORG_NAME
-FROM TS_ORG
+        SELECT NAME
+FROM RETRIEVAL.RET_USERS
 WHERE 1=1
-AND id in
+AND USERNAME in
     <foreach collection="baseIds" separator="," open="(" item="item" index="index" close=")">
         #{item}
     </foreach>

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

@@ -146,8 +146,8 @@
             CMSL.KEY_TIME AS keyTime,
             CMSL.CREATION_TIME AS creationTime
         FROM
-            CHECK_REAL_VEHICLE_VER CRVV
-                LEFT JOIN CHECK_MODEL_SERIES_LIST CMSL
+            NERDS.CHECK_REAL_VEHICLE_VER CRVV
+                LEFT JOIN NERDS.CHECK_MODEL_SERIES_LIST CMSL
                     ON CMSL.ID = CRVV.VEHICLE_SERIES_ID
         WHERE
             CRVV.TYPE = '3'
@@ -181,7 +181,7 @@
               AND CHECK_RESULT = '1'
           </if>
 
-		<if test="checkRealVehicleVer.handleType !=null">
+		<if test="checkRealVehicleVer.handleType !=null and checkRealVehicleVer.parameterName != ''">
         AND t1.HANDLE_TYPE = #{checkRealVehicleVer.handleType}
         </if>
         <if test="checkRealVehicleVer.parameterName != null and checkRealVehicleVer.parameterName != ''">
@@ -401,7 +401,7 @@
 
     <update id="updateCheckModelSeriesList" parameterType="com.adc.da.dto.reqDTO.CheckRealVehicleVerificationDto">
         UPDATE
-            CHECK_MODEL_SERIES_LIST
+        NERDS.CHECK_MODEL_SERIES_LIST
         SET
         <if test="detailType == 1">
             OBD_STATUS = '1'
@@ -424,7 +424,7 @@
 
     <update id="updateCheckModelSeriesListTime" parameterType="com.adc.da.dto.reqDTO.CheckRealVehicleVerificationDto">
         UPDATE
-        CHECK_MODEL_SERIES_LIST
+        NERDS.CHECK_MODEL_SERIES_LIST
         SET
         <if test="detailType == 1">
             OBD_OPERATOR = #{userId},
@@ -452,7 +452,7 @@
 
     <update id="updateCheckModelSeries" parameterType="com.adc.da.dto.reqDTO.CheckRealVehicleVerificationDto">
         UPDATE
-        CHECK_MODEL_SERIES_LIST
+        NERDS.CHECK_MODEL_SERIES_LIST
         SET
         <if test="detailType == 1">
             OBD_STATUS = '0',

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

@@ -8,17 +8,17 @@
      FROM (
     SELECT
         TYPE,
-        LISTAGG ( ID, ',' ) within GROUP ( ORDER BY ID ) AS ID,
+        wm_concat ( ID) AS ID,
         VEHICLE_SERIES_ID,
         PARAMETER_NAME,
-        LISTAGG ( PARAMETER_CODE_ONE, '/' ) within GROUP ( ORDER BY PARAMETER_CODE_ONE ) AS PARAMETER_CODE_ONE,
-        LISTAGG ( IS_MODEL, '/' ) within GROUP ( ORDER BY IS_MODEL ) AS IS_MODEL,
+        wm_concat ( PARAMETER_CODE_ONE)  AS PARAMETER_CODE_ONE,
+        wm_concat ( IS_MODEL)  AS IS_MODEL,
         PARAMETER_TYPE,
         PARAMETER_DATA,
         PARAMETER_CODE_TWO,
         PARAMETER_CHECK_STATE
     FROM
-        CHECK_VEHICLE_CHECK_MENU
+        NERDS.CHECK_VEHICLE_CHECK_MENU
     GROUP BY
         TYPE,
         VEHICLE_SERIES_ID,
@@ -75,7 +75,7 @@
             SELECT
             *
             FROM
-            CHECK_VEHICLE_CHECK_MENU
+            NERDS.CHECK_VEHICLE_CHECK_MENU
             WHERE
             VEHICLE_SERIES_ID = #{ vehicleSeriesId }
             AND PARAMETER_CHECK_STATE IN (0,1)