Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
ADC-uniformity
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
凡昌松
ADC-uniformity
Commits
bd9ddbdd
Commit
bd9ddbdd
authored
Dec 02, 2021
by
qk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MybatisPlus单表增删改查,表前面添加库名.
parent
166d4e51
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
78 additions
and
75 deletions
+78
-75
CheckRealVehicleVerificationController.java
...em/controller/CheckRealVehicleVerificationController.java
+14
-8
CdVehicles.java
...ck/src/main/java/com/adc/da/system/entity/CdVehicles.java
+1
-1
CheckBulletinDataParameter.java
.../com/adc/da/system/entity/CheckBulletinDataParameter.java
+1
-1
CheckCerAndDetail.java
...main/java/com/adc/da/system/entity/CheckCerAndDetail.java
+1
-1
CheckCertificateInfoDetail.java
.../com/adc/da/system/entity/CheckCertificateInfoDetail.java
+1
-1
CheckCertificateMainInfo.java
...va/com/adc/da/system/entity/CheckCertificateMainInfo.java
+1
-1
CheckCheckMenuManagement.java
...va/com/adc/da/system/entity/CheckCheckMenuManagement.java
+1
-1
CheckDataCheckResult.java
...n/java/com/adc/da/system/entity/CheckDataCheckResult.java
+1
-1
CheckDetailObd.java
...rc/main/java/com/adc/da/system/entity/CheckDetailObd.java
+1
-1
CheckModelSeriesList.java
...n/java/com/adc/da/system/entity/CheckModelSeriesList.java
+1
-1
CheckModelSeriesListResult.java
.../com/adc/da/system/entity/CheckModelSeriesListResult.java
+1
-1
CheckObd.java
...heck/src/main/java/com/adc/da/system/entity/CheckObd.java
+1
-1
CheckObdDetail.java
...rc/main/java/com/adc/da/system/entity/CheckObdDetail.java
+1
-1
CheckObdOrg.java
...k/src/main/java/com/adc/da/system/entity/CheckObdOrg.java
+1
-1
CheckRealVehicleVerResult.java
...a/com/adc/da/system/entity/CheckRealVehicleVerResult.java
+1
-1
CheckRealVehicleVerification.java
...om/adc/da/system/entity/CheckRealVehicleVerification.java
+1
-1
CheckVehicleAndSeries.java
.../java/com/adc/da/system/entity/CheckVehicleAndSeries.java
+1
-1
CheckVehicleCheckMenu.java
.../java/com/adc/da/system/entity/CheckVehicleCheckMenu.java
+1
-1
VehicleDatabase.java
...c/main/java/com/adc/da/system/entity/VehicleDatabase.java
+1
-1
VehicleDatabaseDetails.java
...java/com/adc/da/system/entity/VehicleDatabaseDetails.java
+1
-1
ICheckRealVehicleVerificationService.java
.../system/service/ICheckRealVehicleVerificationService.java
+1
-1
CheckObdServiceImpl.java
...a/com/adc/da/system/service/impl/CheckObdServiceImpl.java
+9
-9
CheckRealVehicleVerificationImpl.java
...system/service/impl/CheckRealVehicleVerificationImpl.java
+9
-8
CheckCheckMenuManagementMapper.xml
.../mybatis/mapper/system/CheckCheckMenuManagementMapper.xml
+1
-1
CheckObdMapper.xml
...c/main/resources/mybatis/mapper/system/CheckObdMapper.xml
+20
-20
CheckRealVehicleVerificationDao.xml
...mybatis/mapper/system/CheckRealVehicleVerificationDao.xml
+5
-9
No files found.
adcbs-check/src/main/java/com/adc/da/system/controller/CheckRealVehicleVerificationController.java
View file @
bd9ddbdd
package
com
.
adc
.
da
.
system
.
controller
;
import
com.adc.da.system.entity.CheckRealVehicleVerification
;
import
com.adc.da.system.service.ICheckRealVehicleVerificationService
;
import
com.adc.da.util.http.ResponseMessage
;
import
com.adc.da.util.http.Result
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
...
...
@@ -29,8 +35,8 @@ public class CheckRealVehicleVerificationController {
// /**
// * 实车
// */
//
@Autowired
//
private ICheckRealVehicleVerificationService checkRealVehicleVerificationService;
@Autowired
private
ICheckRealVehicleVerificationService
checkRealVehicleVerificationService
;
//
// @Autowired
// private ICheckModelSeriesListService iCheckModelSeriesListService;
...
...
@@ -328,12 +334,12 @@ public class CheckRealVehicleVerificationController {
// return Result.success("200","修改成功",checkRealVehicleVerificationService.updateCheckModelSeries(checkRealVehicleVerificationDto));
// }
//
//
@ApiOperation(value = "待解决核查分页查询")
//
@GetMapping("/getCheckRealVehicleVerPage")
//
public ResponseMessage getCheckRealVehicleVerPage(CheckRealVehicleVerification checkRealVehicleVer) throws Exception {
//
return Result.success("200","待解决核查分页查询",
//
checkRealVehicleVerificationService.getCheckRealVehicleVerPage(checkRealVehicleVer));
//
}
@ApiOperation
(
value
=
"待解决核查分页查询"
)
@GetMapping
(
"/getCheckRealVehicleVerPage"
)
public
ResponseMessage
getCheckRealVehicleVerPage
(
CheckRealVehicleVerification
checkRealVehicleVer
)
throws
Exception
{
return
Result
.
success
(
"200"
,
"待解决核查分页查询"
,
checkRealVehicleVerificationService
.
getCheckRealVehicleVerPage
(
checkRealVehicleVer
));
}
//
// /**
// * 导出
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CdVehicles.java
View file @
bd9ddbdd
...
...
@@ -13,7 +13,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_CD_VEHICLE"
)
@TableName
(
"
NERDS.
CHECK_CD_VEHICLE"
)
public
class
CdVehicles
extends
BaseEntity
{
@TableField
(
"DL_CHANGE"
)
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckBulletinDataParameter.java
View file @
bd9ddbdd
...
...
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_BULLETIN_DATA_PARAMETER"
)
@TableName
(
"
NERDS.
CHECK_BULLETIN_DATA_PARAMETER"
)
public
class
CheckBulletinDataParameter
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckCerAndDetail.java
View file @
bd9ddbdd
...
...
@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_CER_AND_DETAIL"
)
@TableName
(
"
NERDS.
CHECK_CER_AND_DETAIL"
)
public
class
CheckCerAndDetail
extends
BaseEntity
{
/**
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckCertificateInfoDetail.java
View file @
bd9ddbdd
...
...
@@ -21,7 +21,7 @@ import java.util.List;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_CERTIFICATE_INFO_DETAIL"
)
@TableName
(
"
NERDS.
CHECK_CERTIFICATE_INFO_DETAIL"
)
public
class
CheckCertificateInfoDetail
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckCertificateMainInfo.java
View file @
bd9ddbdd
...
...
@@ -22,7 +22,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_CERTIFICATE_MAIN_INFO"
)
@TableName
(
"
NERDS.
CHECK_CERTIFICATE_MAIN_INFO"
)
public
class
CheckCertificateMainInfo
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckCheckMenuManagement.java
View file @
bd9ddbdd
...
...
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_CHECK_MENU"
)
@TableName
(
"
NERDS.
CHECK_CHECK_MENU"
)
public
class
CheckCheckMenuManagement
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckDataCheckResult.java
View file @
bd9ddbdd
...
...
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_DATA_CHECK_RESULT"
)
@TableName
(
"
NERDS.
CHECK_DATA_CHECK_RESULT"
)
public
class
CheckDataCheckResult
extends
BaseEntity
{
public
CheckDataCheckResult
(
String
id
,
String
checkCertificateMainInfoId
,
String
paramName
,
String
checkResult
,
String
checkType
,
String
checkData
,
String
checkFormData
)
{
this
.
id
=
id
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckDetailObd.java
View file @
bd9ddbdd
...
...
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_DETAIL_OBD"
)
@TableName
(
"
NERDS.
CHECK_DETAIL_OBD"
)
public
class
CheckDetailObd
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckModelSeriesList.java
View file @
bd9ddbdd
...
...
@@ -21,7 +21,7 @@ import java.util.List;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_MODEL_SERIES_LIST"
)
@TableName
(
"
NERDS.
CHECK_MODEL_SERIES_LIST"
)
public
class
CheckModelSeriesList
extends
BaseReqPageEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckModelSeriesListResult.java
View file @
bd9ddbdd
...
...
@@ -24,7 +24,7 @@ import java.util.List;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_MODEL_SERIES_LIST_RESULT"
)
@TableName
(
"
NERDS.
CHECK_MODEL_SERIES_LIST_RESULT"
)
@ExcelTarget
(
"CheckModelSeriesListResult"
)
public
class
CheckModelSeriesListResult
extends
BaseReqPageEntity
{
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckObd.java
View file @
bd9ddbdd
...
...
@@ -23,7 +23,7 @@ import java.util.List;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_OBD"
)
@TableName
(
"
NERDS.
CHECK_OBD"
)
public
class
CheckObd
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckObdDetail.java
View file @
bd9ddbdd
...
...
@@ -22,7 +22,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_OBD_DETAIL"
)
@TableName
(
"
NERDS.
CHECK_OBD_DETAIL"
)
public
class
CheckObdDetail
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckObdOrg.java
View file @
bd9ddbdd
...
...
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_OBD_ORG"
)
@TableName
(
"
NERDS.
CHECK_OBD_ORG"
)
public
class
CheckObdOrg
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckRealVehicleVerResult.java
View file @
bd9ddbdd
...
...
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_REAL_VEHICLE_VER_RESULT"
)
@TableName
(
"
NERDS.
CHECK_REAL_VEHICLE_VER_RESULT"
)
public
class
CheckRealVehicleVerResult
extends
BaseReqPageEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckRealVehicleVerification.java
View file @
bd9ddbdd
...
...
@@ -16,7 +16,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_REAL_VEHICLE_VER"
)
@TableName
(
"
NERDS.
CHECK_REAL_VEHICLE_VER"
)
public
class
CheckRealVehicleVerification
extends
BaseReqPageEntity
{
/**
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckVehicleAndSeries.java
View file @
bd9ddbdd
...
...
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_VEHICLE_AND_SERIES"
)
@TableName
(
"
NERDS.
CHECK_VEHICLE_AND_SERIES"
)
public
class
CheckVehicleAndSeries
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/CheckVehicleCheckMenu.java
View file @
bd9ddbdd
...
...
@@ -15,7 +15,7 @@ import java.util.List;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_VEHICLE_CHECK_MENU"
)
@TableName
(
"
NERDS.
CHECK_VEHICLE_CHECK_MENU"
)
public
class
CheckVehicleCheckMenu
extends
BaseReqPageEntity
{
/**
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/VehicleDatabase.java
View file @
bd9ddbdd
...
...
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_VEHICLE_DATABASE"
)
@TableName
(
"
NERDS.
CHECK_VEHICLE_DATABASE"
)
public
class
VehicleDatabase
extends
BaseReqPageEntity
{
/**
...
...
adcbs-check/src/main/java/com/adc/da/system/entity/VehicleDatabaseDetails.java
View file @
bd9ddbdd
...
...
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"CHECK_VEHICLE_DATABASE_DETAILS"
)
@TableName
(
"
NERDS.
CHECK_VEHICLE_DATABASE_DETAILS"
)
public
class
VehicleDatabaseDetails
extends
BaseReqPageEntity
{
/**
...
...
adcbs-check/src/main/java/com/adc/da/system/service/ICheckRealVehicleVerificationService.java
View file @
bd9ddbdd
...
...
@@ -58,7 +58,7 @@ public interface ICheckRealVehicleVerificationService extends IService<CheckReal
Integer
updateCheckRealVehicleVer
(
CheckRealVehicleVerification
checkRealVehicleVer
);
//
IPage<CheckRealVehicleVerification> getCheckRealVehicleVerPage(CheckRealVehicleVerification checkRealVehicleVer) throws Exception;
IPage
<
CheckRealVehicleVerification
>
getCheckRealVehicleVerPage
(
CheckRealVehicleVerification
checkRealVehicleVer
)
throws
Exception
;
List
<
RVVObdDTO
>
getCheckRealVehicleVer
(
List
<
String
>
ids
,
String
checkType
,
String
handleType
,
String
parameterName
);
List
<
ScanCodeDTO
>
getCheckRealVehicleVer1
(
List
<
String
>
ids
,
String
checkType
,
String
handleType
,
String
parameterName
);
...
...
adcbs-check/src/main/java/com/adc/da/system/service/impl/CheckObdServiceImpl.java
View file @
bd9ddbdd
...
...
@@ -79,15 +79,15 @@ public class CheckObdServiceImpl extends ServiceImpl<CheckObdMapper, CheckObd> i
isAsc
=
""
;
}
List
<
String
>
list
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotBlank
(
base
)){
list
=
checkObdMapper
.
selectObd
(
base
);
if
(
list
.
size
()
==
0
){
IPage
<
CheckObd
>
checkObdIPage
=
iPage
;
checkObdIPage
.
setTotal
(
0
);
checkObdIPage
.
setRecords
(
new
ArrayList
<>());
return
checkObdIPage
;
}
}
//
if(StringUtils.isNotBlank(base)){
//
list = checkObdMapper.selectObd(base);
//
if(list.size() == 0){
//
IPage<CheckObd> checkObdIPage = iPage;
//
checkObdIPage.setTotal(0);
//
checkObdIPage.setRecords(new ArrayList<>());
//
return checkObdIPage;
//
}
//
}
List
<
String
>
userBaseForList
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotBlank
(
userBase
)){
userBaseForList
=
checkObdMapper
.
selectObd
(
userBase
);
...
...
adcbs-check/src/main/java/com/adc/da/system/service/impl/CheckRealVehicleVerificationImpl.java
View file @
bd9ddbdd
...
...
@@ -8,6 +8,7 @@ import com.adc.da.dto.reqDTO.RVVObdDTO;
import
com.adc.da.dto.reqDTO.RegulationsDTO
;
import
com.adc.da.dto.reqDTO.ScanCodeDTO
;
import
com.adc.da.dto.resDTO.CheckRealVehicleVerificationDTO
;
import
com.adc.da.sys.entity.UserEO
;
import
com.adc.da.system.dao.CheckRealVehicleVerificationDao
;
import
com.adc.da.system.entity.CheckModelSeriesList
;
import
com.adc.da.system.entity.CheckRealVehicleVerAndMoedelSeriesList
;
...
...
@@ -1177,11 +1178,11 @@ public class CheckRealVehicleVerificationImpl
return
baseMapper
.
updateById
(
checkRealVehicleVer
);
}
//
@Override
//
public IPage<CheckRealVehicleVerification> getCheckRealVehicleVerPage(CheckRealVehicleVerification checkRealVehicleVer) throws Exception {
//
Page page = new Page(checkRealVehicleVer.getPage(), checkRealVehicleVer.getPageSize());
//
IPage result = baseMapper.getCheckRealVehicleVerPage(page, checkRealVehicleVer);
//
List<CheckRealVehicleVerification> list = result.getRecords();
@Override
public
IPage
<
CheckRealVehicleVerification
>
getCheckRealVehicleVerPage
(
CheckRealVehicleVerification
checkRealVehicleVer
)
throws
Exception
{
Page
page
=
new
Page
(
checkRealVehicleVer
.
getPage
(),
checkRealVehicleVer
.
getPageSize
());
IPage
result
=
baseMapper
.
getCheckRealVehicleVerPage
(
page
,
checkRealVehicleVer
);
List
<
CheckRealVehicleVerification
>
list
=
result
.
getRecords
();
// for (CheckRealVehicleVerification checkRealVehicleVerification : list){
// CheckModelSeriesList checkModelSeriesList =
// checkModelSeriesListService.getById(checkRealVehicleVerification.getVehicleSeriesId());
...
...
@@ -1244,9 +1245,9 @@ public class CheckRealVehicleVerificationImpl
// }
//
// }
//
result.setRecords(list);
//
return result;
//
}
result
.
setRecords
(
list
);
return
result
;
}
@Override
public
List
<
RVVObdDTO
>
getCheckRealVehicleVer
(
List
<
String
>
ids
,
String
checkType
,
String
handleType
,
String
parameterName
)
{
...
...
adcbs-check/src/main/resources/mybatis/mapper/system/CheckCheckMenuManagementMapper.xml
View file @
bd9ddbdd
...
...
@@ -54,7 +54,7 @@
PARAMETER_STATE AS parameterState,
PARAMETER_CHECK_STATE AS parameterCheckState
</trim>
from CHECK_DETAIL_OBD
from
NERDS.
CHECK_DETAIL_OBD
left JOIN
NERDS.CHECK_CHECK_MENU ccm
on DETAIL_ID = ccm.id
...
...
adcbs-check/src/main/resources/mybatis/mapper/system/CheckObdMapper.xml
View file @
bd9ddbdd
...
...
@@ -7,23 +7,23 @@
t1.ID,
t1.OBD_NAME,
t1.MOULD_TYPE,
t2.ORG_NAME,
--
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 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
--
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}
...
...
@@ -35,10 +35,10 @@
AND t3.USNAME LIKE '%'||#{operator}||'%'
</if>
<if
test=
"startTime != null and startTime != ''"
>
and TO_CHAR(
EEP.created_time
,'YYYY-MM-DD')
>
= #{startTime}
and TO_CHAR(
t1.CREATION_TIME
,'YYYY-MM-DD')
>
= #{startTime}
</if>
<if
test=
"endTime != null and endTime != ''"
>
and TO_CHAR(
EEP.created_time
,'YYYY-MM-DD')
<
= #{endTime}
and TO_CHAR(
t1.CREATION_TIME
,'YYYY-MM-DD')
<
= #{endTime}
</if>
<if
test=
"list.size() !=0"
>
AND t1.ID IN
...
...
@@ -46,7 +46,7 @@
#{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
--
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>
...
...
@@ -78,7 +78,7 @@
SELECT
OBD_ID
FROM
CHECK_OBD_ORG
NERDS.
CHECK_OBD_ORG
WHERE
ORG_ID = #{base}
</select>
...
...
@@ -113,8 +113,8 @@
SELECT
COUNT(1)
FROM
CHECK_OBD
LEFT JOIN
CHECK_OBD_ORG ON CHECK_OBD.id =
CHECK_OBD_ORG.OBD_ID
NERDS.
CHECK_OBD
LEFT JOIN
NERDS.CHECK_OBD_ORG ON NERDS.CHECK_OBD.id = NERDS.
CHECK_OBD_ORG.OBD_ID
WHERE
ORG_ID IN
<foreach
collection=
"baseIds"
close=
")"
index=
"index"
item=
"item"
open=
"("
separator=
","
>
...
...
adcbs-check/src/main/resources/mybatis/mapper/system/CheckRealVehicleVerificationDao.xml
View file @
bd9ddbdd
...
...
@@ -156,22 +156,18 @@
<select
id=
"getCheckRealVehicleVerPage"
resultType=
"com.adc.da.system.entity.CheckRealVehicleVerification"
>
SELECT
t1.ID,t2.VEHICLE_SERIES,t1.VEHICLE_SERIES_ID,t1.VEHICLE_TYPE,t1.PARAMETER_NAME,t1.PARAMETER,t1.DISCHARGE_STAGE,t1.TYPE,t1.RECORD_FAULT_CODE,
t1.HANDLE_TYPE,t1.CHECK_PICTURE_PATH_TWO,t1.REMARKS,t3.US
NAME,t2.CREATE_TIME,t4.ORG_NA
ME,t1.PROJECT,t1.REGULATORY_REQUIREMENTS,
t1.HANDLE_TYPE,t1.CHECK_PICTURE_PATH_TWO,t1.REMARKS,t3.US
ERNAME,t2.CREATE_TI
ME,t1.PROJECT,t1.REGULATORY_REQUIREMENTS,
t1.VEHICLE_TYPE_NAME,t1.STANDARD_NAME,t1.CHECK_RESULT,t1.CHECK_PICTURE_PATH,t1.PARAM_CONFIG
FROM
CHECK_REAL_VEHICLE_VER t1
NERDS.
CHECK_REAL_VEHICLE_VER t1
LEFT JOIN
CHECK_MODEL_SERIES_LIST t2
NERDS.
CHECK_MODEL_SERIES_LIST t2
ON t1.VEHICLE_SERIES_ID = t2.ID
LEFT JOIN
TS_USER t3
ON t3.USID = t2.OPERATOR
LEFT JOIN
TS_ORG t4
ON t2.BASE = t4.ID
RETRIEVAL.RET_USERS t3
ON t3.ID = t2.OPERATOR
WHERE
1=1
<if
test=
'checkRealVehicleVer.checkType == "3" '
>
AND t1.CHECK_TYPE is NULL
and t1.type = '3'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment