Skip to content

A
ADC-uniformity
Commit 166d4e51 authored by qk's avatar qk
Browse files
Options

添加核查模块

parent d41e87d1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2903 additions and 1165 deletions
adcbs-check/pom.xml
View file @ 166d4e51
......@@ -174,12 +174,23 @@
<artifactId>mail</artifactId>
<version>1.4.7</version>
</dependency>
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>com.adc</groupId>
<artifactId>adcbs-vdaims</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.adc</groupId>
<artifactId>adcbs-util</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.adc</groupId>-->
<!-- <artifactId>adc-da-sys</artifactId>-->
......
adcbs-check/src/main/java/com/adc/da/dto/resDTO/CheckMenuManagementResDTO.java 0 → 100644
View file @ 166d4e51
package com.adc.da.dto.resDTO;
import com.adc.da.system.entity.CheckCheckMenuManagement;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
public class CheckMenuManagementResDTO extends CheckCheckMenuManagement {
}
adcbs-check/src/main/java/com/adc/da/dto/resDTO/DataCheckDTO.java 0 → 100644
View file @ 166d4e51
package com.adc.da.dto.resDTO;
import com.adc.da.system.entity.CheckDataCheckResult;
public class DataCheckDTO extends CheckDataCheckResult implements Comparable<DataCheckDTO>{
/**
* 构造方法
* @param id
* @param checkCertificateMainInfoId
* @param paramName
* @param checkResult
* @param checkType
* @param checkData
* @param checkDFormData
*/
public DataCheckDTO(String id, String checkCertificateMainInfoId, String paramName, String checkResult,
String checkType, String checkData, String checkDFormData) {
super(id, checkCertificateMainInfoId, paramName, checkResult, checkType, checkData, checkDFormData);
}
/**
* 实现排序
* @param o
* @return
*/
@Override
public int compareTo(DataCheckDTO o) {
return 0;
}
}
adcbs-check/src/main/java/com/adc/da/system/controller/CheckMenuManagementController.java
View file @ 166d4e51
......@@ -3,6 +3,7 @@ package com.adc.da.system.controller;
import com.adc.da.dto.reqDTO.CheckMenuManagementReqDTO;
import com.adc.da.system.entity.CheckCheckMenuManagement;
import com.adc.da.base.web.BaseController;
import com.adc.da.system.service.ICheckBulletinDataParameterService;
import com.adc.da.system.service.ICheckCheckMenuManagementService;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
......@@ -31,8 +32,8 @@ import java.util.List;
@RestController
@RequestMapping("/${restPath}/CheckMenuManagement")
public class CheckMenuManagementController extends BaseController {
// @Autowired
// private ICheckBulletinDataParameterService iCheckBulletinDataParameterService;
@Autowired
private ICheckBulletinDataParameterService iCheckBulletinDataParameterService;
@Autowired
private ICheckCheckMenuManagementService iCheckCheckMenuManagementService;
......@@ -42,14 +43,14 @@ public class CheckMenuManagementController extends BaseController {
* @param parameterName
* @return
*/
// @ApiOperation(value = "获取所有公告参数")
// @GetMapping(value = "/getNoticeParameter")
// public ResponseMessage getNoticeParameter(String obdId, String parameterCode,String parameterName) {
// if (StringUtils.isNotEmpty(parameterCode)){
// parameterCode = parameterCode.toUpperCase();
// }
// return iCheckBulletinDataParameterService.getNoticeParameter(obdId,parameterCode,parameterName);
// }
@ApiOperation(value = "获取所有公告参数")
@GetMapping(value = "/getNoticeParameter")
public ResponseMessage getNoticeParameter(String obdId, String parameterCode,String parameterName) {
if (StringUtils.isNotEmpty(parameterCode)){
parameterCode = parameterCode.toUpperCase();
}
return iCheckBulletinDataParameterService.getNoticeParameter(obdId,parameterCode,parameterName);
}
/**
*
......
adcbs-check/src/main/java/com/adc/da/system/controller/CheckModelSeriesListController.java
View file @ 166d4e51
......@@ -16,6 +16,7 @@ import com.adc.da.system.service.ICheckVehicleCheckMenuService;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import com.adc.da.util.utils.UserUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -116,6 +117,7 @@ public class CheckModelSeriesListController {
@ApiOperation(value = "|queryCheckModelSeriesListByPage|车型系列表分页查询")
@GetMapping(value = "/queryCheckModelSeriesListByPage")
public ResponseMessage queryCheckModelSeriesListByPage(CheckModelSeriesList checkModelSeriesList) {
checkModelSeriesList.setBase(UserUtil.getQyId());
Page page = new Page(checkModelSeriesList.getPage(), checkModelSeriesList.getPageSize());
if (StringUtils.isNotEmpty(checkModelSeriesList.getVehicleType())) {
checkModelSeriesList.setVehicleType(checkModelSeriesList.getVehicleType().toUpperCase());
......@@ -189,6 +191,7 @@ public class CheckModelSeriesListController {
@ApiOperation(value = "|queryCheckModelSeriesListByPage|车型系结果列表分页查询")
@GetMapping(value = "/querySuccessCheckModelSeriesList")
public ResponseMessage querySuccessCheckModelSeriesList(CheckModelSeriesList checkModelSeriesList) {
checkModelSeriesList.setBase(UserUtil.getQyId());
Page page = new Page(checkModelSeriesList.getPage(), checkModelSeriesList.getPageSize());
if (StringUtils.isNotEmpty(checkModelSeriesList.getVehicleType())) {
checkModelSeriesList.setVehicleType(checkModelSeriesList.getVehicleType().toUpperCase());
......@@ -262,6 +265,7 @@ public class CheckModelSeriesListController {
@ApiOperation(value = "|queryCheckModelSeriesListByPage|车型系列表复核分页查询")
@GetMapping(value = "/queryReviewCheckModelSeriesList")
public ResponseMessage queryReviewCheckModelSeriesList(CheckModelSeriesList checkModelSeriesList) {
checkModelSeriesList.setBase(UserUtil.getQyId());
Page page = new Page(checkModelSeriesList.getPage(), checkModelSeriesList.getPageSize());
if (StringUtils.isNotEmpty(checkModelSeriesList.getVehicleType())) {
checkModelSeriesList.setVehicleType(checkModelSeriesList.getVehicleType().toUpperCase());
......
adcbs-check/src/main/java/com/adc/da/system/controller/CheckObdController.java
View file @ 166d4e51
......@@ -8,6 +8,7 @@ import com.adc.da.system.service.impl.CheckObdOrgServiceImpl;
import com.adc.da.base.web.BaseController;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import com.adc.da.util.utils.UserUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
......@@ -57,6 +58,7 @@ public class CheckObdController extends BaseController {
@GetMapping("/getListInfo")
public ResponseMessage getListInfo(Integer page, Integer limit,String obdName,String operator,String base,
String sort, String isAsc,String type,String userBase,String startTime,String endTime){
base = UserUtil.getQyId();
return Result.success("200","查询成功",checkObdService.queryCheckObd(page,limit,obdName,operator,
base,sort,isAsc,type,userBase,startTime,endTime));
}
......@@ -88,6 +90,7 @@ public class CheckObdController extends BaseController {
@ApiOperation(value = "添加OBD")
@PostMapping("/insertObd")
public ResponseMessage insertObd(@RequestBody CheckObd checkObd){
checkObd.setBase(UserUtil.getQyId());
return Result.success("200","添加成功",checkObdService.insertObd(checkObd));
}
......@@ -164,6 +167,7 @@ public class CheckObdController extends BaseController {
@ApiOperation(value = "根据事业部id查询模板")
@GetMapping("/selectMouldByBase")
public ResponseMessage selectMouldByBase(String baseId, String mouldType,String standType){
baseId = UserUtil.getQyId();
return Result.success("200","查询成功",checkObdService.selectMouldByBase(baseId,mouldType,standType));
}
......
adcbs-check/src/main/java/com/adc/da/system/dao/CheckBulletinDataParameterMapper.java 0 → 100644
View file @ 166d4e51
package com.adc.da.system.dao;
import com.adc.da.dto.resDTO.CheckMenuManagementResDTO;
import com.adc.da.system.entity.CheckBulletinDataParameter;
import com.adc.da.system.entity.CheckCheckMenuManagement;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author jobob
* @since 2019-09-26
*/
public interface CheckBulletinDataParameterMapper extends BaseMapper<CheckBulletinDataParameter> {
/**
* 查询所有公告参数和备案参数
*/
List<CheckMenuManagementResDTO> getNoticeParameter(@Param("parameterCode") String parameterCode
, @Param("parameterName") String parameterName);
/**
*
* @param id
* @return
*/
// List<KeyPartsCheckList> getPartFormCheck(@Param("id") String id);
/**
*
* @param id
* @param parameterCode
* @param parameterName
* @return
*/
List<CheckBulletinDataParameter> selectRegList(@Param("id") String id, @Param("parameterCode") String parameterCode,
@Param("parameterName") String parameterName);
/**
*
* @param id
* @param parameterCode
* @param parameterName
* @return
*/
List<CheckBulletinDataParameter> selectGgList(@Param("id") String id, @Param("parameterCode") String parameterCode,
@Param("parameterName") String parameterName);
void updateIsNotEqual(@Param("newId") String id, @Param("oldId") String oldId);
List<CheckBulletinDataParameter> getOldData(@Param("newId") String id, @Param("oldId") String oldId);
List<String> selectIsNotEqual(@Param("newId") String id, @Param("oldId") String oldId);
List<CheckBulletinDataParameter> getRegListByCarId(String id);
List<CheckCheckMenuManagement> getAllGgParameter();
}
adcbs-check/src/main/java/com/adc/da/system/dao/CheckCertificateInfoDetailDao.java
View file @ 166d4e51
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 java.util.List;
/**
* mapper
*/
public interface CheckCertificateInfoDetailDao extends BaseMapper<CheckCertificateInfoDetail> {
List<CdVehicles> getClcpZk(String carTypeCode,String group);
}
adcbs-check/src/main/java/com/adc/da/system/dao/CheckCertificateMainInfoDao.java
View file @ 166d4e51
......@@ -29,6 +29,10 @@ public interface CheckCertificateMainInfoDao extends BaseMapper<CheckCertificate
*/
int getCount(CertificateReqDTO certificatePage);
String getMaxVehicleGroup();
List<CheckCertificateMainInfo> getClcpZk(String vehicleGroup);
// /**
// * 根据车型编号查询油耗数据
// * @param carTypeCode
......
adcbs-check/src/main/java/com/adc/da/system/entity/CheckCertificateMainInfo.java
View file @ 166d4e51
......@@ -75,6 +75,11 @@ public class CheckCertificateMainInfo extends BaseEntity {
*/
@TableField("OPERATOR")
private String operator;
/**
* 企业ID
*/
@TableField("BASE_ID")
private String baseId;
}
adcbs-check/src/main/java/com/adc/da/system/service/ICheckBulletinDataParameterService.java 0 → 100644
View file @ 166d4e51
package com.adc.da.system.service;
import com.adc.da.system.entity.CheckBulletinDataParameter;
import com.adc.da.system.entity.CheckCheckMenuManagement;
import com.adc.da.util.http.ResponseMessage;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author jobob
* @since 2019-09-26
*/
public interface ICheckBulletinDataParameterService extends IService<CheckBulletinDataParameter> {
/**
* 获取公告参数或者附表参数
*
* @param id 公告的ID
* @param type 参数类型
* @param parameterCode
* @param parameterName
* @return
*/
List getListByBulletinIdAndType(String id, String type, String parameterCode, String parameterName);
/**
* 模糊查询所有公告参数
*
* @param parameterCode 参数编号
* @param parameterName 参数名称
* @return
*/
ResponseMessage getNoticeParameter(String obdId, String parameterCode, String parameterName);
/**
* 根据批次删除公告参数
*
* @param ids 该批次的公告ID 集合
*/
void delByGroup(List<String> ids);
/**
*
* @param id
* @param parameterCode
* @param parameterName
* @param page
* @param limit
* @return
*/
IPage<CheckBulletinDataParameter> getNotEqualList(String id, String parameterCode, String parameterName, int page,
int limit);
/**
*
* @param id
* @return
*/
// List<CheckBulletinDataChange> getAllNotEqualListByCarId(String id, String parameterCode, String parameterName,
// String type);
void updateIsNotEqual(String id, String oldId);
List<CheckBulletinDataParameter> getOldData(String id, String oldId);
List<String> selectIsNotEqual(String id, String oldId);
List<CheckBulletinDataParameter> getRegListByCarId(String id);
List<CheckCheckMenuManagement> getAllGgParameter();
}
adcbs-check/src/main/java/com/adc/da/system/service/ICheckCertificateMainInfoService.java
View file @ 166d4e51
package com.adc.da.system.service;
import com.adc.da.dto.ocr.CertificateEO;
import com.adc.da.dto.reqDTO.CertificateReqDTO;
import com.adc.da.dto.reqDTO.DataCheckReqDTO;
import com.adc.da.dto.resDTO.CertificateResDTO;
......@@ -65,8 +66,8 @@ public interface ICheckCertificateMainInfoService extends IService<CheckCertific
* @param group 批次
* @return
*/
// ResponseMessage certificateDataCheck(CertificateEO certificateEO, String type, String carTypeCode,
// String id, String group);
ResponseMessage certificateDataCheck(CertificateEO certificateEO, String type, String carTypeCode,
String id, String group);
/**
* COC数据一致性对比
......
adcbs-check/src/main/java/com/adc/da/system/service/impl/CheckBulletinDataParameterServiceImpl.java 0 → 100644
View file @ 166d4e51
package com.adc.da.system.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.adc.da.dto.resDTO.CheckMenuManagementResDTO;
import com.adc.da.system.dao.CheckBulletinDataParameterMapper;
import com.adc.da.system.entity.CheckBulletinDataParameter;
import com.adc.da.system.entity.CheckCheckMenuManagement;
import com.adc.da.system.service.ICheckBulletinDataParameterService;
import com.adc.da.system.service.ICheckCheckMenuManagementService;
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.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* <p>
* 服务实现类
* </p>
*
* @author jobob
* @since 2019-09-26
*/
@Service
public class CheckBulletinDataParameterServiceImpl
extends ServiceImpl<CheckBulletinDataParameterMapper, CheckBulletinDataParameter>
implements ICheckBulletinDataParameterService {
private static final String CAR_ID = "CAR_ID";
private static final String PARAMETER_SEQ = "PARAMETER_SEQ";
@Autowired
private ICheckCheckMenuManagementService iCheckCheckMenuManagementService;
// @Autowired
// private ICheckBulletinDataChangeService iCheckBulletinDataChangeService;
@Override
public List getListByBulletinIdAndType(String id, String type, String parameterCode, String parameterName) {
if ("1".equals(type)) {
return baseMapper.selectRegList(id, parameterCode, parameterName);
}
if ("0".equals(type)) {
return baseMapper.selectGgList(id, parameterCode, parameterName);
}
return new ArrayList();
}
@Override
public ResponseMessage getNoticeParameter(String obdId,String parameterCode, String parameterName) {
List<CheckMenuManagementResDTO> list = baseMapper.getNoticeParameter(parameterCode, parameterName);
List<CheckCheckMenuManagement> trueList = iCheckCheckMenuManagementService.queryMenuInfoByObdid(obdId);
trueList.removeAll(Collections.singleton(null));
List<String> codeList = new ArrayList<>();
if (!CollectionUtil.isEmpty(trueList)) {
for (int i = 0;i<trueList.size();i++){
codeList.add(trueList.get(i).getParameterCodeOne());
}
}
for (CheckMenuManagementResDTO checkMenuManagementResDTO : list) {
if (codeList.contains(checkMenuManagementResDTO.getParameterCodeOne())) {
checkMenuManagementResDTO.setParameterState("0");
} else {
checkMenuManagementResDTO.setParameterState("1");
}
}
return Result.success(list);
}
@Override
public void delByGroup(List<String> ids) {
QueryWrapper wrapper = new QueryWrapper();
wrapper.in(CAR_ID, ids);
wrapper.eq("PARAMETER_TYPE","1");
baseMapper.delete(wrapper);
}
@Override
public IPage<CheckBulletinDataParameter> getNotEqualList(String id, String parameterCode, String parameterName,
int page, int limit) {
IPage page1 = new Page(page, limit);
QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("IS_EQUAL", "1");
wrapper.eq(CAR_ID, id);
if (StringUtils.isNotEmpty(parameterCode)) {
wrapper.like(PARAMETER_SEQ, parameterCode);
}
if (StringUtils.isNotEmpty(parameterName)) {
wrapper.like("PARAMETER_NAME", parameterName);
}
wrapper.isNotNull(PARAMETER_SEQ);
return this.page(page1, wrapper);
}
// @Override
// public List<CheckBulletinDataChange> getAllNotEqualListByCarId(String id, String parameterCode,
// String parameterName,String type) {
// QueryWrapper<CheckBulletinDataChange> wrapper = new QueryWrapper<CheckBulletinDataChange>();
// wrapper.eq("CD_VEHICLE_CHANGE_ID", id);
// if (StringUtils.isNotBlank(parameterCode)) {
// wrapper.like(PARAMETER_SEQ, parameterCode);
// }
// if (StringUtils.isNotBlank(parameterName)) {
// wrapper.like("PARAMETER_NAME", parameterName);
// }
// wrapper.isNotNull(PARAMETER_SEQ);
// if ("1".equals(type)) {
// wrapper.inSql(PARAMETER_SEQ," SELECT PARAMETER_CODE FROM CHECK_CD_VEHICLE_DL_DETAILS WHERE PARAMETER_CODE IS NOT NULL ");
// }
// List<CheckBulletinDataChange> data = iCheckBulletinDataChangeService.list(wrapper);
// return data == null ? new ArrayList<>() : data;
// }
@Override
public void updateIsNotEqual(String id, String oldId) {
baseMapper.updateIsNotEqual(id, oldId);
}
@Override
public List<CheckBulletinDataParameter> getOldData(String id, String oldId) {
return baseMapper.getOldData(id,oldId);
}
@Override
public List<String> selectIsNotEqual(String id, String oldId) {
return baseMapper.selectIsNotEqual(id,oldId);
}
@Override
public List<CheckBulletinDataParameter> getRegListByCarId(String id) {
return baseMapper.getRegListByCarId(id);
}
@Override
public List<CheckCheckMenuManagement> getAllGgParameter() {
return baseMapper.getAllGgParameter();
}
}
adcbs-check/src/main/java/com/adc/da/util/UploadUtils.java
View file @ 166d4e51
......@@ -20,7 +20,7 @@ import java.util.Map;
* 暂存文件工具
*/
@RestController
@RequestMapping("/")
@RequestMapping("/api")
public class UploadUtils {
private static final Logger logger = LoggerFactory.getLogger(UploadUtils.class);
......
adcbs-check/src/main/resources/mybatis/mapper/system/CheckBulletinDataParameterMapper.xml 0 → 100644
View file @ 166d4e51
<?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.CheckBulletinDataParameterMapper">
<select id="getNoticeParameter" resultType="com.adc.da.dto.resDTO.CheckMenuManagementResDTO">
SELECT DISTINCT
gg.SEQ AS parameterCodeOne ,
gg.CNAME AS parameterName
FROM GGCAIN06.GGCSXM gg
WHERE 1=1
<if test="parameterCode != null and parameterCode != '' ">
AND gg.SEQ LIKE '%' || #{parameterCode}|| '%'
</if>
<if test="parameterName != null and parameterName != '' ">
AND gg.CNAME LIKE '%' || #{parameterName} || '%'
</if>
ORDER BY gg.SEQ
</select>
<!-- <select id="getPartFormCheck" resultType="com.adc.da.keypartsverificationlist.entity.KeyPartsCheckList">-->
<!-- SELECT-->
<!-- mm.PARAMETER_NAME AS partName ,-->
<!-- mm.parameter_value AS partNum ,-->
<!-- s.SUPPLIER_CODE AS officialData-->
<!-- FROM-->
<!-- ( SELECT c.CAR_ID as CAR_ID,-->
<!-- ck.PARAMETER_NAME as PARAMETER_NAME,-->
<!-- ck.PARAMETER_CODE_ONE as PARAMETER_CODE_ONE,-->
<!-- ck.PARAMETER_CODE_TWO as PARAMETER_CODE_TWO,-->
<!-- c.PARAMETER_VALUE as PARAMETER_VALUE-->
<!-- FROM-->
<!-- CHECK_BULLETIN_DATA_PARAMETER c-->
<!-- RIGHT JOIN CHECK_CHECK_MENU_KEY_PARTS ck ON (-->
<!-- c.PARAMETER_SEQ = CK.PARAMETER_CODE_TWO-->
<!-- )-->
<!-- WHERE-->
<!-- c.CAR_ID = #{id} ) mm-->
<!-- LEFT JOIN CHECK_BULLETIN_DATA_PARAMETER cc ON (-->
<!-- cc.PARAMETER_SEQ = mm.PARAMETER_CODE_one and cc.CAR_ID = MM.CAR_ID-->
<!-- )-->
<!-- LEFT JOIN CHECK_SUPPLIER s on (SUPPLIER_name = cc.PARAMETER_VALUE)-->
<!-- WHERE-->
<!-- mm.CAR_ID = #{id}-->
<!-- </select>-->
<select id="selectRegList" resultType="com.adc.da.system.entity.CheckBulletinDataParameter"
parameterType="string">
SELECT
PARAMETER_NAME AS name,
PARAMETER_SEQ AS seq,
PARAMETER_VALUE AS value,
"ID" AS id
FROM
CHECK_BULLETIN_DATA_PARAMETER
WHERE CAR_ID = #{id}
AND PARAMETER_TYPE = '1'
AND PARAMETER_VALUE IS NOT NULL
<if test="parameterCode != null and parameterCode != ''">
AND PARAMETER_SEQ LIKE '%'|| #{parameterCode} ||'%'
</if>
<if test="parameterName != null and parameterName != ''">
AND PARAMETER_NAME LIKE '%'|| #{parameterName} ||'%'
</if>
ORDER BY substr(PARAMETER_SEQ,'1','2'), "TO_NUMBER"( regexp_substr(PARAMETER_SEQ,'(\d+)') )
</select>
<select id="selectGgList" resultType="com.adc.da.system.entity.CheckBulletinDataParameter">
SELECT * FROM (
SELECT
PARAMETER_NAME AS name,
PARAMETER_SEQ AS seq,
PARAMETER_VALUE AS value,
"ID" AS id
FROM
CHECK_BULLETIN_DATA_PARAMETER
WHERE
CAR_ID = #{id}
AND PARAMETER_TYPE = '0'
<if test="parameterCode != null and parameterCode != ''">
AND PARAMETER_SEQ LIKE '%'|| #{parameterCode} ||'%'
</if>
<if test="parameterName != null and parameterName != ''">
AND PARAMETER_NAME LIKE '%'|| #{parameterName} ||'%'
</if>AND PARAMETER_NAME NOT IN (
'后部照片',
'右部照片',
'侧、后下部防护装置的组合照片',
'选装部件1',
'选装部件2',
'选装部件3')
ORDER BY
PARAMETER_SEQ
)
UNION ALL
SELECT *
FROM (
SELECT
PARAMETER_NAME AS name,
PARAMETER_SEQ AS seq,
PARAMETER_VALUE AS value,
"ID" AS id
FROM
CHECK_BULLETIN_DATA_PARAMETER
WHERE
CAR_ID = #{id}
AND PARAMETER_TYPE = '0'
<if test="parameterCode != null and parameterCode != ''">
AND PARAMETER_SEQ LIKE '%'|| #{parameterCode} ||'%'
</if>
<if test="parameterName != null and parameterName != ''">
AND PARAMETER_NAME LIKE '%'|| #{parameterName} ||'%'
</if>
AND PARAMETER_NAME IN (
'后部照片',
'右部照片',
'侧、后下部防护装置的组合照片',
'选装部件1',
'选装部件2',
'选装部件3')
ORDER BY PARAMETER_NAME)
</select>
<update id="updateIsNotEqual">
update CHECK_BULLETIN_DATA_PARAMETER set IS_EQUAL = '1' where id in (
SELECT
SS.ID
FROM
(
SELECT
*
FROM
CHECK_BULLETIN_DATA_PARAMETER
WHERE
CAR_ID = #{newId}
AND PARAMETER_SEQ IS NOT NULL
) SS
LEFT JOIN (
SELECT
*
FROM
CHECK_BULLETIN_DATA_PARAMETER
WHERE
CAR_ID = #{oldId}
AND PARAMETER_SEQ IS NOT NULL
) CC ON (
SS.PARAMETER_SEQ = CC.PARAMETER_SEQ AND SS.PARAMETER_NAME = CC.PARAMETER_NAME
)
WHERE SS.PARAMETER_VALUE != CC.PARAMETER_VALUE
OR (
SS.PARAMETER_VALUE IS NULL
AND CC.PARAMETER_VALUE IS NOT NULL
)
OR (
CC.PARAMETER_VALUE IS NULL
AND SS.PARAMETER_VALUE IS NOT NULL
)
)
</update>
<select id="getOldData" parameterType="string"
resultType="com.adc.da.system.entity.CheckBulletinDataParameter">
SELECT AA.PARAMETER_VALUE AS oldData,
BB.ID AS ID,
BB.CAR_ID AS carId,
BB.IS_EQUAL AS isEqual,
BB.PARAMETER_SEQ AS seq,
BB.PARAMETER_NAME as name,
BB.PARAMETER_TYPE as parameterType,
BB.PARAMETER_VALUE AS value,
BB.TYPE AS type
FROM (SELECT * FROM CHECK_BULLETIN_DATA_PARAMETER WHERE CAR_ID = #{oldId}) AA
right JOIN (SELECT * FROM CHECK_BULLETIN_DATA_PARAMETER WHERE CAR_ID = #{newId} AND IS_EQUAL = '1') BB
ON (AA.PARAMETER_SEQ = BB.PARAMETER_SEQ)
</select>
<select id="selectIsNotEqual" resultType="string" parameterType="string">
SELECT
SS.ID
FROM
(
SELECT
*
FROM
CHECK_BULLETIN_DATA_PARAMETER
WHERE
CAR_ID = #{newId}
AND PARAMETER_SEQ IS NOT NULL
) SS
LEFT JOIN (
SELECT
*
FROM
CHECK_BULLETIN_DATA_PARAMETER
WHERE
CAR_ID = #{oldId}
AND PARAMETER_SEQ IS NOT NULL
) CC ON (
SS.PARAMETER_SEQ = CC.PARAMETER_SEQ AND SS.PARAMETER_NAME = CC.PARAMETER_NAME
)
WHERE (SS.PARAMETER_VALUE != CC.PARAMETER_VALUE
OR (
SS.PARAMETER_VALUE IS NULL
AND CC.PARAMETER_VALUE IS NOT NULL
)
OR (
CC.PARAMETER_VALUE IS NULL
AND SS.PARAMETER_VALUE IS NOT NULL
))
AND SS.PARAMETER_SEQ IN (SELECT PARAMETER_CODE FROM CHECK_CD_VEHICLE_DL_DETAILS)
</select>
<select id="getRegListByCarId" resultType="com.adc.da.system.entity.CheckBulletinDataParameter" parameterType="string">
SELECT
PARAMETER_SEQ AS seq,
PARAMETER_NAME AS name,
PARAMETER_VALUE AS value,
CAR_ID AS carId,
PARAMETER_TYPE AS parameterType
FROM CHECK_BULLETIN_DATA_PARAMETER WHERE CAR_ID = #{id}
</select>
<select id="getAllGgParameter" resultType="com.adc.da.system.entity.CheckCheckMenuManagement">
SELECT DISTINCT PARAMETER_SEQ AS PARAMETER_CODE_ONE,
PARAMETER_NAME AS PARAMETER_NAME
FROM CHECK_BULLETIN_DATA_PARAMETER
WHERE PARAMETER_SEQ IS NOT NULL order BY PARAMETER_SEQ
</select>
</mapper>
adcbs-check/src/main/resources/mybatis/mapper/system/CheckCertificateInfoDetailDao.xml 0 → 100644
View file @ 166d4e51
<?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.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>
</mapper>
adcbs-check/src/main/resources/mybatis/mapper/system/CheckCheckMenuManagementMapper.xml
View file @ 166d4e51
......@@ -4,7 +4,7 @@
<update id="updateMenuParameterStateByObdid">
UPDATE
CHECK_CHECK_MENU
NERDS.CHECK_CHECK_MENU
SET PARAMETER_STATE = 1
WHERE
(
......@@ -56,8 +56,8 @@
</trim>
from CHECK_DETAIL_OBD
left JOIN
CHECK_CHECK_MENU
on DETAIL_ID = CHECK_CHECK_MENU.id
NERDS.CHECK_CHECK_MENU ccm
on DETAIL_ID = ccm.id
where OBD_ID = #{obdId}
</select>
<select id="queryObdDetailInfoByObdid" resultType="com.adc.da.system.entity.CheckObdDetail">
......
adcbs-check/src/main/resources/mybatis/mapper/system/CheckDataCheckResultMapper.xml
View file @ 166d4e51
......@@ -4,7 +4,7 @@
<select id="selectCheckOkDetail" resultType="string" parameterType="string">
SELECT DISTINCT CHECK_TYPE
FROM CHECK_DATA_CHECK_RESULT
FROM NERDS.CHECK_DATA_CHECK_RESULT
WHERE CHECK_CERTIFICATE_MAIN_INFO_ID = #{id}
</select>
<select id="getListInfo" resultType="com.adc.da.dto.resDTO.CheckResultFalseResDTO">
......@@ -29,7 +29,7 @@
END as bookName
FROM
CHECK_CERTIFICATE_MAIN_INFO CCMI
LEFT JOIN CHECK_DATA_CHECK_RESULT CDCR ON (
LEFT JOIN NERDS.CHECK_DATA_CHECK_RESULT CDCR ON (
CCMI."ID" = CDCR.CHECK_CERTIFICATE_MAIN_INFO_ID
)
left join CHECK_CD_VEHICLE ccv
......@@ -85,7 +85,7 @@
CCMI.CHECK_DATE AS checkTime
FROM
CHECK_CERTIFICATE_MAIN_INFO CCMI
LEFT JOIN CHECK_DATA_CHECK_RESULT CDCR ON (
LEFT JOIN NERDS.CHECK_DATA_CHECK_RESULT CDCR ON (
CCMI."ID" = CDCR.CHECK_CERTIFICATE_MAIN_INFO_ID
)
left join CHECK_CD_VEHICLE ccv
......
adcbs-check/src/main/resources/mybatis/mapper/system/CheckModelSeriesListDao.xml
View file @ 166d4e51
......@@ -9,27 +9,26 @@
(
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,
t1.USNAME as carOperatorName
-- 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
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
left join TS_USER t1 on t1.USID = cmsl.CAR_OPERATOR
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 (( (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=")">
......@@ -53,15 +52,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,ID
......
adcbs-check/src/main/resources/mybatis/mapper/system/CheckObdMapper.xml
View file @ 166d4e51
......@@ -38,7 +38,7 @@
and TO_CHAR(EEP.created_time,'YYYY-MM-DD') &gt;= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
and TO_CHAR(EEP.created_time,'YYYY-MM-DD') &lt;= #{expeEstProjectVO.createTimeEnd}
and TO_CHAR(EEP.created_time,'YYYY-MM-DD') &lt;= #{endTime}
</if>
<if test="list.size() !=0">
AND t1.ID IN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment