dbFiles = fileInfoMapper.selectTblFileInfoList(fileCond);
+ for (TblFileInfo file : dbFiles) {
+ String fileId = file.getId();
+ TblFileInfo dbFile = fileInfoMapper.selectTblFileInfoById(fileId);
+ String filePath1 = dbFile.getFilePath();
+ File file1 = new File(filePath1);
+ if (file1.exists()) {
+ //file1.delete();
+ if (file1.delete()) {
+ fileInfoMapper.deleteTblFileInfoById(fileId);
+ }
+ }
+
+ }
+ }
+ }
+ }
+
+ /**
+ * 插入插入tbl_car_order_formal_detail_info
+ * 插入tbl_car_order_formal_detail_his_info
+ *
+ * 更新tbl_car_order_formal_info car_count
+ * 插tbl_car_order_formal_his_info 表
+ *
+ * 插入tbl_car_inspect_info表
+ */
+ private TblCarInspectInfo getTblCarInspectInfo(String userId, String orderId, String carVin, String inspectFinishTime, String checkType, String siteId, Date now, TblCarOrderFormalInfo dbOrder, List cleanFlagList) {
+ // 如果是复检则提示报错
+ if (CheckTypeEnum.RE_INPECT.getCode().equals(checkType)) {
+ //throw new ServiceException("当前车辆不属于该委托单");
+ throw new ServiceException("VIN码为" + carVin + "的车辆不属于该委托单");
+ }
+ // 插入tbl_car_order_formal_detail_info
+ TblCarOrderFormalDetailInfo orderDetail = saveOrderFormalDetail(dbOrder, orderId, carVin, userId, now);
+ // 插入tbl_car_order_formal_detail_his_info
+ saveOrderFormalDetailHis(orderDetail);
+
+ // 更新主表 tbl_car_order_formal_info car_count
+ TblCarOrderFormalInfo orderFormal = orderFormalInfoMapper.selectTblCarOrderFormalInfoById(dbOrder.getId());
+ TblCarOrderFormalInfo updateOrder = new TblCarOrderFormalInfo();
+ updateOrder.setVersion(String.valueOf(Integer.valueOf(orderFormal.getVersion() + 1)));
+ updateOrder.setId(dbOrder.getId());
+ updateOrder.setCarCount(dbOrder.getCarCount() + 1);
+ updateOrder.setUpdateTime(now);
+ updateOrder.setUpdateUserId(userId);
+ orderFormalInfoMapper.updateTblCarOrderFormalInfo(updateOrder);
+ // 插tbl_car_order_formal_his_info 表
+ TblCarOrderFormalInfo dbNewOrderFormal = orderFormalInfoMapper.selectTblCarOrderFormalInfoById(dbOrder.getId());
+ saveCarOrderFormalHis(dbNewOrderFormal);
+
+ //插入tbl_car_inspect_info表
+ TblCarInspectInfo carInspect = saveCarInspectInfo(orderDetail, orderId, carVin, now, userId, checkType, cleanFlagList, siteId, inspectFinishTime);
+ return carInspect;
+ }
+
+ /**
+ * 更新 tbl_car_inspect_info表 状态
+ */
+ private void updateCarInspect(String userId, String inspectFinishTime, String checkType, String siteId, Date now, List cleanFlagList, TblCarInspectInfo dbCarInspect) {
+ String orderId1 = dbCarInspect.getOrderId();
+ if (CheckTypeEnum.DIPAN.getCode().equals(checkType)) {
+ if (cleanFlagList.contains(CleanFlagEnum.UN_CLEAN.getCode())) {
+ dbCarInspect.setChassisInspectStatus(CheckStatusEnum.CHECKED_UNCLEAN.getCode());
+ } else {
+ dbCarInspect.setChassisInspectStatus(CheckStatusEnum.CHECKED_CLEANED.getCode());
+ }
+ dbCarInspect.setUpdateTime(now);
+ dbCarInspect.setUpdateUserId(userId);
+ dbCarInspect.setChassisInspectSite(siteId);
+ dbCarInspect.setChassisInspectTime(CarcheckDateUtils.parseDate(inspectFinishTime));
+ dbCarInspect.setChassisInspectUserId(userId);
+ }
+ if (CheckTypeEnum.BODY.getCode().equals(checkType)) {
+ if (cleanFlagList.contains(CleanFlagEnum.UN_CLEAN.getCode())) {
+ dbCarInspect.setCarBodyInspectStatus(CheckStatusEnum.CHECKED_UNCLEAN.getCode());
+ } else {
+ dbCarInspect.setCarBodyInspectStatus(CheckStatusEnum.CHECKED_CLEANED.getCode());
+ }
+ dbCarInspect.setCarBodyInspectTime(CarcheckDateUtils.parseDate(inspectFinishTime));
+ dbCarInspect.setUpdateUserId(userId);
+ dbCarInspect.setUpdateTime(now);
+ dbCarInspect.setCarBodyInspectSite(siteId);
+ dbCarInspect.setCarBodyInspectUserId(userId);
+ }
+
+ if (CheckTypeEnum.RE_INPECT.getCode().equals(checkType)) {
+ if (cleanFlagList.contains(CleanFlagEnum.UN_CLEAN.getCode())) {
+ dbCarInspect.setCarReInspectStatus(CheckStatusEnum.CHECKED_UNCLEAN.getCode());
+ } else {
+ dbCarInspect.setCarReInspectStatus(CheckStatusEnum.CHECKED_CLEANED.getCode());
+ }
+ dbCarInspect.setCarReInspectTime(CarcheckDateUtils.parseDate(inspectFinishTime));
+ dbCarInspect.setUpdateUserId(userId);
+ dbCarInspect.setUpdateTime(now);
+ dbCarInspect.setCarReInspectSite(siteId);
+ dbCarInspect.setCarReInspectUserId(userId);
+ }
+
+ carInspectInfoMapper.updateTblCarInspectInfo(dbCarInspect);
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/file/ReqFileDeleteVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/file/ReqFileDeleteVO.java
new file mode 100644
index 00000000..5665466a
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/file/ReqFileDeleteVO.java
@@ -0,0 +1,32 @@
+package com.jiuyv.business.app.vo.file;
+
+
+
+import java.io.Serializable;
+
+/**
+ * Title: ReqDeleteFile
+ * Description:
+ * @author he_jiebing@jiuyv.com
+ @date 2020年9月7日 上午10:15:43
+ */
+
+public class ReqFileDeleteVO implements Serializable{
+
+ /**
+ * serialVersionUID
+ */
+ private static final long serialVersionUID = 6716320877532617565L;
+
+
+ private String fileId;
+ public String getFileId() {
+ return fileId;
+ }
+ public void setFileId(String fileId) {
+ this.fileId = fileId;
+ }
+
+
+
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/file/ResFileUploadVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/file/ResFileUploadVO.java
new file mode 100644
index 00000000..89b2480c
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/file/ResFileUploadVO.java
@@ -0,0 +1,21 @@
+package com.jiuyv.business.app.vo.file;
+
+import java.io.Serializable;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-26 14:24
+ */
+public class ResFileUploadVO implements Serializable {
+ private static final long serialVersionUID = 2076707900673956750L;
+
+ private String fileId;
+
+ public String getFileId() {
+ return fileId;
+ }
+
+ public void setFileId(String fileId) {
+ this.fileId = fileId;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ReqOrderDetailVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ReqOrderDetailVO.java
new file mode 100644
index 00000000..148ec590
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ReqOrderDetailVO.java
@@ -0,0 +1,93 @@
+package com.jiuyv.business.app.vo.index;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+public class ReqOrderDetailVO implements Serializable {
+ private static final long serialVersionUID = 7164931986376338800L;
+ /**
+ * 委托单号
+ */
+ @NotBlank(message = "委托单号不能为空")
+ private String orderId;
+
+ /**
+ * 检查类型 00：底盘 01：车身
+ */
+ @NotBlank(message = "检查类型不能为空")
+ private String checkType;
+
+ /**
+ * 场地id
+ */
+ @NotBlank(message = "检查场地不能为空")
+ private String siteId;
+
+ /**
+ * 00 待检，01 已检查 02 已检待清理 03 当前用户已检
+ */
+ @NotBlank(message = "状态不能为空")
+ private String status;
+
+ private String orgId;
+
+ private String userId;
+
+ private String carVin;
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getCheckType() {
+ return checkType;
+ }
+
+ public void setCheckType(String checkType) {
+ this.checkType = checkType;
+ }
+
+ public String getSiteId() {
+ return siteId;
+ }
+
+ public void setSiteId(String siteId) {
+ this.siteId = siteId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ReqQueryOrderPageVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ReqQueryOrderPageVO.java
new file mode 100644
index 00000000..79bd453a
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ReqQueryOrderPageVO.java
@@ -0,0 +1,59 @@
+package com.jiuyv.business.app.vo.index;
+
+import java.io.Serializable;
+
+public class ReqQueryOrderPageVO implements Serializable {
+
+ private static final long serialVersionUID = 2675403590647145768L;
+ /**
+ * 委托单号
+ */
+ private String orderId;
+
+ /**
+ * 船名航次
+ */
+ private String shipName;
+
+ /**
+ * 委托单位名称
+ */
+ private String companyName;
+
+ /**
+ * 检查员的部门id
+ */
+ private String orgId;
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ResCountOrderDetailPageVo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ResCountOrderDetailPageVo.java
new file mode 100644
index 00000000..16fddac7
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ResCountOrderDetailPageVo.java
@@ -0,0 +1,31 @@
+package com.jiuyv.business.app.vo.index;
+
+import java.io.Serializable;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-09-07 10:49
+ */
+public class ResCountOrderDetailPageVo implements Serializable {
+
+ private static final long serialVersionUID = 2079611940699739334L;
+ private Integer totalCount;
+
+ private Integer ngCount;
+
+ public Integer getTotalCount() {
+ return totalCount;
+ }
+
+ public void setTotalCount(Integer totalCount) {
+ this.totalCount = totalCount;
+ }
+
+ public Integer getNgCount() {
+ return ngCount;
+ }
+
+ public void setNgCount(Integer ngCount) {
+ this.ngCount = ngCount;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ResInspectDetailVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ResInspectDetailVO.java
new file mode 100644
index 00000000..f1612a29
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ResInspectDetailVO.java
@@ -0,0 +1,82 @@
+package com.jiuyv.business.app.vo.index;
+
+import java.io.Serializable;
+
+public class ResInspectDetailVO implements Serializable {
+
+ private static final long serialVersionUID = 6644757150666192433L;
+ /**
+ * 车架号
+ */
+
+ private String carVin;
+
+ /**
+ * 检查时间
+ */
+ private String inspectTime;
+
+ /**
+ * 车身检查时间
+ */
+ private String carBodyInspectTime;
+
+ /**
+ * 底盘检查时间
+ */
+ private String chassisInspectTime;
+
+ private String srcType;
+
+ private String carReInspectTime;
+
+ public String getCarReInspectTime() {
+ return carReInspectTime;
+ }
+
+ public void setCarReInspectTime(String carReInspectTime) {
+ this.carReInspectTime = carReInspectTime;
+ }
+
+ public String getSrcType() {
+ return srcType;
+ }
+
+ public void setSrcType(String srcType) {
+ this.srcType = srcType;
+ }
+
+
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public String getInspectTime() {
+ return inspectTime;
+ }
+
+ public void setInspectTime(String inspectTime) {
+ this.inspectTime = inspectTime;
+ }
+
+ public String getCarBodyInspectTime() {
+ return carBodyInspectTime;
+ }
+
+ public void setCarBodyInspectTime(String carBodyInspectTime) {
+ this.carBodyInspectTime = carBodyInspectTime;
+ }
+
+ public String getChassisInspectTime() {
+ return chassisInspectTime;
+ }
+
+ public void setChassisInspectTime(String chassisInspectTime) {
+ this.chassisInspectTime = chassisInspectTime;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ResOrderDetailVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ResOrderDetailVO.java
new file mode 100644
index 00000000..7556c6aa
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/index/ResOrderDetailVO.java
@@ -0,0 +1,60 @@
+package com.jiuyv.business.app.vo.index;
+
+
+import com.jiuyv.business.app.vo.inspect.ResInspectVO;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ResOrderDetailVO implements Serializable {
+
+ private static final long serialVersionUID = 6236218271322584614L;
+ private ResInspectVO order;
+
+ /**
+ * 未检查
+ */
+ private List unInspectCarList;
+
+ /**
+ * 已检查已清理
+ */
+ private List inspectedCarList;
+
+ /**
+ * 已检查未清理
+ */
+ private List inspectedUncleanCarList;
+
+ public List getInspectedUncleanCarList() {
+ return inspectedUncleanCarList;
+ }
+
+ public void setInspectedUncleanCarList(List inspectedUncleanCarList) {
+ this.inspectedUncleanCarList = inspectedUncleanCarList;
+ }
+
+ public ResInspectVO getOrder() {
+ return order;
+ }
+
+ public void setOrder(ResInspectVO order) {
+ this.order = order;
+ }
+
+ public List getUnInspectCarList() {
+ return unInspectCarList;
+ }
+
+ public void setUnInspectCarList(List unInspectCarList) {
+ this.unInspectCarList = unInspectCarList;
+ }
+
+ public List getInspectedCarList() {
+ return inspectedCarList;
+ }
+
+ public void setInspectedCarList(List inspectedCarList) {
+ this.inspectedCarList = inspectedCarList;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqDeleteResultVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqDeleteResultVO.java
new file mode 100644
index 00000000..c901b87c
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqDeleteResultVO.java
@@ -0,0 +1,31 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-27 13:21
+ */
+public class ReqDeleteResultVO implements Serializable {
+ private static final long serialVersionUID = -7358518645635796418L;
+
+ private String id;
+
+ private String userId;
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqQueryInspectListVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqQueryInspectListVO.java
new file mode 100644
index 00000000..8517ad91
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqQueryInspectListVO.java
@@ -0,0 +1,59 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+
+public class ReqQueryInspectListVO implements Serializable {
+
+ private static final long serialVersionUID = -3207407048756350623L;
+ /**
+ * 车架号
+ */
+ private String carVin;
+
+ /**
+ * 委托单号
+ */
+ private String orderId;
+
+ /**
+ * 检查场地
+ */
+ private String siteId;
+
+ /**
+ * 检查类型 00：底盘 01：车身
+ */
+ private String checkType;
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getSiteId() {
+ return siteId;
+ }
+
+ public void setSiteId(String siteId) {
+ this.siteId = siteId;
+ }
+
+ public String getCheckType() {
+ return checkType;
+ }
+
+ public void setCheckType(String checkType) {
+ this.checkType = checkType;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqQueryInspectParamVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqQueryInspectParamVO.java
new file mode 100644
index 00000000..295b216f
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqQueryInspectParamVO.java
@@ -0,0 +1,21 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+
+public class ReqQueryInspectParamVO implements Serializable {
+ private static final long serialVersionUID = -8686647085821171813L;
+
+ /**
+ * 检查类型 00 底盘 01 车身
+ */
+
+ private String checkType;
+
+ public String getCheckType() {
+ return checkType;
+ }
+
+ public void setCheckType(String checkType) {
+ this.checkType = checkType;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqSaveResultDetailVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqSaveResultDetailVO.java
new file mode 100644
index 00000000..723094cf
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqSaveResultDetailVO.java
@@ -0,0 +1,110 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-21 14:30
+ */
+public class ReqSaveResultDetailVO implements Serializable {
+
+ private static final long serialVersionUID = 8214105760962707525L;
+
+
+
+ /**
+ * 检查部位id
+ */
+
+ private String ngPartId;
+
+ /**
+ * 污染物种类id
+ */
+
+ private String pollutantId;
+
+ /**
+ * 是否发现污染物 00 是 01 否
+ */
+
+ private String pollutantFlag;
+
+ /**
+ * 清理与否 00 是 01 否
+ */
+
+ private String cleanFlag;
+
+ /**
+ * 图片id list
+ */
+ private List fileIds;
+
+ /**
+ * 部位其他内容备注
+ */
+ private String partComment;
+
+ /**
+ * 污染物其他内容
+ */
+ private String pollutantComment;
+
+ public String getPartComment() {
+ return partComment;
+ }
+
+ public void setPartComment(String partComment) {
+ this.partComment = partComment;
+ }
+
+ public String getPollutantComment() {
+ return pollutantComment;
+ }
+
+ public void setPollutantComment(String pollutantComment) {
+ this.pollutantComment = pollutantComment;
+ }
+
+ public String getNgPartId() {
+ return ngPartId;
+ }
+
+ public void setNgPartId(String ngPartId) {
+ this.ngPartId = ngPartId;
+ }
+
+ public String getPollutantId() {
+ return pollutantId;
+ }
+
+ public void setPollutantId(String pollutantId) {
+ this.pollutantId = pollutantId;
+ }
+
+ public String getPollutantFlag() {
+ return pollutantFlag;
+ }
+
+ public void setPollutantFlag(String pollutantFlag) {
+ this.pollutantFlag = pollutantFlag;
+ }
+
+ public String getCleanFlag() {
+ return cleanFlag;
+ }
+
+ public void setCleanFlag(String cleanFlag) {
+ this.cleanFlag = cleanFlag;
+ }
+
+ public List getFileIds() {
+ return fileIds;
+ }
+
+ public void setFileIds(List fileIds) {
+ this.fileIds = fileIds;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqSaveResultVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqSaveResultVO.java
new file mode 100644
index 00000000..1031d2c1
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqSaveResultVO.java
@@ -0,0 +1,110 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-21 14:24
+ */
+public class ReqSaveResultVO implements Serializable {
+ private static final long serialVersionUID = -7483820321060116441L;
+
+ private String userId;
+
+ /**
+ * 委托单号
+ */
+ private String orderId;
+
+ /**
+ * 车架号
+ */
+ private String carVin;
+
+ /**
+ * 检查开始时间
+ */
+ private String inspectStartTime;
+
+ /**
+ * 车身检查完成时间
+ */
+ private String inspectFinishTime;
+
+ /**
+ * 检查类型 00 底盘 01 车身
+ */
+ private String checkType;
+
+ /**
+ * 场地id
+ */
+ private String siteId;
+
+ private List detailList;
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getInspectStartTime() {
+ return inspectStartTime;
+ }
+
+ public void setInspectStartTime(String inspectStartTime) {
+ this.inspectStartTime = inspectStartTime;
+ }
+
+ public String getInspectFinishTime() {
+ return inspectFinishTime;
+ }
+
+ public void setInspectFinishTime(String inspectFinishTime) {
+ this.inspectFinishTime = inspectFinishTime;
+ }
+
+ public String getCheckType() {
+ return checkType;
+ }
+
+ public void setCheckType(String checkType) {
+ this.checkType = checkType;
+ }
+
+ public String getSiteId() {
+ return siteId;
+ }
+
+ public void setSiteId(String siteId) {
+ this.siteId = siteId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public List getDetailList() {
+ return detailList;
+ }
+
+ public void setDetailList(List detailList) {
+ this.detailList = detailList;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqUpdateResultVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqUpdateResultVO.java
new file mode 100644
index 00000000..cb5e962b
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqUpdateResultVO.java
@@ -0,0 +1,127 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-27 13:21
+ */
+public class ReqUpdateResultVO implements Serializable {
+ private static final long serialVersionUID = -1000155570008880943L;
+
+ private String id;
+
+ /**
+ * 检查部位id
+ */
+
+ private String ngPartId;
+
+ /**
+ * 污染物种类id
+ */
+
+ private String pollutantId;
+
+ /**
+ * 是否发现污染物 00 是 01 否
+ */
+
+ private String pollutantFlag;
+
+ /**
+ * 清理与否 00 是 01 否
+ */
+
+ private String cleanFlag;
+
+ /**
+ * 图片id list
+ */
+ private List fileIds;
+
+ /**
+ * 部位其他内容备注
+ */
+ private String partComment;
+
+ /**
+ * 污染物其他内容
+ */
+ private String pollutantComment;
+
+ private String userId;
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getNgPartId() {
+ return ngPartId;
+ }
+
+ public void setNgPartId(String ngPartId) {
+ this.ngPartId = ngPartId;
+ }
+
+ public String getPollutantId() {
+ return pollutantId;
+ }
+
+ public void setPollutantId(String pollutantId) {
+ this.pollutantId = pollutantId;
+ }
+
+ public String getPollutantFlag() {
+ return pollutantFlag;
+ }
+
+ public void setPollutantFlag(String pollutantFlag) {
+ this.pollutantFlag = pollutantFlag;
+ }
+
+ public String getCleanFlag() {
+ return cleanFlag;
+ }
+
+ public void setCleanFlag(String cleanFlag) {
+ this.cleanFlag = cleanFlag;
+ }
+
+ public List getFileIds() {
+ return fileIds;
+ }
+
+ public void setFileIds(List fileIds) {
+ this.fileIds = fileIds;
+ }
+
+ public String getPartComment() {
+ return partComment;
+ }
+
+ public void setPartComment(String partComment) {
+ this.partComment = partComment;
+ }
+
+ public String getPollutantComment() {
+ return pollutantComment;
+ }
+
+ public void setPollutantComment(String pollutantComment) {
+ this.pollutantComment = pollutantComment;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqViewResultVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqViewResultVO.java
new file mode 100644
index 00000000..6057d172
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ReqViewResultVO.java
@@ -0,0 +1,21 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-27 13:13
+ */
+public class ReqViewResultVO implements Serializable {
+ private static final long serialVersionUID = -7966079284270060298L;
+
+ private String id;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResInspectImgVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResInspectImgVO.java
new file mode 100644
index 00000000..48a39ae7
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResInspectImgVO.java
@@ -0,0 +1,31 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-27 13:36
+ */
+public class ResInspectImgVO implements Serializable {
+
+ private static final long serialVersionUID = -1404187635721070763L;
+ private String fileId;
+
+ private String fileUrl;
+
+ public String getFileId() {
+ return fileId;
+ }
+
+ public void setFileId(String fileId) {
+ this.fileId = fileId;
+ }
+
+ public String getFileUrl() {
+ return fileUrl;
+ }
+
+ public void setFileUrl(String fileUrl) {
+ this.fileUrl = fileUrl;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResInspectVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResInspectVO.java
new file mode 100644
index 00000000..3dfc6597
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResInspectVO.java
@@ -0,0 +1,139 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+
+
+public class ResInspectVO implements Serializable {
+ private static final long serialVersionUID = 5048847586422361562L;
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 所属单位d
+ */
+
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+
+ private String inspectOrgId;
+
+ /**
+ * 委托单号
+ */
+
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+
+ private String companyId;
+
+ private String companyName;
+ /**
+ * 船名航次
+ */
+
+ private String shipName;
+
+ /**
+ * 数量
+ */
+
+ private Integer carCount;
+
+ /**
+ * 车身待检车辆
+ */
+ private Integer carBodyCheckCount;
+
+ /**
+ * 底盘待检车辆
+ */
+ private Integer chassisCheckCount;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public Integer getCarCount() {
+ return carCount;
+ }
+
+ public void setCarCount(Integer carCount) {
+ this.carCount = carCount;
+ }
+
+ public Integer getCarBodyCheckCount() {
+ return carBodyCheckCount;
+ }
+
+ public void setCarBodyCheckCount(Integer carBodyCheckCount) {
+ this.carBodyCheckCount = carBodyCheckCount;
+ }
+
+ public Integer getChassisCheckCount() {
+ return chassisCheckCount;
+ }
+
+ public void setChassisCheckCount(Integer chassisCheckCount) {
+ this.chassisCheckCount = chassisCheckCount;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResNgPartVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResNgPartVO.java
new file mode 100644
index 00000000..4a1054bd
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResNgPartVO.java
@@ -0,0 +1,48 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-21 13:32
+ */
+public class ResNgPartVO implements Serializable {
+ private static final long serialVersionUID = 7760113015246404622L;
+
+ /**
+ * 主键
+ */
+ private String ngPartId;
+
+ /**
+ * NG部位名称
+ */
+
+ private String ngPartName;
+
+ private String handFill;
+
+ public String getHandFill() {
+ return handFill;
+ }
+
+ public void setHandFill(String handFill) {
+ this.handFill = handFill;
+ }
+
+ public String getNgPartId() {
+ return ngPartId;
+ }
+
+ public void setNgPartId(String ngPartId) {
+ this.ngPartId = ngPartId;
+ }
+
+ public String getNgPartName() {
+ return ngPartName;
+ }
+
+ public void setNgPartName(String ngPartName) {
+ this.ngPartName = ngPartName;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResPollutantVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResPollutantVO.java
new file mode 100644
index 00000000..8301bbc4
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResPollutantVO.java
@@ -0,0 +1,49 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-21 13:33
+ */
+public class ResPollutantVO implements Serializable {
+ private static final long serialVersionUID = -3382606244728666583L;
+
+ /**
+ * 主键
+ */
+
+ private String pollutantId;
+
+ /**
+ * 污染物名称
+ */
+
+ private String pollutantName;
+
+ private String handFill;
+
+ public String getHandFill() {
+ return handFill;
+ }
+
+ public void setHandFill(String handFill) {
+ this.handFill = handFill;
+ }
+
+ public String getPollutantId() {
+ return pollutantId;
+ }
+
+ public void setPollutantId(String pollutantId) {
+ this.pollutantId = pollutantId;
+ }
+
+ public String getPollutantName() {
+ return pollutantName;
+ }
+
+ public void setPollutantName(String pollutantName) {
+ this.pollutantName = pollutantName;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectDetailVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectDetailVO.java
new file mode 100644
index 00000000..33570170
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectDetailVO.java
@@ -0,0 +1,282 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-21 11:25
+ */
+public class ResQueryInspectDetailVO implements Serializable {
+ private static final long serialVersionUID = -1847764689047476572L;
+
+ /**
+ * 主键
+ */
+
+ private String id;
+
+
+ /**
+ * 检查部位
+ */
+
+ private String inspectPartFirst;
+
+ /**
+ * 检查部位二级
+ */
+
+ private String inspectPartSecond;
+
+ /**
+ * 二级部位id
+ */
+ private String ngPartId;
+
+ /**
+ * 二级部分名称
+ */
+ private String ngPartName;
+
+ /**
+ * 污染物三级id
+ */
+ private String pollutantId;
+
+ /**
+ * 污染物三级名称
+ */
+ private String pollutantName;
+
+
+
+
+ /**
+ * 是否发现污染物 00 是 01 否
+ */
+
+ private String pollutantFlag;
+
+ /**
+ * 清理与否 00 是 01 否
+ */
+
+ private String cleanFlag;
+
+
+ /**
+ * 污染物种类
+ */
+
+ private String pollutantType;
+
+ /**
+ * 污染物具体种类
+ */
+
+ private String pollutantDetailType;
+
+ /**
+ * 污染物具体描述
+ */
+
+ private String pollutantDetailDesc;
+
+ /**
+ * 检查时间
+ */
+
+
+ private String inspectTime;
+
+ /**
+ * 检查人id
+ */
+
+ private String inspectUserId;
+
+ /**
+ * 是否可编辑
+ */
+ private Boolean editFlag;
+
+ /**
+ * 图片地址
+ */
+ private List imgUrlList;
+
+ private String checkImg;
+
+ /**
+ * 部位其他内容备注
+ */
+ private String partComment;
+
+ /**
+ * 污染物其他内容
+ */
+ private String pollutantComment;
+
+ private String realname;
+
+ public String getRealname() {
+ return realname;
+ }
+
+ public void setRealname(String realname) {
+ this.realname = realname;
+ }
+
+ public String getPartComment() {
+ return partComment;
+ }
+
+ public void setPartComment(String partComment) {
+ this.partComment = partComment;
+ }
+
+ public String getPollutantComment() {
+ return pollutantComment;
+ }
+
+ public void setPollutantComment(String pollutantComment) {
+ this.pollutantComment = pollutantComment;
+ }
+
+ public String getCheckImg() {
+ return checkImg;
+ }
+
+ public void setCheckImg(String checkImg) {
+ this.checkImg = checkImg;
+ }
+
+ public List getImgUrlList() {
+ return imgUrlList;
+ }
+
+ public void setImgUrlList(List imgUrlList) {
+ this.imgUrlList = imgUrlList;
+ }
+
+ public String getPollutantFlag() {
+ return pollutantFlag;
+ }
+
+ public void setPollutantFlag(String pollutantFlag) {
+ this.pollutantFlag = pollutantFlag;
+ }
+
+ public String getCleanFlag() {
+ return cleanFlag;
+ }
+
+ public void setCleanFlag(String cleanFlag) {
+ this.cleanFlag = cleanFlag;
+ }
+
+ public String getNgPartId() {
+ return ngPartId;
+ }
+
+ public void setNgPartId(String ngPartId) {
+ this.ngPartId = ngPartId;
+ }
+
+ public String getNgPartName() {
+ return ngPartName;
+ }
+
+ public void setNgPartName(String ngPartName) {
+ this.ngPartName = ngPartName;
+ }
+
+ public String getPollutantId() {
+ return pollutantId;
+ }
+
+ public void setPollutantId(String pollutantId) {
+ this.pollutantId = pollutantId;
+ }
+
+ public String getPollutantName() {
+ return pollutantName;
+ }
+
+ public void setPollutantName(String pollutantName) {
+ this.pollutantName = pollutantName;
+ }
+
+ public Boolean getEditFlag() {
+ return editFlag;
+ }
+
+ public void setEditFlag(Boolean editFlag) {
+ this.editFlag = editFlag;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getInspectPartFirst() {
+ return inspectPartFirst;
+ }
+
+ public void setInspectPartFirst(String inspectPartFirst) {
+ this.inspectPartFirst = inspectPartFirst;
+ }
+
+ public String getInspectPartSecond() {
+ return inspectPartSecond;
+ }
+
+ public void setInspectPartSecond(String inspectPartSecond) {
+ this.inspectPartSecond = inspectPartSecond;
+ }
+
+ public String getPollutantType() {
+ return pollutantType;
+ }
+
+ public void setPollutantType(String pollutantType) {
+ this.pollutantType = pollutantType;
+ }
+
+ public String getPollutantDetailType() {
+ return pollutantDetailType;
+ }
+
+ public void setPollutantDetailType(String pollutantDetailType) {
+ this.pollutantDetailType = pollutantDetailType;
+ }
+
+ public String getPollutantDetailDesc() {
+ return pollutantDetailDesc;
+ }
+
+ public void setPollutantDetailDesc(String pollutantDetailDesc) {
+ this.pollutantDetailDesc = pollutantDetailDesc;
+ }
+
+ public String getInspectTime() {
+ return inspectTime;
+ }
+
+ public void setInspectTime(String inspectTime) {
+ this.inspectTime = inspectTime;
+ }
+
+ public String getInspectUserId() {
+ return inspectUserId;
+ }
+
+ public void setInspectUserId(String inspectUserId) {
+ this.inspectUserId = inspectUserId;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectListVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectListVO.java
new file mode 100644
index 00000000..6727d4ad
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectListVO.java
@@ -0,0 +1,51 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ResQueryInspectListVO implements Serializable {
+ private static final long serialVersionUID = 5393525562716937287L;
+
+ private Boolean carExistFlag;
+
+ private ResQueryInspectOrderVO inspectOrder;
+
+ /**
+ * 委托单状态 00 未完成 01 已完成
+ */
+ private String orderFlag;
+
+ private List inspectDetailList;
+
+ public String getOrderFlag() {
+ return orderFlag;
+ }
+
+ public void setOrderFlag(String orderFlag) {
+ this.orderFlag = orderFlag;
+ }
+
+ public Boolean getCarExistFlag() {
+ return carExistFlag;
+ }
+
+ public void setCarExistFlag(Boolean carExistFlag) {
+ this.carExistFlag = carExistFlag;
+ }
+
+ public ResQueryInspectOrderVO getInspectOrder() {
+ return inspectOrder;
+ }
+
+ public void setInspectOrder(ResQueryInspectOrderVO inspectOrder) {
+ this.inspectOrder = inspectOrder;
+ }
+
+ public List getInspectDetailList() {
+ return inspectDetailList;
+ }
+
+ public void setInspectDetailList(List inspectDetailList) {
+ this.inspectDetailList = inspectDetailList;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectOrderVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectOrderVO.java
new file mode 100644
index 00000000..302d055c
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectOrderVO.java
@@ -0,0 +1,151 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-21 10:33
+ */
+public class ResQueryInspectOrderVO implements Serializable {
+ private static final long serialVersionUID = -7345712065732498037L;
+
+ /**
+ * 主键
+ */
+
+ private String id;
+
+
+ /**
+ * 所属单位id
+ */
+
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+
+ private String inspectOrgId;
+
+ /**
+ * 委托单号
+ */
+
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+
+ private String companyId;
+
+ /**
+ * 委托单位名称
+ */
+ private String companyName;
+
+ /**
+ * 船名航次
+ */
+
+ private String shipName;
+
+
+ /**
+ * 车架号
+ */
+
+ private String carVin;
+
+ /**
+ * 相反检查部位描述
+ */
+ private String otherCheckTypeDesc;
+
+ private String srcType;
+
+ public String getSrcType() {
+ return srcType;
+ }
+
+ public void setSrcType(String srcType) {
+ this.srcType = srcType;
+ }
+
+ public String getOtherCheckTypeDesc() {
+ return otherCheckTypeDesc;
+ }
+
+ public void setOtherCheckTypeDesc(String otherCheckTypeDesc) {
+ this.otherCheckTypeDesc = otherCheckTypeDesc;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectParamVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectParamVO.java
new file mode 100644
index 00000000..7f8c142d
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResQueryInspectParamVO.java
@@ -0,0 +1,28 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ResQueryInspectParamVO implements Serializable {
+
+ private static final long serialVersionUID = -6786478102875110237L;
+ private List pollutantList;
+
+ private List ngPartList;
+
+ public List getPollutantList() {
+ return pollutantList;
+ }
+
+ public void setPollutantList(List pollutantList) {
+ this.pollutantList = pollutantList;
+ }
+
+ public List getNgPartList() {
+ return ngPartList;
+ }
+
+ public void setNgPartList(List ngPartList) {
+ this.ngPartList = ngPartList;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResViewResultVO.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResViewResultVO.java
new file mode 100644
index 00000000..5e140f0a
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/app/vo/inspect/ResViewResultVO.java
@@ -0,0 +1,107 @@
+package com.jiuyv.business.app.vo.inspect;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-07-27 13:13
+ */
+public class ResViewResultVO implements Serializable {
+ private static final long serialVersionUID = -7966079284270060298L;
+
+ /**
+ * 检查部位id
+ */
+
+ private String ngPartId;
+
+ /**
+ * 污染物种类id
+ */
+
+ private String pollutantId;
+
+ /**
+ * 是否发现污染物 00 是 01 否
+ */
+
+ private String pollutantFlag;
+
+ /**
+ * 清理与否 00 是 01 否
+ */
+
+ private String cleanFlag;
+
+ /**
+ * 图片id list
+ */
+ private List imgs;
+
+ /**
+ * 部位其他内容备注
+ */
+ private String partComment;
+
+ /**
+ * 污染物其他内容
+ */
+ private String pollutantComment;
+
+ public String getNgPartId() {
+ return ngPartId;
+ }
+
+ public void setNgPartId(String ngPartId) {
+ this.ngPartId = ngPartId;
+ }
+
+ public String getPollutantId() {
+ return pollutantId;
+ }
+
+ public void setPollutantId(String pollutantId) {
+ this.pollutantId = pollutantId;
+ }
+
+ public String getPollutantFlag() {
+ return pollutantFlag;
+ }
+
+ public void setPollutantFlag(String pollutantFlag) {
+ this.pollutantFlag = pollutantFlag;
+ }
+
+ public String getCleanFlag() {
+ return cleanFlag;
+ }
+
+ public void setCleanFlag(String cleanFlag) {
+ this.cleanFlag = cleanFlag;
+ }
+
+ public List getImgs() {
+ return imgs;
+ }
+
+ public void setImgs(List imgs) {
+ this.imgs = imgs;
+ }
+
+ public String getPartComment() {
+ return partComment;
+ }
+
+ public void setPartComment(String partComment) {
+ this.partComment = partComment;
+ }
+
+ public String getPollutantComment() {
+ return pollutantComment;
+ }
+
+ public void setPollutantComment(String pollutantComment) {
+ this.pollutantComment = pollutantComment;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/constant/CarConstants.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/constant/CarConstants.java
new file mode 100644
index 00000000..184c248b
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/constant/CarConstants.java
@@ -0,0 +1,84 @@
+package com.jiuyv.business.constant;
+
+/**
+ * 通用常量信息
+ */
+public final class CarConstants {
+ /**
+ * 状态 00 正常 01 停用、删除
+ */
+ public static final String STATUS_NOMAL = "00";
+ public static final String STATUS_ABNOMAL = "01";
+
+ /**
+ * 是否首次登录 00 是 01 否
+ */
+ public static final String FIRST_LOGIN_YES = "00";
+ public static final String FIRST_LOGIN_NO = "01";
+
+ /**
+ * 密码错次默认值 0
+ */
+ public static final Integer PWD_ERR_CNT = 0;
+
+ /**
+ * 总公司部门ID
+ */
+ public static final String PARENT_DEPT_ID = "100";
+
+ /**
+ * 污染物类型 00污染物种类 01 污染物具体种类 02 污染物详细描述
+ */
+ public static final String POLLUTANT_TYPE00 = "00";
+ public static final String POLLUTANT_TYPE01 = "01";
+ public static final String POLLUTANT_TYPE02 = "02";
+
+ /**
+ * 文件类型 00 excel表 01图片
+ */
+ public static final String FILE_TYPE00 = "00";
+ public static final String FILE_TYPE01 = "01";
+
+ /**
+ * 预录单状态 00 未生效 01 已生效
+ */
+ public static final String PRERECORD_STATUS_00 = "00";
+ public static final String PRERECORD_STATUS_01 = "01";
+
+ /**
+ * 委托单状态 00 未完成 01 已完成
+ */
+ public static final String ORDERFORMAL_STATUS_00 = "00";
+ public static final String ORDERFORMAL_STATUS_01 = "01";
+
+ /**
+ * 车辆状态 00 正常 01未见实车
+ */
+ public static final String CARDATA_STATUS_00 = "00";
+ public static final String CARDATA_STATUS_01 = "01";
+
+ /**
+ * 历史表删除状态
+ */
+ public static final String DATA_DELETE_HIS = "99";
+
+ /**
+ * 检查类型 00 底盘 01 车身 02 复检
+ */
+ public static final String INSPECT_TYPE_00 = "00";
+ public static final String INSPECT_TYPE_01 = "01";
+ public static final String INSPECT_TYPE_02 = "02";
+
+ /**
+ * 是否发现污染物 00 是 01 否
+ */
+ public static final String POLLUTANT_FLAG_00 = "00";
+ public static final String POLLUTANT_FLAG_01 = "01";
+
+ /**
+ * 车辆信息来源类型 00 预录导入 01 app导入 02 人工导入
+ */
+ public static final String SRC_TYPE_00 = "00";
+ public static final String SRC_TYPE_01 = "01";
+ public static final String SRC_TYPE_02 = "02";
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/CompanyInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/CompanyInfoController.java
new file mode 100644
index 00000000..8509870e
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/CompanyInfoController.java
@@ -0,0 +1,124 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblCompanyInfo;
+import com.jiuyv.business.service.CompanyInfoService;
+import com.jiuyv.business.vo.company.CompanyInfoAddReqVO;
+import com.jiuyv.business.vo.company.CompanyInfoQueryReqVO;
+import com.jiuyv.business.vo.company.CompanyInfoQueryResVO;
+import com.jiuyv.business.vo.company.CompanyInfoUpdateReqVO;
+import com.jiuyv.common.annotation.Anonymous;
+import com.jiuyv.common.annotation.Log;
+import com.jiuyv.common.constant.UserConstants;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.domain.AjaxResult;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+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.List;
+
+/**
+ * 委托单位信息Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/company")
+public class CompanyInfoController extends BaseController {
+ @Autowired
+ private CompanyInfoService tblCompanyInfoService;
+
+ /**
+ * 查询委托单位信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:company:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(CompanyInfoQueryReqVO companyInfoQueryReqVO) {
+ startPage();
+ //List list = tblCompanyInfoService.selectTblCompanyInfoList(companyInfoQueryReqVO);
+ List list = tblCompanyInfoService.selectTblCompanyInfoList(companyInfoQueryReqVO);
+ TableDataInfo dataTable = getDataTable(list);
+ List dataList = (List) dataTable.getRows();
+ List resultList = new ArrayList<>();
+ for (TblCompanyInfo info : dataList) {
+ CompanyInfoQueryResVO resVO = new CompanyInfoQueryResVO();
+ resVO.setId(info.getId());
+ resVO.setCompanyName(info.getCompanyName());
+ resVO.setContactName(info.getContactName());
+ resVO.setContactPhone(info.getContactPhone());
+ resVO.setStatus(info.getStatus());
+ resultList.add(resVO);
+ }
+ dataTable.setRows(resultList);
+ return dataTable;
+ }
+
+ @Anonymous
+ @GetMapping("/listWithNoPermission")
+ public AjaxResult listWithNoPermission(CompanyInfoQueryReqVO companyInfoQueryReqVO) {
+ List list = tblCompanyInfoService.selectTblCompanyInfoList(companyInfoQueryReqVO);
+ return AjaxResult.success(list);
+
+ }
+
+ /**
+ * 获取委托单位信息详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:company:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id) {
+ return AjaxResult.success(tblCompanyInfoService.selectTblCompanyInfoById(id));
+ }
+
+ /**
+ * 新增委托单位信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:company:add')")
+ @Log(title = "委托单位信息", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody CompanyInfoAddReqVO companyInfoAddReqVO) {
+ TblCompanyInfo tblCompanyInfo = new TblCompanyInfo();
+ tblCompanyInfo.setCompanyName(companyInfoAddReqVO.getCompanyName());
+ if (UserConstants.NOT_UNIQUE.equals(tblCompanyInfoService.checkCompanyNameUnique(tblCompanyInfo))) {
+ return AjaxResult.error("新增委托单位'" + companyInfoAddReqVO.getCompanyName() + "'失败，委托单位已存在");
+ }
+ return toAjax(tblCompanyInfoService.insertTblCompanyInfo(companyInfoAddReqVO));
+ }
+
+ /**
+ * 修改委托单位信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:company:edit')")
+ @Log(title = "委托单位信息", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody CompanyInfoUpdateReqVO companyInfoUpdateReqVO) {
+ TblCompanyInfo tblCompanyInfo = new TblCompanyInfo();
+ tblCompanyInfo.setId(companyInfoUpdateReqVO.getId());
+ tblCompanyInfo.setCompanyName(companyInfoUpdateReqVO.getCompanyName());
+ if (UserConstants.NOT_UNIQUE.equals(tblCompanyInfoService.checkCompanyNameUnique(tblCompanyInfo))) {
+ return AjaxResult.error("修改委托单位'" + companyInfoUpdateReqVO.getCompanyName() + "'失败，委托单位已存在");
+ }
+ return toAjax(tblCompanyInfoService.updateTblCompanyInfo(companyInfoUpdateReqVO));
+ }
+
+ /**
+ * 删除委托单位信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:company:remove')")
+ @Log(title = "委托单位信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String ids) {
+ return toAjax(tblCompanyInfoService.deleteTblCompanyInfoById(ids));
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectDetailInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectDetailInfoController.java
new file mode 100644
index 00000000..01a0e040
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectDetailInfoController.java
@@ -0,0 +1,388 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblCarInspectDetailInfo;
+import com.jiuyv.business.service.CarInspectDetailInfoService;
+import com.jiuyv.business.vo.inspect.ReqExportSumInfoVO;
+import com.jiuyv.business.vo.inspect.ResCountCarVO;
+import com.jiuyv.business.vo.inspect.ResExportInspectDetailVO;
+import com.jiuyv.business.vo.inspect.ResExportSumFileVO;
+import com.jiuyv.business.vo.inspect.ResQueryInspectDetailPage;
+import com.jiuyv.common.annotation.Anonymous;
+import com.jiuyv.common.annotation.Log;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.domain.AjaxResult;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.enums.BusinessType;
+import com.jiuyv.common.utils.CarcheckDateUtils;
+import com.jiuyv.common.utils.file.FileUtils;
+import com.jiuyv.common.utils.poi.ExcelUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * 车辆检查信息明细Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/inspectDetail")
+public class InspectDetailInfoController extends BaseController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(InspectDetailInfoController.class);
+ @Autowired
+ private CarInspectDetailInfoService tblCarInspectDetailInfoService;
+
+ @Value("${carcheck.tempExcelDir}")
+ private String tempExcelDir;
+
+ @Value("${carcheck.tempImgDir}")
+ private String tempImgDir;
+
+ @Value("${carcheck.baseDirPathStr}")
+ private String baseDirPathStr;
+
+
+ /**
+ * 查询车辆检查信息明细列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectDetail:list')")
+ @GetMapping("/list")
+ public TableDataInfo queryInspectDetailPage(TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ startPage();
+ List list = tblCarInspectDetailInfoService.queryInspectDetailPage(tblCarInspectDetailInfo);
+ TableDataInfo dataTable = getDataTable(list);
+ List rows = (List) dataTable.getRows();
+ for (ResQueryInspectDetailPage res : rows) {
+ String partComment = res.getPartComment();
+ if (StringUtils.isNotBlank(partComment)) {
+ res.setInspectPartSecondName(partComment);
+ }
+ String pollutantComment = res.getPollutantComment();
+ if (StringUtils.isNotBlank(pollutantComment)) {
+ res.setPollutantDetailDescName(pollutantComment);
+ }
+ }
+ dataTable.setRows(rows);
+ return dataTable;
+ }
+ @GetMapping("/countCar")
+ public AjaxResult countCar(TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ ResCountCarVO vo = new ResCountCarVO();
+ List list = tblCarInspectDetailInfoService.queryInspectDetailPage(tblCarInspectDetailInfo);
+ Set totalCountSet = list.stream().map(item -> item.getCarVin()).collect(Collectors.toSet());
+ Set ngCarSet = list.stream().filter(item -> item.getPollutantFlag().equals("00")).map(item -> item.getCarVin()).collect(Collectors.toSet());
+ vo.setTotalCount(totalCountSet.size());
+ vo.setNgCount(ngCarSet.size());
+ return AjaxResult.success(vo);
+ }
+
+ /**
+ * 导出车辆检查信息明细列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectDetail:export')")
+ @Log(title = "车辆检查信息明细", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportDetail")
+ public void export(HttpServletResponse response, TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ List list = tblCarInspectDetailInfoService.selectExportInspectDetailInfoList(tblCarInspectDetailInfo);
+ for (ResExportInspectDetailVO res : list) {
+ String partComment = res.getPartComment();
+ if (StringUtils.isNotBlank(partComment)) {
+ res.setInspectPartSecondName(partComment);
+ }
+ String pollutantComment = res.getPollutantComment();
+ if (StringUtils.isNotBlank(pollutantComment)) {
+ res.setPollutantDetailDescName(pollutantComment);
+ }
+ }
+ ExcelUtil util = new ExcelUtil(ResExportInspectDetailVO.class);
+ util.exportExcel(response, list, "车辆检查信息明细数据");
+ }
+ @GetMapping("/exportSum2")
+ @Anonymous
+ public void exportSum2(ReqExportSumInfoVO req, HttpServletResponse response) {
+ ResExportSumFileVO result = tblCarInspectDetailInfoService.exportSum(req);
+ File file = new File(result.getGeneratedFileName());
+ try {
+ if (file.exists()) {
+ String fileName = result.getFileName();
+ String realFileName = fileName.substring(fileName.indexOf("_") + 1);
+ String filePath = result.getGeneratedFileName();
+ response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+ FileUtils.setAttachmentResponseHeader(response, realFileName);
+ FileUtils.writeBytes(filePath, response.getOutputStream());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ @Anonymous
+ @GetMapping("/download/zipImages")
+ public void downloadImagesAsZip(HttpServletResponse response, TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ long start = System.currentTimeMillis();
+ try {
+ // Create a ZIP with local images and save it to a temporary directory
+ File tempDir = new File(tempImgDir);
+ File zipFile = File.createTempFile("images_", ".zip", tempDir);
+ try (ZipOutputStream zipOutputStream = new ZipOutputStream(new FileOutputStream(zipFile))) {
+ Set localImagePaths = tblCarInspectDetailInfoService.getLocalImagePaths(tblCarInspectDetailInfo);
+ // TODO 本地测试修改第一处
+ // Set localImagePaths = new HashSet<>();
+ // for(String path : localImagePaths2){
+ // // TODO 生产
+ // // String s = path.replaceAll("/data/", "H:/car_img/");
+ // // TODO 公司环境
+ // String s = path.replaceAll("/home/ccic/car-check-app/", "H:/car_img/");
+ // localImagePaths.add(s);
+ // }
+ LOGGER.info(">>>>>>>>>>>>>>照片url读取完毕，总共>>{}张", localImagePaths.size());
+ LOGGER.info("照片url读取完毕耗时时间: {}秒", ((System.currentTimeMillis() - start) / 1000.0));
+ Date inspectTime = tblCarInspectDetailInfo.getInspectTime();
+ // 使用多线程并行处理图片
+ localImagePaths.parallelStream().forEach(localImagePath -> {
+ try {
+ Path imagePath = Paths.get(localImagePath);
+ // 计算相对路径
+ Path baseDirPath = Paths.get(baseDirPathStr);
+ // TODO 本地测试修改第二处
+ //Path baseDirPath = Paths.get("H:/car_img/");
+ Path relativePath = baseDirPath.relativize(imagePath);
+ // 将相对路径转换为字符串并用正斜杠作为分隔符
+ String zipEntryName = relativePath.toString().replace(File.separator, "/");
+ //LOGGER.info(">>>>>>>>>>>>>>>>>>>>>>zipEntryName>>{}",zipEntryName);
+ if(inspectTime != null){
+ String inspectTimePath = CarcheckDateUtils.parseDateToStr("yyyyMMdd", inspectTime);
+ //LOGGER.info(">>>>>>>>>>>>>>>>>>>>>>inspectTimePath>>{}",inspectTimePath);
+
+ // 使用分隔符"/"来拆分路径
+ String[] parts = zipEntryName.split("/");
+
+ // 找到需要替换的部分的索引（倒数第三个部分）
+ int indexToReplace = parts.length - 4;
+
+ if (indexToReplace >= 0 && indexToReplace < parts.length) {
+ // 替换指定索引的部分为动态值
+ parts[indexToReplace] = inspectTimePath;
+
+ // 使用分隔符"/"将部分拼接回原路径
+ zipEntryName = String.join("/", parts);
+ }
+ //LOGGER.info(">>>>>>>>>>>>>>>>>>>>>>替换后的zipEntryName>>{}",zipEntryName);
+ }
+
+ ZipEntry zipEntry = new ZipEntry(zipEntryName);
+ zipOutputStream.putNextEntry(zipEntry);
+ // 使用NIO和缓冲区读取文件
+ try (FileChannel fileChannel = FileChannel.open(imagePath, StandardOpenOption.READ)) {
+ ByteBuffer buffer = ByteBuffer.allocate(8192); // 8KB缓冲区
+ int bytesRead;
+ while ((bytesRead = fileChannel.read(buffer)) != -1) {
+ buffer.flip(); // 切换到读模式
+ zipOutputStream.write(buffer.array(), 0, bytesRead);
+ buffer.clear(); // 清空缓冲区
+ }
+ }
+ zipOutputStream.flush();
+ zipOutputStream.closeEntry();
+ } catch (IOException e) {
+ // 处理异常
+ e.printStackTrace();
+ }
+ });
+ }
+
+ LOGGER.info(">>>>>>>>>>>>>>生成完临时zip包");
+ LOGGER.info("生成完临时zip包完毕耗时时间: {}秒", ((System.currentTimeMillis() - start) / 1000.0));
+
+ // Generate the ZIP file name based on the current date
+ String zipFileName = generateZipFileName() + ".zip";
+
+ // Set response headers for the file download
+ response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + zipFileName);
+ response.setContentType("application/zip");
+
+ // Calculate the size of the ZIP file
+ long zipFileSize = zipFile.length();
+
+ // Set the Content-Length header in the response
+ response.setHeader(HttpHeaders.CONTENT_LENGTH, String.valueOf(zipFileSize));
+
+ try (
+ OutputStream sos = response.getOutputStream()
+ ) {
+ Path zipFilePath = zipFile.toPath();
+ Files.copy(zipFilePath, sos);
+ } catch (IOException e) {
+ // 处理异常
+ e.printStackTrace();
+ }
+ long end = System.currentTimeMillis();
+ LOGGER.info("下载图片耗时时间: {}秒", ((end - start) / 1000.0));
+ } catch (IOException e) {
+ // Handle IO exception
+ e.printStackTrace();
+ response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+ }
+ }
+ @Anonymous
+ @GetMapping("/download/zipImages2")
+ public void downloadImagesAsZip2(HttpServletResponse response, TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ long start = System.currentTimeMillis();
+ try {
+ // Create a ZIP with local images and save it to a temporary directory
+ File tempDir = new File(tempImgDir);
+ File zipFile = File.createTempFile("images_", ".zip", tempDir);
+ try (ZipOutputStream zipOutputStream = new ZipOutputStream(new FileOutputStream(zipFile))) {
+ Set localImagePaths = tblCarInspectDetailInfoService.getLocalImagePaths(tblCarInspectDetailInfo);
+ // TODO 本地测试修改第一处
+ // Set localImagePaths = new HashSet<>();
+ // for(String path : localImagePaths2){
+ // String s = path.replaceAll("/data/", "H:/car_img/");
+ // localImagePaths.add(s);
+ // }
+ LOGGER.info(">>>>>>>>>>>>>>照片url读取完毕，总共>>{}张", localImagePaths.size());
+ LOGGER.info("照片url读取完毕耗时时间: {}秒", ((System.currentTimeMillis() - start) / 1000.0));
+ // 使用多线程并行处理图片
+ localImagePaths.parallelStream().forEach(localImagePath -> {
+ try {
+ Path imagePath = Paths.get(localImagePath);
+ // 计算相对路径
+ Path baseDirPath = Paths.get("/data/");
+ // TODO 本地测试修改第二处
+ //Path baseDirPath = Paths.get("H:/car_img/");
+ Path relativePath = baseDirPath.relativize(imagePath);
+ // 将相对路径转换为字符串并用正斜杠作为分隔符
+ String zipEntryName = relativePath.toString().replace(File.separator, "/");
+ ZipEntry zipEntry = new ZipEntry(zipEntryName);
+ zipOutputStream.putNextEntry(zipEntry);
+ // 使用NIO和缓冲区读取文件
+ try (FileChannel fileChannel = FileChannel.open(imagePath, StandardOpenOption.READ)) {
+ ByteBuffer buffer = ByteBuffer.allocate(8192); // 8KB缓冲区
+ int bytesRead;
+ while ((bytesRead = fileChannel.read(buffer)) != -1) {
+ buffer.flip(); // 切换到读模式
+ zipOutputStream.write(buffer.array(), 0, bytesRead);
+ buffer.clear(); // 清空缓冲区
+ }
+ }
+ zipOutputStream.closeEntry();
+ } catch (IOException e) {
+ // 处理异常
+ e.printStackTrace();
+ }
+ });
+ }
+
+ LOGGER.info(">>>>>>>>>>>>>>生成完临时zip包");
+ LOGGER.info("生成完临时zip包完毕耗时时间: {}秒", ((System.currentTimeMillis() - start) / 1000.0));
+
+ // Generate the ZIP file name based on the current date
+ String zipFileName = generateZipFileName() + ".zip";
+
+ // Set response headers for the file download
+ response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + zipFileName);
+ response.setContentType("application/zip");
+
+ // Calculate the size of the ZIP file
+ long zipFileSize = zipFile.length();
+
+ // Set the Content-Length header in the response
+ response.setHeader(HttpHeaders.CONTENT_LENGTH, String.valueOf(zipFileSize));
+
+ try (
+ OutputStream sos = response.getOutputStream()
+ ) {
+ Path zipFilePath = zipFile.toPath();
+ Files.copy(zipFilePath, sos);
+ } catch (IOException e) {
+ // 处理异常
+ e.printStackTrace();
+ }
+ long end = System.currentTimeMillis();
+ LOGGER.info("下载图片耗时时间: {}秒", ((end - start) / 1000.0));
+ } catch (IOException e) {
+ // Handle IO exception
+ e.printStackTrace();
+ response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+ }
+ }
+ private String generateZipFileName() {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+ return "images_" + LocalDateTime.now().format(formatter);
+ }
+
+ /**
+ * 获取车辆检查信息明细详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectDetail:query')")
+ @GetMapping(value = "/getDetailInfo")
+ public AjaxResult getDetailInfo(@RequestParam("id") String id) {
+ ResQueryInspectDetailPage result = tblCarInspectDetailInfoService.selectTblCarInspectDetailInfoById(id);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 新增车辆检查信息明细
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectDetail:add')")
+ @Log(title = "车辆检查信息明细", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ return toAjax(tblCarInspectDetailInfoService.insertTblCarInspectDetailInfo(tblCarInspectDetailInfo));
+ }
+
+ /**
+ * 修改车辆检查信息明细
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectDetail:edit')")
+ @Log(title = "车辆检查信息明细", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ return toAjax(tblCarInspectDetailInfoService.updateTblCarInspectDetailInfo(tblCarInspectDetailInfo));
+ }
+
+ /**
+ * 删除车辆检查信息明细
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectDetail:remove')")
+ @Log(title = "车辆检查信息明细", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids) {
+ return toAjax(tblCarInspectDetailInfoService.deleteTblCarInspectDetailInfoByIds(ids));
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectInfoController.java
new file mode 100644
index 00000000..5999dbcd
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectInfoController.java
@@ -0,0 +1,86 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblCarInspectInfo;
+import com.jiuyv.business.service.CarInspectInfoService;
+import com.jiuyv.business.vo.inspect.InspectUpdateReqVO;
+import com.jiuyv.common.annotation.Log;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.domain.AjaxResult;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 车辆检查信息Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/inspect")
+public class InspectInfoController extends BaseController {
+ @Autowired
+ private CarInspectInfoService tblCarInspectInfoService;
+
+ /**
+ * 查询车辆检查信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspect:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(TblCarInspectInfo tblCarInspectInfo) {
+ startPage();
+ List list = tblCarInspectInfoService.selectTblCarInspectInfoList(tblCarInspectInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 获取车辆检查信息详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspect:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id) {
+ return AjaxResult.success(tblCarInspectInfoService.selectTblCarInspectInfoById(id));
+ }
+
+ /**
+ * 修改车辆检查信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspect:edit')")
+ @Log(title = "车辆检查信息", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody InspectUpdateReqVO reqVO) {
+ return toAjax(tblCarInspectInfoService.updateTblCarInspectInfo(reqVO));
+ }
+
+ /**
+ * 查询检查结果信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspect:query')")
+ @GetMapping(value = "/checkCarStatus")
+ public AjaxResult getCheckResult(String id) {
+ return AjaxResult.success(tblCarInspectInfoService.getCheckResult(id));
+ }
+
+
+ /**
+ * 删除车辆检查信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspect:delete')")
+ @Log(title = "车辆检查信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{id}")
+ public AjaxResult delete(@PathVariable("id") String id) {
+ tblCarInspectInfoService.delete(id);
+ return AjaxResult.success();
+ }
+
+}
\ No newline at end of file
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectRecordInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectRecordInfoController.java
new file mode 100644
index 00000000..5e1fb16c
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectRecordInfoController.java
@@ -0,0 +1,81 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblInspectRecordInfo;
+import com.jiuyv.business.service.InspectRecordInfoService;
+import com.jiuyv.business.vo.inspectrecord.ResQueryInspectRecordPage;
+import com.jiuyv.common.annotation.Log;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.enums.BusinessType;
+import com.jiuyv.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 点检记录信息Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/inspectRecord")
+public class InspectRecordInfoController extends BaseController {
+ @Autowired
+ private InspectRecordInfoService tblInspectRecordInfoService;
+
+ /**
+ * 查询点检记录信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectRecord:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(TblInspectRecordInfo tblInspectRecordInfo) {
+ startPage();
+ List list = tblInspectRecordInfoService.selectTblInspectRecordInfoList(tblInspectRecordInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出点检记录信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectRecord:export')")
+ @Log(title = "点检记录信息", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, TblInspectRecordInfo tblInspectRecordInfo) {
+ List list = tblInspectRecordInfoService.selectTblInspectRecordInfoList(tblInspectRecordInfo);
+ List resultList = new ArrayList<>();
+ ResQueryInspectRecordPage resultInfo = null;
+ int n = 1;
+ for (ResQueryInspectRecordPage info : list) {
+ resultInfo = new ResQueryInspectRecordPage();
+ resultInfo.setNo(n);
+ resultInfo.setCarVin(info.getCarVin());
+ resultInfo.setChassisSiteName(info.getChassisSiteName());
+ resultInfo.setChassisUserName(info.getChassisUserName());
+ resultInfo.setChassisInspectStartTime(info.getChassisInspectStartTime());
+ resultInfo.setChassisInspectFinishTime(info.getChassisInspectFinishTime());
+
+ resultInfo.setBodyInspectSiteName(info.getBodyInspectSiteName());
+ resultInfo.setBodyInspectUserName(info.getBodyInspectUserName());
+ resultInfo.setCarBodyInspectStartTime(info.getCarBodyInspectStartTime());
+ resultInfo.setCarBodyInspectFinishTime(info.getCarBodyInspectFinishTime());
+
+ resultInfo.setCarReInspectSite(info.getCarReInspectSite());
+ resultInfo.setCarReInspectUserName(info.getCarReInspectUserName());
+ resultInfo.setCarReInspectStartTime(info.getCarReInspectStartTime());
+ resultInfo.setCarReInspectFinishTime(info.getCarReInspectFinishTime());
+ resultList.add(resultInfo);
+
+ n++;
+ }
+ ExcelUtil util = new ExcelUtil(ResQueryInspectRecordPage.class);
+ util.exportExcel(response, resultList, "点检记录");
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectSiteInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectSiteInfoController.java
new file mode 100644
index 00000000..b7817112
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectSiteInfoController.java
@@ -0,0 +1,118 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblInspectSiteInfo;
+import com.jiuyv.business.service.InspectSiteInfoService;
+import com.jiuyv.business.vo.inspectSite.InspectSiteInfoAddReqVO;
+import com.jiuyv.business.vo.inspectSite.InspectSiteInfoQueryReqVO;
+import com.jiuyv.business.vo.inspectSite.InspectSiteInfoQueryResVO;
+import com.jiuyv.business.vo.inspectSite.InspectSiteInfoUpdateReqVO;
+import com.jiuyv.common.annotation.Log;
+import com.jiuyv.common.constant.UserConstants;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.domain.AjaxResult;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+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.List;
+
+/**
+ * 检查场地信息Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/inspectSite")
+public class InspectSiteInfoController extends BaseController {
+ @Autowired
+ private InspectSiteInfoService tblInspectSiteInfoService;
+
+ /**
+ * 查询检查场地信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectSite:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(InspectSiteInfoQueryReqVO infoQueryReqVO) {
+ startPage();
+ //List list = tblInspectSiteInfoService.selectTblInspectSiteInfoList(infoQueryReqVO);
+ List list = tblInspectSiteInfoService.selectTblInspectSiteInfoList(infoQueryReqVO);
+ TableDataInfo dataTable = getDataTable(list);
+ List dataList = (List) dataTable.getRows();
+ List resultList = new ArrayList<>();
+ for (TblInspectSiteInfo info : dataList) {
+ InspectSiteInfoQueryResVO resVO = new InspectSiteInfoQueryResVO();
+ resVO.setId(info.getId());
+ resVO.setDeptName(info.getDeptName());
+ resVO.setStatus(info.getStatus());
+ resVO.setSiteName(info.getSiteName());
+ resVO.setRemarks(info.getRemarks());
+ resVO.setOrgId(info.getOrgId());
+ resultList.add(resVO);
+ }
+ dataTable.setRows(resultList);
+ return dataTable;
+ }
+
+ /**
+ * 获取检查场地信息详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectSite:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id) {
+ return AjaxResult.success(tblInspectSiteInfoService.selectTblInspectSiteInfoById(id));
+ }
+
+ /**
+ * 新增检查场地信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectSite:add')")
+ @Log(title = "检查场地信息", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody InspectSiteInfoAddReqVO infoAddReqVO) {
+ TblInspectSiteInfo inspectSiteInfo = new TblInspectSiteInfo();
+ inspectSiteInfo.setSiteName(infoAddReqVO.getSiteName());
+ inspectSiteInfo.setOrgId(infoAddReqVO.getOrgId());
+ if (UserConstants.NOT_UNIQUE.equals(tblInspectSiteInfoService.checkSiteNameUnique(inspectSiteInfo))) {
+ return AjaxResult.error("新增场地'" + infoAddReqVO.getSiteName() + "'失败，场地名称已存在");
+ }
+ return toAjax(tblInspectSiteInfoService.insertTblInspectSiteInfo(infoAddReqVO));
+ }
+
+ /**
+ * 修改检查场地信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectSite:edit')")
+ @Log(title = "检查场地信息", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody InspectSiteInfoUpdateReqVO infoUpdateReqVO) {
+ TblInspectSiteInfo inspectSiteInfo = new TblInspectSiteInfo();
+ inspectSiteInfo.setId(infoUpdateReqVO.getId());
+ inspectSiteInfo.setSiteName(infoUpdateReqVO.getSiteName());
+ inspectSiteInfo.setOrgId(infoUpdateReqVO.getOrgId());
+ if (UserConstants.NOT_UNIQUE.equals(tblInspectSiteInfoService.checkSiteNameUnique(inspectSiteInfo))) {
+ return AjaxResult.error("修改场地'" + infoUpdateReqVO.getSiteName() + "'失败，场地名称已存在");
+ }
+ return toAjax(tblInspectSiteInfoService.updateTblInspectSiteInfo(infoUpdateReqVO));
+ }
+
+ /**
+ * 删除检查场地信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspectSite:remove')")
+ @Log(title = "检查场地信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String ids) {
+ return toAjax(tblInspectSiteInfoService.deleteTblInspectSiteInfoById(ids));
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectorInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectorInfoController.java
new file mode 100644
index 00000000..b5a2297f
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/InspectorInfoController.java
@@ -0,0 +1,138 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblInspectorInfo;
+import com.jiuyv.business.service.InspectorInfoService;
+import com.jiuyv.business.vo.inspector.InspectorInfoAddReqVO;
+import com.jiuyv.business.vo.inspector.InspectorInfoQueryReqVO;
+import com.jiuyv.business.vo.inspector.InspectorInfoQueryResVO;
+import com.jiuyv.business.vo.inspector.InspectorInfoResetReqVO;
+import com.jiuyv.business.vo.inspector.InspectorInfoUpdateReqVO;
+import com.jiuyv.common.annotation.Anonymous;
+import com.jiuyv.common.annotation.Log;
+import com.jiuyv.common.constant.UserConstants;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.domain.AjaxResult;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+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.List;
+
+/**
+ * 检验员信息业务处理Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/inspector")
+public class InspectorInfoController extends BaseController {
+ @Autowired
+ private InspectorInfoService inspectorInfoService;
+
+ /**
+ * 查询检验员信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspector:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(InspectorInfoQueryReqVO inspectorInfoQueryVo) {
+ startPage();
+ List dataList = inspectorInfoService.selectTblInspectorInfoList(inspectorInfoQueryVo);
+ TableDataInfo dataTable = getDataTable(dataList);
+ List rows = (List) dataTable.getRows();
+ List resultList = new ArrayList<>();
+ InspectorInfoQueryResVO resVO = null;
+
+ for (TblInspectorInfo info : rows) {
+ resVO = new InspectorInfoQueryResVO();
+ resVO.setId(info.getId());
+ resVO.setDeptName(info.getDeptName());
+ resVO.setUsername(info.getUsername());
+ resVO.setRealname(info.getRealname());
+ resVO.setPhone(info.getPhone());
+ resVO.setStatus(info.getStatus());
+ resultList.add(resVO);
+ }
+ dataTable.setRows(resultList);
+ return dataTable;
+ }
+
+ @Anonymous
+ @GetMapping("/listWithNoPermission")
+ public AjaxResult listWithNoPermission(InspectorInfoQueryReqVO inspectorInfoQueryVo) {
+ List dataList = inspectorInfoService.selectTblInspectorInfoList(inspectorInfoQueryVo);
+ return AjaxResult.success(dataList);
+ }
+
+ /**
+ * 获取检验员信息详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspector:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id) {
+ return AjaxResult.success(inspectorInfoService.selectTblInspectorInfoById(id));
+ }
+
+ /**
+ * 新增检验员信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspector:add')")
+ @Log(title = "检验员信息", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody InspectorInfoAddReqVO inspectorInfoAddReqVO) {
+ TblInspectorInfo inspectorInfo = new TblInspectorInfo();
+ inspectorInfo.setOrgId(inspectorInfoAddReqVO.getOrgId());
+ inspectorInfo.setUsername(inspectorInfoAddReqVO.getUsername());
+ if (UserConstants.NOT_UNIQUE.equals(inspectorInfoService.checkUserNameUnique(inspectorInfo))) {
+ return AjaxResult.error("新增检验员'" + inspectorInfoAddReqVO.getUsername() + "'失败，用户名已存在");
+ }
+ return toAjax(inspectorInfoService.insertTblInspectorInfo(inspectorInfoAddReqVO));
+ }
+
+ /**
+ * 重置密码
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspector:reset')")
+ @Log(title = "检验员信息", businessType = BusinessType.UPDATE)
+ @PutMapping("/resetPwd")
+ public AjaxResult resetPwd(@RequestBody InspectorInfoResetReqVO infoResetReqVO) {
+ return toAjax(inspectorInfoService.resetPwd(infoResetReqVO));
+ }
+
+ /**
+ * 修改检验员信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspector:edit')")
+ @Log(title = "检验员信息", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody InspectorInfoUpdateReqVO infoUpdateReqVO) {
+ TblInspectorInfo inspectorInfo = new TblInspectorInfo();
+ inspectorInfo.setId(infoUpdateReqVO.getId());
+ inspectorInfo.setUsername(infoUpdateReqVO.getUsername());
+
+ if (UserConstants.NOT_UNIQUE.equals(inspectorInfoService.checkUserNameUnique(inspectorInfo))) {
+ return AjaxResult.error("修改检验员'" + infoUpdateReqVO.getUsername() + "'失败，用户名已存在");
+ }
+ return toAjax(inspectorInfoService.updateTblInspectorInfo(infoUpdateReqVO));
+ }
+
+ /**
+ * 删除检验员信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:inspector:remove')")
+ @Log(title = "检验员信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String ids) {
+ return toAjax(inspectorInfoService.deleteTblInspectorInfoById(ids));
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/NgPartInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/NgPartInfoController.java
new file mode 100644
index 00000000..9d909754
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/NgPartInfoController.java
@@ -0,0 +1,107 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblNgPartInfo;
+import com.jiuyv.business.service.NgPartInfoService;
+import com.jiuyv.business.vo.ngpart.NgPartInfoAddReqVO;
+import com.jiuyv.business.vo.ngpart.NgPartInfoGetReqVO;
+import com.jiuyv.business.vo.ngpart.NgPartInfoQueryReqVO;
+import com.jiuyv.business.vo.ngpart.NgPartInfoQueryResVO;
+import com.jiuyv.business.vo.ngpart.NgPartInfoUpdateReqVO;
+import com.jiuyv.common.annotation.Log;
+import com.jiuyv.common.constant.UserConstants;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.domain.AjaxResult;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * NG部位信息Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/ngPart")
+public class NgPartInfoController extends BaseController {
+ @Autowired
+ private NgPartInfoService tblNgPartInfoService;
+
+ /**
+ * 查询NG部位信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:ngPart:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(NgPartInfoQueryReqVO ngPartInfoQueryReqVO) {
+ List list = tblNgPartInfoService.selectTblNgPartInfoList(ngPartInfoQueryReqVO);
+ return getDataTable(list);
+ }
+
+ /**
+ * 获取NG部位信息详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:ngPart:query')")
+ @GetMapping(value = "/getInfo")
+ public AjaxResult getInfo(NgPartInfoGetReqVO ngPartInfoGetReqVO) {
+ return AjaxResult.success(tblNgPartInfoService.selectTblNgPartInfoById(ngPartInfoGetReqVO));
+ }
+
+ /**
+ * 新增NG部位信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:ngPart:add')")
+ @Log(title = "NG部位信息", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody NgPartInfoAddReqVO ngPartInfoAddReqVO) {
+ TblNgPartInfo tblNgPartInfo = new TblNgPartInfo();
+ tblNgPartInfo.setNgPartName(ngPartInfoAddReqVO.getNgPartName());
+ tblNgPartInfo.setNgPartType(ngPartInfoAddReqVO.getNgPartType());
+ tblNgPartInfo.setPartType(ngPartInfoAddReqVO.getPartType());
+ if (UserConstants.NOT_UNIQUE.equals(tblNgPartInfoService.checkPartNameUnique(tblNgPartInfo))) {
+ return AjaxResult.error("新增NG部位'" + ngPartInfoAddReqVO.getNgPartName() + "'失败，NG部位已存在");
+ }
+ return toAjax(tblNgPartInfoService.insertTblNgPartInfo(ngPartInfoAddReqVO));
+ }
+
+ /**
+ * 修改NG部位信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:ngPart:edit')")
+ @Log(title = "NG部位信息", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody NgPartInfoUpdateReqVO ngPartInfoUpdateReqVO) {
+ TblNgPartInfo tblNgPartInfo = new TblNgPartInfo();
+ tblNgPartInfo.setId(ngPartInfoUpdateReqVO.getId());
+ tblNgPartInfo.setNgPartName(ngPartInfoUpdateReqVO.getNgPartName());
+ tblNgPartInfo.setNgPartType(ngPartInfoUpdateReqVO.getNgPartType());
+ tblNgPartInfo.setPartType(ngPartInfoUpdateReqVO.getPartType());
+ if (UserConstants.NOT_UNIQUE.equals(tblNgPartInfoService.checkPartNameUnique(tblNgPartInfo))) {
+ return AjaxResult.error("修改NG部位'" + ngPartInfoUpdateReqVO.getNgPartName() + "'失败，NG部位已存在");
+ }
+ return toAjax(tblNgPartInfoService.updateTblNgPartInfo(ngPartInfoUpdateReqVO));
+ }
+
+ /**
+ * 删除NG部位信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:ngPart:remove')")
+ @Log(title = "NG部位信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String ids) {
+ if (tblNgPartInfoService.hasChildById(ids)) {
+ return AjaxResult.error("存在子节点,不允许删除");
+ }
+ return toAjax(tblNgPartInfoService.deleteTblNgPartInfoById(ids));
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/OrderFormalInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/OrderFormalInfoController.java
new file mode 100644
index 00000000..a44331b7
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/OrderFormalInfoController.java
@@ -0,0 +1,119 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblCarOrderFormalDetailInfo;
+import com.jiuyv.business.domain.TblCarOrderFormalInfo;
+import com.jiuyv.business.service.CarOrderFormalDetailInfoService;
+import com.jiuyv.business.service.CarOrderFormalInfoService;
+import com.jiuyv.business.vo.orderformal.OrderFormalCompleteCheckReqVO;
+import com.jiuyv.business.vo.prerecordetail.OrderFormalDetailAddReqVO;
+import com.jiuyv.common.annotation.Log;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.domain.AjaxResult;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 车辆正式委托单信息Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/orderFormal")
+public class OrderFormalInfoController extends BaseController {
+ @Autowired
+ private CarOrderFormalInfoService tblCarOrderFormalInfoService;
+ @Autowired
+ private CarOrderFormalDetailInfoService carOrderFormalDetailInfoService;
+
+ /**
+ * 查询车辆正式委托单信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:orderFormal:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(TblCarOrderFormalInfo tblCarOrderFormalInfo) {
+ startPage();
+ List list = tblCarOrderFormalInfoService.selectTblCarOrderFormalInfoList(tblCarOrderFormalInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 新增车辆
+ */
+ @PreAuthorize("@ss.hasPermi('business:orderFormal:addCar')")
+ @Log(title = "车辆正式委托单信息明细", businessType = BusinessType.INSERT)
+ @PostMapping(value = "/addCar")
+ public AjaxResult add(@RequestBody OrderFormalDetailAddReqVO reqVO) {
+ TblCarOrderFormalDetailInfo paramData = new TblCarOrderFormalDetailInfo();
+ paramData.setOrderId(reqVO.getOrderId());
+ paramData.setCarVin(reqVO.getCarVin());
+ List resultList =
+ carOrderFormalDetailInfoService.selectTblCarOrderFormalDetailInfoList(paramData);
+ if (null != resultList && resultList.size() > 0) {
+ return AjaxResult.error("车辆'" + reqVO.getCarVin() + "'已存在，新增车辆失败。");
+ }
+
+ return AjaxResult.success(tblCarOrderFormalInfoService.saveOrderDetailInfo(reqVO));
+ }
+
+ /**
+ * 导入车辆
+ *
+ */
+ @PreAuthorize("@ss.hasPermi('business:orderFormal:addCar')")
+ @Log(title = "导入车辆", businessType = BusinessType.INSERT)
+ @PostMapping(value = "/importCar")
+ public AjaxResult importCar(MultipartFile file, String id) {
+ return AjaxResult.success(tblCarOrderFormalInfoService.importCar(file, id));
+ }
+
+ /**
+ * 获取车辆正式委托单信息详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:orderFormal:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id) {
+ return AjaxResult.success(tblCarOrderFormalInfoService.selectTblCarOrderFormalInfoById(id));
+ }
+
+ /**
+ * 完成委托单前，检查车辆状态
+ */
+ @PreAuthorize("@ss.hasPermi('business:orderFormal:edit')")
+ @PutMapping(value = "/checkCarStatus")
+ public AjaxResult checkCarStatus(@RequestBody OrderFormalCompleteCheckReqVO reqVO) {
+ return AjaxResult.success(tblCarOrderFormalInfoService.checkCarStatus(reqVO));
+ }
+
+ /**
+ * 完成委托单
+ */
+ @PreAuthorize("@ss.hasPermi('business:orderFormal:edit')")
+ @Log(title = "车辆正式委托单信息", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody OrderFormalCompleteCheckReqVO reqVO) {
+ return toAjax(tblCarOrderFormalInfoService.updateTblCarOrderFormalInfo(reqVO));
+ }
+
+ /**
+ * 强制完成委托单
+ */
+ @PreAuthorize("@ss.hasPermi('business:orderFormal:forceComplete')")
+ @Log(title = "车辆正式委托单信息", businessType = BusinessType.UPDATE)
+ @PutMapping("/forceComplete")
+ public AjaxResult forceComplete(@RequestBody OrderFormalCompleteCheckReqVO reqVO) {
+ return toAjax(tblCarOrderFormalInfoService.updateTblCarOrderFormalInfo(reqVO));
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/OuterUserDataController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/OuterUserDataController.java
new file mode 100644
index 00000000..f15543f5
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/OuterUserDataController.java
@@ -0,0 +1,125 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblCarInspectDetailInfo;
+import com.jiuyv.business.domain.TblCarInspectInfo;
+import com.jiuyv.business.domain.TblCarOrderFormalInfo;
+import com.jiuyv.business.domain.TblInspectRecordInfo;
+import com.jiuyv.business.service.CarInspectDetailInfoService;
+import com.jiuyv.business.service.CarInspectInfoService;
+import com.jiuyv.business.service.CarOrderFormalInfoService;
+import com.jiuyv.business.service.InspectRecordInfoService;
+import com.jiuyv.business.vo.inspect.ResQueryInspectDetailPage;
+import com.jiuyv.business.vo.inspectrecord.ResQueryInspectRecordPage;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.domain.entity.SysUser;
+import com.jiuyv.common.core.domain.model.LoginUser;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.utils.SecurityUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author he_jiebing@jiuyv.com
+ * @create 2023-08-23 10:32
+ */
+
+@RestController
+@RequestMapping("/outer/company")
+public class OuterUserDataController extends BaseController {
+
+ @Autowired
+ private CarOrderFormalInfoService tblCarOrderFormalInfoService;
+
+ @Autowired
+ private CarInspectInfoService tblCarInspectInfoService;
+
+ @Autowired
+ private CarInspectDetailInfoService tblCarInspectDetailInfoService;
+
+ @Autowired
+ private InspectRecordInfoService tblInspectRecordInfoService;
+
+ /**
+ * 查询车辆正式委托单信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('company:orderFormal:list')")
+ @GetMapping("/orderFormal/list")
+ public TableDataInfo orderFormalList(TblCarOrderFormalInfo tblCarOrderFormalInfo) {
+ startPage();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ SysUser user = loginUser.getUser();
+ if (StringUtils.isNotBlank(user.getCompanyId())) {
+ tblCarOrderFormalInfo.setCompanyId(user.getCompanyId());
+ }
+ List list = tblCarOrderFormalInfoService.selectTblCarOrderFormalInfoList(tblCarOrderFormalInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 查询车辆检查信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('company:inspect:list')")
+ @GetMapping("/inspect/list")
+ public TableDataInfo inspectList(TblCarInspectInfo tblCarInspectInfo) {
+ startPage();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ SysUser user = loginUser.getUser();
+ if (StringUtils.isNotBlank(user.getCompanyId())) {
+ tblCarInspectInfo.setCompanyId(user.getCompanyId());
+ }
+ List list = tblCarInspectInfoService.selectTblCarInspectInfoList(tblCarInspectInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 查询车辆检查信息明细列表
+ */
+ @PreAuthorize("@ss.hasPermi('company:inspectDetail:list')")
+ @GetMapping("/inspectDetail/list")
+ public TableDataInfo inspectDetailList(TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ startPage();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ SysUser user = loginUser.getUser();
+ if (StringUtils.isNotBlank(user.getCompanyId())) {
+ tblCarInspectDetailInfo.setCompanyId(user.getCompanyId());
+ }
+ List list = tblCarInspectDetailInfoService.queryInspectDetailPage(tblCarInspectDetailInfo);
+ TableDataInfo dataTable = getDataTable(list);
+ List rows = (List) dataTable.getRows();
+ for (ResQueryInspectDetailPage res : rows) {
+ String partComment = res.getPartComment();
+ if (StringUtils.isNotBlank(partComment)) {
+ res.setInspectPartSecondName(partComment);
+ }
+ String pollutantComment = res.getPollutantComment();
+ if (StringUtils.isNotBlank(pollutantComment)) {
+ res.setPollutantDetailDescName(pollutantComment);
+ }
+ }
+ dataTable.setRows(rows);
+ return dataTable;
+ }
+
+ /**
+ * 查询点检记录信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('company:inspectRecord:list')")
+ @GetMapping("/inspectRecord/list")
+ public TableDataInfo list(TblInspectRecordInfo tblInspectRecordInfo) {
+ startPage();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ SysUser user = loginUser.getUser();
+ if (StringUtils.isNotBlank(user.getCompanyId())) {
+ tblInspectRecordInfo.setCompanyId(user.getCompanyId());
+ }
+ List list = tblInspectRecordInfoService.selectTblInspectRecordInfoList(tblInspectRecordInfo);
+ return getDataTable(list);
+ }
+
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/PollutantInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/PollutantInfoController.java
new file mode 100644
index 00000000..036b5497
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/PollutantInfoController.java
@@ -0,0 +1,105 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblPollutantInfo;
+import com.jiuyv.business.service.PollutantInfoService;
+import com.jiuyv.business.vo.pollutant.PollutantInfoAddReqVO;
+import com.jiuyv.business.vo.pollutant.PollutantInfoGetReqVO;
+import com.jiuyv.business.vo.pollutant.PollutantInfoQueryReqVO;
+import com.jiuyv.business.vo.pollutant.PollutantInfoQueryResVO;
+import com.jiuyv.business.vo.pollutant.PollutantInfoUpdateReqVO;
+import com.jiuyv.common.annotation.Log;
+import com.jiuyv.common.constant.UserConstants;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.domain.AjaxResult;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 污染物信息Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/pollutant")
+public class PollutantInfoController extends BaseController {
+ @Autowired
+ private PollutantInfoService tblPollutantInfoService;
+
+ /**
+ * 查询污染物信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:pollutant:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(PollutantInfoQueryReqVO tblPollutantInfo) {
+ List list = tblPollutantInfoService.selectTblPollutantInfoList(tblPollutantInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 获取污染物信息详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:pollutant:query')")
+ @GetMapping(value = "/getInfo")
+ public AjaxResult getInfo(PollutantInfoGetReqVO pollutantInfoGetReqVO) {
+ return AjaxResult.success(tblPollutantInfoService.selectTblPollutantInfoById(pollutantInfoGetReqVO));
+ }
+
+ /**
+ * 新增污染物信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:pollutant:add')")
+ @Log(title = "污染物信息", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody PollutantInfoAddReqVO pollutantInfoAddReqVO) {
+ TblPollutantInfo tblPollutantInfo = new TblPollutantInfo();
+ tblPollutantInfo.setPollutantName(pollutantInfoAddReqVO.getPollutantName());
+ tblPollutantInfo.setPollutantType(pollutantInfoAddReqVO.getPollutantType());
+ if (UserConstants.NOT_UNIQUE.equals(tblPollutantInfoService.checkPollutantNameUnique(tblPollutantInfo))) {
+ return AjaxResult.error("新增污染物'" + pollutantInfoAddReqVO.getPollutantName() + "'失败，污染物已存在");
+ }
+ return toAjax(tblPollutantInfoService.insertTblPollutantInfo(pollutantInfoAddReqVO));
+ }
+
+ /**
+ * 修改污染物信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:pollutant:edit')")
+ @Log(title = "污染物信息", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody PollutantInfoUpdateReqVO pollutantInfoUpdateReqVO) {
+ TblPollutantInfo tblPollutantInfo = new TblPollutantInfo();
+ tblPollutantInfo.setId(pollutantInfoUpdateReqVO.getId());
+ tblPollutantInfo.setPollutantName(pollutantInfoUpdateReqVO.getPollutantName());
+ tblPollutantInfo.setPollutantType(pollutantInfoUpdateReqVO.getPollutantType());
+ if (UserConstants.NOT_UNIQUE.equals(tblPollutantInfoService.checkPollutantNameUnique(tblPollutantInfo))) {
+ return AjaxResult.error("修改污染物'" + pollutantInfoUpdateReqVO.getPollutantName() + "'失败，污染物已存在");
+ }
+ return toAjax(tblPollutantInfoService.updateTblPollutantInfo(pollutantInfoUpdateReqVO));
+ }
+
+ /**
+ * 删除污染物信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:pollutant:remove')")
+ @Log(title = "污染物信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String ids) {
+ if (tblPollutantInfoService.hasChildById(ids)) {
+ return AjaxResult.error("存在子节点,不允许删除");
+ }
+ return toAjax(tblPollutantInfoService.deleteTblPollutantInfoById(ids));
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/PreRecordDetailInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/PreRecordDetailInfoController.java
new file mode 100644
index 00000000..da07538c
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/PreRecordDetailInfoController.java
@@ -0,0 +1,62 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblCarPreRecordDetailInfo;
+import com.jiuyv.business.service.CarPreRecordDetailInfoService;
+import com.jiuyv.business.vo.prerecordetail.PreRecordDetailQueryReqVO;
+import com.jiuyv.business.vo.prerecordetail.PreRecordDetailResVO;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 车辆预录信息明细Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/preRecordDetail")
+public class PreRecordDetailInfoController extends BaseController {
+ @Autowired
+ private CarPreRecordDetailInfoService tblCarPreRecordDetailInfoService;
+
+ /**
+ * 查询车辆预录信息明细列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:preRecordDetail:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(PreRecordDetailQueryReqVO reqVO) {
+ startPage();
+ List datalist = tblCarPreRecordDetailInfoService.selectTblCarPreRecordDetailInfoList(reqVO);
+
+ TableDataInfo dataTable = getDataTable(datalist);
+ List rows = (List) dataTable.getRows();
+ PreRecordDetailResVO data = null;
+ List resultList = new ArrayList<>();
+ for (TblCarPreRecordDetailInfo detailInfo : rows) {
+ data = new PreRecordDetailResVO();
+ data.setId(detailInfo.getId());
+ data.setPreOrderId(detailInfo.getPreOrderId());
+ data.setCompanyId(detailInfo.getCompanyId());
+ data.setCompanyName(detailInfo.getCompanyName());
+ data.setCarVin(detailInfo.getCarVin());
+ data.setShipName(detailInfo.getShipName());
+ data.setWaybillNumber(detailInfo.getWaybillNumber());
+ data.setDepartPort(detailInfo.getDepartPort());
+ data.setCarNumber(detailInfo.getCarNumber());
+ data.setCarModel(detailInfo.getCarModel());
+ data.setDestinationPort(detailInfo.getDestinationPort());
+ data.setDestinationCountry(detailInfo.getDestinationCountry());
+ resultList.add(data);
+ }
+ dataTable.setRows(resultList);
+ return dataTable;
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/PreRecordInfoController.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/PreRecordInfoController.java
new file mode 100644
index 00000000..0b76f849
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/controller/PreRecordInfoController.java
@@ -0,0 +1,101 @@
+package com.jiuyv.business.controller;
+
+import com.jiuyv.business.domain.TblCarPreRecordInfo;
+import com.jiuyv.business.service.CarPreRecordInfoService;
+import com.jiuyv.business.vo.prerecord.PreRecordEffectReqVO;
+import com.jiuyv.business.vo.prerecord.PreRecordTemplate;
+import com.jiuyv.common.annotation.Log;
+import com.jiuyv.common.core.controller.BaseController;
+import com.jiuyv.common.core.domain.AjaxResult;
+import com.jiuyv.common.core.page.TableDataInfo;
+import com.jiuyv.common.enums.BusinessType;
+import com.jiuyv.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 车辆预录信息Controller
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@RestController
+@RequestMapping("/business/preRecord")
+public class PreRecordInfoController extends BaseController {
+ @Autowired
+ private CarPreRecordInfoService tblCarPreRecordInfoService;
+
+ /**
+ * 查询车辆预录信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('business:preRecord:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(TblCarPreRecordInfo tblCarPreRecordInfo) {
+ startPage();
+ List list = tblCarPreRecordInfoService.selectTblCarPreRecordInfoList(tblCarPreRecordInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 获取导入车辆信息模版
+ *
+ * @param response
+ */
+ @PostMapping("/importTemplate")
+ public void importTemplate(HttpServletResponse response) {
+ ExcelUtil util = new ExcelUtil(PreRecordTemplate.class);
+ util.importTemplateExcel(response, "车辆预录信息");
+ }
+
+ /**
+ * 导入车辆信息，形成预录单并记录车辆清单数据
+ */
+ @Log(title = "车辆预录信息", businessType = BusinessType.IMPORT)
+ @PreAuthorize("@ss.hasPermi('business:preRecord:import')")
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file, String companyId) throws Exception {
+ String message = tblCarPreRecordInfoService.importData(file, companyId);
+ return AjaxResult.success(message);
+ }
+
+ /**
+ * 获取车辆预录信息详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:preRecord:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id) {
+ return AjaxResult.success(tblCarPreRecordInfoService.selectTblCarPreRecordInfoById(id));
+ }
+
+ /**
+ * 修改车辆预录信息 生效
+ */
+ @PreAuthorize("@ss.hasPermi('business:preRecord:effect')")
+ @Log(title = "车辆预录信息", businessType = BusinessType.UPDATE)
+ @PutMapping("/effect")
+ public AjaxResult effect(@RequestBody PreRecordEffectReqVO reqVO) {
+ return AjaxResult.success(tblCarPreRecordInfoService.effectData(reqVO));
+ }
+
+ /**
+ * 删除车辆预录信息
+ */
+ @PreAuthorize("@ss.hasPermi('business:preRecord:remove')")
+ @Log(title = "车辆预录信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String ids) {
+ return toAjax(tblCarPreRecordInfoService.deleteTblCarPreRecordInfoById(ids));
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectDetailHisInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectDetailHisInfo.java
new file mode 100644
index 00000000..51020f03
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectDetailHisInfo.java
@@ -0,0 +1,488 @@
+package com.jiuyv.business.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 车辆检查信息明细历史对象 tbl_car_inspect_detail_his_info
+ *
+ * @author jiuyv
+ * @date 2023-07-27
+ */
+public class TblCarInspectDetailHisInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @Excel(name = "主键")
+ private String id;
+
+ /**
+ * version
+ */
+ @Excel(name = "version")
+ private String version;
+
+ /**
+ * 车辆检查主表id
+ */
+ @Excel(name = "车辆检查主表id")
+ private String mainId;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+ @Excel(name = "检验单位id")
+ private String inspectOrgId;
+
+ /**
+ * 委托单号
+ */
+ @Excel(name = "委托单号")
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyId;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 车架号
+ */
+ @Excel(name = "车架号")
+ private String carVin;
+
+ /**
+ * 检查类型 00 底盘 01 车身
+ */
+ @Excel(name = "检查类型 00 底盘 01 车身")
+ private String checkType;
+
+ /**
+ * 检查部位
+ */
+ @Excel(name = "检查部位")
+ private String inspectPartFirst;
+
+ /**
+ * 检查部位二级
+ */
+ @Excel(name = "检查部位二级")
+ private String inspectPartSecond;
+
+ /**
+ * 检查场地
+ */
+ @Excel(name = "检查场地")
+ private String inspectSite;
+
+ /**
+ * 污染物种类
+ */
+ @Excel(name = "污染物种类")
+ private String pollutantType;
+
+ /**
+ * 污染物具体种类
+ */
+ @Excel(name = "污染物具体种类")
+ private String pollutantDetailType;
+
+ /**
+ * 污染物具体描述
+ */
+ @Excel(name = "污染物具体描述")
+ private String pollutantDetailDesc;
+
+ /**
+ * 污染物图片：图片文件id list json
+ */
+ @Excel(name = "污染物图片：图片文件id list json")
+ private String checkImg;
+
+ /**
+ * 是否发现污染物 00 是 01 否
+ */
+ @Excel(name = "是否发现污染物 00 是 01 否")
+ private String pollutantFlag;
+
+ /**
+ * 清理与否 00 是 01 否
+ */
+ @Excel(name = "清理与否 00 是 01 否")
+ private String cleanFlag;
+
+ /**
+ * 检查时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "检查时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date inspectTime;
+
+ /**
+ * 检查人id
+ */
+ @Excel(name = "检查人id")
+ private String inspectUserId;
+
+ /**
+ * 创建人
+ */
+ @Excel(name = "创建人")
+ private String createUserId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ /**
+ * 部位其他内容
+ */
+ @Excel(name = "部位其他内容")
+ private String partComment;
+
+ /**
+ * 污染物其他内容
+ */
+ @Excel(name = "污染物其他内容")
+ private String pollutantComment;
+
+ /**
+ * 数据状态 00 正常 99删除
+ */
+ @Excel(name = "数据状态 00 正常 99删除")
+ private String dataStatus;
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setMainId(String mainId) {
+ this.mainId = mainId;
+ }
+
+ public String getMainId() {
+ return mainId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCheckType(String checkType) {
+ this.checkType = checkType;
+ }
+
+ public String getCheckType() {
+ return checkType;
+ }
+
+ public void setInspectPartFirst(String inspectPartFirst) {
+ this.inspectPartFirst = inspectPartFirst;
+ }
+
+ public String getInspectPartFirst() {
+ return inspectPartFirst;
+ }
+
+ public void setInspectPartSecond(String inspectPartSecond) {
+ this.inspectPartSecond = inspectPartSecond;
+ }
+
+ public String getInspectPartSecond() {
+ return inspectPartSecond;
+ }
+
+ public void setInspectSite(String inspectSite) {
+ this.inspectSite = inspectSite;
+ }
+
+ public String getInspectSite() {
+ return inspectSite;
+ }
+
+ public void setPollutantType(String pollutantType) {
+ this.pollutantType = pollutantType;
+ }
+
+ public String getPollutantType() {
+ return pollutantType;
+ }
+
+ public void setPollutantDetailType(String pollutantDetailType) {
+ this.pollutantDetailType = pollutantDetailType;
+ }
+
+ public String getPollutantDetailType() {
+ return pollutantDetailType;
+ }
+
+ public void setPollutantDetailDesc(String pollutantDetailDesc) {
+ this.pollutantDetailDesc = pollutantDetailDesc;
+ }
+
+ public String getPollutantDetailDesc() {
+ return pollutantDetailDesc;
+ }
+
+ public void setCheckImg(String checkImg) {
+ this.checkImg = checkImg;
+ }
+
+ public String getCheckImg() {
+ return checkImg;
+ }
+
+ public void setPollutantFlag(String pollutantFlag) {
+ this.pollutantFlag = pollutantFlag;
+ }
+
+ public String getPollutantFlag() {
+ return pollutantFlag;
+ }
+
+ public void setCleanFlag(String cleanFlag) {
+ this.cleanFlag = cleanFlag;
+ }
+
+ public String getCleanFlag() {
+ return cleanFlag;
+ }
+
+ public void setInspectTime(Date inspectTime) {
+ this.inspectTime = inspectTime;
+ }
+
+ public Date getInspectTime() {
+ return inspectTime;
+ }
+
+ public void setInspectUserId(String inspectUserId) {
+ this.inspectUserId = inspectUserId;
+ }
+
+ public String getInspectUserId() {
+ return inspectUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public String getPartComment() {
+ return partComment;
+ }
+
+ public void setPartComment(String partComment) {
+ this.partComment = partComment;
+ }
+
+ public String getPollutantComment() {
+ return pollutantComment;
+ }
+
+ public void setPollutantComment(String pollutantComment) {
+ this.pollutantComment = pollutantComment;
+ }
+
+ public String getDataStatus() {
+ return dataStatus;
+ }
+
+ public void setDataStatus(String dataStatus) {
+ this.dataStatus = dataStatus;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("mainId", getMainId())
+ .append("orgId", getOrgId())
+ .append("inspectOrgId", getInspectOrgId())
+ .append("orderId", getOrderId())
+ .append("companyId", getCompanyId())
+ .append("shipName", getShipName())
+ .append("carVin", getCarVin())
+ .append("checkType", getCheckType())
+ .append("inspectPartFirst", getInspectPartFirst())
+ .append("inspectPartSecond", getInspectPartSecond())
+ .append("inspectSite", getInspectSite())
+ .append("pollutantType", getPollutantType())
+ .append("pollutantDetailType", getPollutantDetailType())
+ .append("pollutantDetailDesc", getPollutantDetailDesc())
+ .append("checkImg", getCheckImg())
+ .append("pollutantFlag", getPollutantFlag())
+ .append("cleanFlag", getCleanFlag())
+ .append("inspectTime", getInspectTime())
+ .append("inspectUserId", getInspectUserId())
+ .append("createUserId", getCreateUserId())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .append("partComment", getPartComment())
+ .append("pollutantComment", getPollutantComment())
+ .append("dataStatus", getDataStatus())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectDetailInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectDetailInfo.java
new file mode 100644
index 00000000..0332f3a9
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectDetailInfo.java
@@ -0,0 +1,501 @@
+package com.jiuyv.business.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 车辆检查信息明细对象 tbl_car_inspect_detail_info
+ *
+ * @author jiuyv
+ * @date 2023-07-27
+ */
+public class TblCarInspectDetailInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @Excel(name = "主键")
+ private String id;
+
+ /**
+ * version
+ */
+ @Excel(name = "version")
+ private String version;
+
+ /**
+ * 车辆检查主表id
+ */
+ @Excel(name = "车辆检查主表id")
+ private String mainId;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+ @Excel(name = "检验单位id")
+ private String inspectOrgId;
+
+ /**
+ * 委托单号
+ */
+ @Excel(name = "委托单号")
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyId;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 车架号
+ */
+ @Excel(name = "车架号")
+ private String carVin;
+
+ /**
+ * 检查类型 00 底盘 01 车身
+ */
+ @Excel(name = "检查类型 00 底盘 01 车身")
+ private String checkType;
+
+ /**
+ * 检查部位
+ */
+ @Excel(name = "检查部位")
+ private String inspectPartFirst;
+
+ /**
+ * 检查部位二级
+ */
+ @Excel(name = "检查部位二级")
+ private String inspectPartSecond;
+
+ /**
+ * 部位其他内容
+ */
+ @Excel(name = "部位其他内容")
+ private String partComment;
+
+ /**
+ * 检查场地
+ */
+ @Excel(name = "检查场地")
+ private String inspectSite;
+
+ /**
+ * 污染物种类
+ */
+ @Excel(name = "污染物种类")
+ private String pollutantType;
+
+ /**
+ * 污染物具体种类
+ */
+ @Excel(name = "污染物具体种类")
+ private String pollutantDetailType;
+
+ /**
+ * 污染物具体描述
+ */
+ @Excel(name = "污染物具体描述")
+ private String pollutantDetailDesc;
+
+ /**
+ * 污染物其他内容
+ */
+ @Excel(name = "污染物其他内容")
+ private String pollutantComment;
+
+ /**
+ * 污染物图片：图片文件id list json
+ */
+ @Excel(name = "污染物图片：图片文件id list json")
+ private String checkImg;
+
+ /**
+ * 是否发现污染物 00 是 01 否
+ */
+ @Excel(name = "是否发现污染物 00 是 01 否")
+ private String pollutantFlag;
+
+ /**
+ * 清理与否 00 是 01 否
+ */
+ @Excel(name = "清理与否 00 是 01 否")
+ private String cleanFlag;
+
+ /**
+ * 检查时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "检查时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date inspectTime;
+
+ /**
+ * 检查人id
+ */
+ @Excel(name = "检查人id")
+ private String inspectUserId;
+
+ /**
+ * 创建人
+ */
+ @Excel(name = "创建人")
+ private String createUserId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ /**
+ * 数据状态 00 正常 99删除
+ */
+ @Excel(name = "数据状态 00 正常 99删除")
+ private String dataStatus;
+
+ /**
+ * 公司名称
+ */
+ private String companyName;
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setMainId(String mainId) {
+ this.mainId = mainId;
+ }
+
+ public String getMainId() {
+ return mainId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCheckType(String checkType) {
+ this.checkType = checkType;
+ }
+
+ public String getCheckType() {
+ return checkType;
+ }
+
+ public void setInspectPartFirst(String inspectPartFirst) {
+ this.inspectPartFirst = inspectPartFirst;
+ }
+
+ public String getInspectPartFirst() {
+ return inspectPartFirst;
+ }
+
+ public void setInspectPartSecond(String inspectPartSecond) {
+ this.inspectPartSecond = inspectPartSecond;
+ }
+
+ public String getInspectPartSecond() {
+ return inspectPartSecond;
+ }
+
+ public String getPartComment() {
+ return partComment;
+ }
+
+ public void setPartComment(String partComment) {
+ this.partComment = partComment;
+ }
+
+ public void setInspectSite(String inspectSite) {
+ this.inspectSite = inspectSite;
+ }
+
+ public String getInspectSite() {
+ return inspectSite;
+ }
+
+ public void setPollutantType(String pollutantType) {
+ this.pollutantType = pollutantType;
+ }
+
+ public String getPollutantType() {
+ return pollutantType;
+ }
+
+ public void setPollutantDetailType(String pollutantDetailType) {
+ this.pollutantDetailType = pollutantDetailType;
+ }
+
+ public String getPollutantDetailType() {
+ return pollutantDetailType;
+ }
+
+ public void setPollutantDetailDesc(String pollutantDetailDesc) {
+ this.pollutantDetailDesc = pollutantDetailDesc;
+ }
+
+ public String getPollutantDetailDesc() {
+ return pollutantDetailDesc;
+ }
+
+ public String getPollutantComment() {
+ return pollutantComment;
+ }
+
+ public void setPollutantComment(String pollutantComment) {
+ this.pollutantComment = pollutantComment;
+ }
+
+ public void setCheckImg(String checkImg) {
+ this.checkImg = checkImg;
+ }
+
+ public String getCheckImg() {
+ return checkImg;
+ }
+
+ public void setPollutantFlag(String pollutantFlag) {
+ this.pollutantFlag = pollutantFlag;
+ }
+
+ public String getPollutantFlag() {
+ return pollutantFlag;
+ }
+
+ public void setCleanFlag(String cleanFlag) {
+ this.cleanFlag = cleanFlag;
+ }
+
+ public String getCleanFlag() {
+ return cleanFlag;
+ }
+
+ public void setInspectTime(Date inspectTime) {
+ this.inspectTime = inspectTime;
+ }
+
+ public Date getInspectTime() {
+ return inspectTime;
+ }
+
+ public void setInspectUserId(String inspectUserId) {
+ this.inspectUserId = inspectUserId;
+ }
+
+ public String getInspectUserId() {
+ return inspectUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public String getDataStatus() {
+ return dataStatus;
+ }
+
+ public void setDataStatus(String dataStatus) {
+ this.dataStatus = dataStatus;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("mainId", getMainId())
+ .append("orgId", getOrgId())
+ .append("inspectOrgId", getInspectOrgId())
+ .append("orderId", getOrderId())
+ .append("companyId", getCompanyId())
+ .append("shipName", getShipName())
+ .append("carVin", getCarVin())
+ .append("checkType", getCheckType())
+ .append("inspectPartFirst", getInspectPartFirst())
+ .append("inspectPartSecond", getInspectPartSecond())
+ .append("partComment", getPartComment())
+ .append("inspectSite", getInspectSite())
+ .append("pollutantType", getPollutantType())
+ .append("pollutantDetailType", getPollutantDetailType())
+ .append("pollutantDetailDesc", getPollutantDetailDesc())
+ .append("pollutantComment", getPollutantComment())
+ .append("checkImg", getCheckImg())
+ .append("pollutantFlag", getPollutantFlag())
+ .append("cleanFlag", getCleanFlag())
+ .append("inspectTime", getInspectTime())
+ .append("inspectUserId", getInspectUserId())
+ .append("createUserId", getCreateUserId())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .append("dataStatus", getDataStatus())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectHisInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectHisInfo.java
new file mode 100644
index 00000000..1148e02c
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectHisInfo.java
@@ -0,0 +1,482 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 车辆检查信息主历史对象 tbl_car_inspect_his_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblCarInspectHisInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @Excel(name = "主键")
+ private String id;
+
+ /**
+ * version
+ */
+ @Excel(name = "version")
+ private String version;
+
+ /**
+ * 所属单位d
+ */
+ @Excel(name = "所属单位d")
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+ @Excel(name = "检验单位id")
+ private String inspectOrgId;
+
+ /**
+ * 委托单号
+ */
+ @Excel(name = "委托单号")
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyId;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 车架号
+ */
+ @Excel(name = "车架号")
+ private String carVin;
+
+ /**
+ * 底盘检查场地
+ */
+ @Excel(name = "底盘检查场地")
+ private String chassisInspectSite;
+
+ /**
+ * 车身检查场地
+ */
+ @Excel(name = "车身检查场地")
+ private String carBodyInspectSite;
+
+ /**
+ * 底盘检查状态
+ */
+ @Excel(name = "底盘检查状态")
+ private String chassisInspectStatus;
+
+ /**
+ * 车身检查状态
+ */
+ @Excel(name = "车身检查状态")
+ private String carBodyInspectStatus;
+
+ /**
+ * 车型
+ */
+ @Excel(name = "车型")
+ private String carModel;
+
+ /**
+ * 数量
+ */
+ @Excel(name = "数量")
+ private String carNumber;
+
+ /**
+ * 状态 00 待检查 01 已检查
+ */
+ @Excel(name = "状态 00 待检查 01 已检查")
+ private String status;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ @Excel(name = "创建人")
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ /**
+ * 来源类型 00 excel导入 01 手工录入
+ */
+ @Excel(name = "来源类型 00 excel导入 01 手工录入")
+ private String srcType;
+
+ /**
+ * 复检检查状态
+ */
+ private String carReInspectStatus;
+
+ /**
+ * 复检检查时间
+ */
+ private Date carReInspectTime;
+
+ /**
+ * 复检场地
+ */
+ private String carReInspectSite;
+
+ /**
+ * 底盘检查时间
+ */
+ private Date chassisInspectTime;
+
+ /**
+ * 车身检查时间
+ */
+ private Date carBodyInspectTime;
+
+ /**
+ * 备注
+ */
+ private String remarks;
+
+ /**
+ * 车身检查员
+ */
+ private String carBodyInspectUserId;
+
+ /**
+ * 底盘检查员
+ */
+ private String chassisInspectUserId;
+
+ /**
+ * 复检检查员
+ */
+ private String carReInspectUserId;
+
+ public String getCarBodyInspectUserId() {
+ return carBodyInspectUserId;
+ }
+
+ public void setCarBodyInspectUserId(String carBodyInspectUserId) {
+ this.carBodyInspectUserId = carBodyInspectUserId;
+ }
+
+ public String getChassisInspectUserId() {
+ return chassisInspectUserId;
+ }
+
+ public void setChassisInspectUserId(String chassisInspectUserId) {
+ this.chassisInspectUserId = chassisInspectUserId;
+ }
+
+ public String getCarReInspectUserId() {
+ return carReInspectUserId;
+ }
+
+ public void setCarReInspectUserId(String carReInspectUserId) {
+ this.carReInspectUserId = carReInspectUserId;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public Date getChassisInspectTime() {
+ return chassisInspectTime;
+ }
+
+ public void setChassisInspectTime(Date chassisInspectTime) {
+ this.chassisInspectTime = chassisInspectTime;
+ }
+
+ public Date getCarBodyInspectTime() {
+ return carBodyInspectTime;
+ }
+
+ public void setCarBodyInspectTime(Date carBodyInspectTime) {
+ this.carBodyInspectTime = carBodyInspectTime;
+ }
+
+ public String getCarReInspectSite() {
+ return carReInspectSite;
+ }
+
+ public void setCarReInspectSite(String carReInspectSite) {
+ this.carReInspectSite = carReInspectSite;
+ }
+
+ public String getCarReInspectStatus() {
+ return carReInspectStatus;
+ }
+
+ public void setCarReInspectStatus(String carReInspectStatus) {
+ this.carReInspectStatus = carReInspectStatus;
+ }
+
+ public Date getCarReInspectTime() {
+ return carReInspectTime;
+ }
+
+ public void setCarReInspectTime(Date carReInspectTime) {
+ this.carReInspectTime = carReInspectTime;
+ }
+
+ public String getSrcType() {
+ return srcType;
+ }
+
+ public void setSrcType(String srcType) {
+ this.srcType = srcType;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public String getChassisInspectSite() {
+ return chassisInspectSite;
+ }
+
+ public void setChassisInspectSite(String chassisInspectSite) {
+ this.chassisInspectSite = chassisInspectSite;
+ }
+
+ public String getCarBodyInspectSite() {
+ return carBodyInspectSite;
+ }
+
+ public void setCarBodyInspectSite(String carBodyInspectSite) {
+ this.carBodyInspectSite = carBodyInspectSite;
+ }
+
+ public String getChassisInspectStatus() {
+ return chassisInspectStatus;
+ }
+
+ public void setChassisInspectStatus(String chassisInspectStatus) {
+ this.chassisInspectStatus = chassisInspectStatus;
+ }
+
+ public String getCarBodyInspectStatus() {
+ return carBodyInspectStatus;
+ }
+
+ public void setCarBodyInspectStatus(String carBodyInspectStatus) {
+ this.carBodyInspectStatus = carBodyInspectStatus;
+ }
+
+ public String getCarModel() {
+ return carModel;
+ }
+
+ public void setCarModel(String carModel) {
+ this.carModel = carModel;
+ }
+
+ public String getCarNumber() {
+ return carNumber;
+ }
+
+ public void setCarNumber(String carNumber) {
+ this.carNumber = carNumber;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("orgId", getOrgId())
+ .append("inspectOrgId", getInspectOrgId())
+ .append("orderId", getOrderId())
+ .append("companyId", getCompanyId())
+ .append("shipName", getShipName())
+ .append("carVin", getCarVin())
+ .append("chassisInspectSite", getChassisInspectSite())
+ .append("carBodyInspectSite", getCarBodyInspectSite())
+ .append("chassisInspectStatus", getChassisInspectStatus())
+ .append("carBodyInspectStatus", getCarBodyInspectStatus())
+ .append("carModel", getCarModel())
+ .append("carNumber", getCarNumber())
+ .append("status", getStatus())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectInfo.java
new file mode 100644
index 00000000..1d4603a5
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarInspectInfo.java
@@ -0,0 +1,557 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 车辆检查信息对象 tbl_car_inspect_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblCarInspectInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * version
+ */
+ private String version;
+
+ /**
+ * 所属单位d
+ */
+ @Excel(name = "所属单位d")
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+ @Excel(name = "检验单位id")
+ private String inspectOrgId;
+
+ /**
+ * 检验单位id
+ */
+ @Excel(name = "检验单位id")
+ private String inspectOrgName;
+
+ /**
+ * 委托单号
+ */
+ @Excel(name = "委托单号")
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyName;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 车架号
+ */
+ @Excel(name = "车架号")
+ private String carVin;
+
+ /**
+ * 底盘检查场地
+ */
+ private String chassisInspectSite;
+
+ /**
+ * 底盘检查场地
+ */
+ @Excel(name = "底盘检查场地")
+ private String chassisSiteName;
+
+ /**
+ * 车身检查场地
+ */
+ private String carBodyInspectSite;
+
+ /**
+ * 车身检查场地
+ */
+ @Excel(name = "车身检查场地")
+ private String bodySiteName;
+
+ /**
+ * 底盘检查状态 00 待检查 01 已检查
+ */
+ @Excel(name = "底盘检查状态")
+ private String chassisInspectStatus;
+
+ /**
+ * 车身检查状态 00 待检查 01 已检查
+ */
+ @Excel(name = "车身检查状态")
+ private String carBodyInspectStatus;
+
+ /**
+ * 车型
+ */
+ @Excel(name = "车型")
+ private String carModel;
+
+ /**
+ * 数量
+ */
+ @Excel(name = "数量")
+ private String carNumber;
+
+ /**
+ * 备注
+ */
+ @Excel(name = "备注")
+ private String remarks;
+
+ /**
+ * 状态 00 正常 01未见实车
+ */
+ @Excel(name = "车辆状态 00 正常 01未见实车")
+ private String status;
+
+ /**
+ * 来源类型 00 excel导入 01 手工录入
+ */
+ @Excel(name = "来源类型 00 excel导入 01 手工录入")
+ private String srcType;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ private String rsv3;
+
+ /**
+ * 车身检查时间
+ */
+ private Date carBodyInspectTime;
+
+ /**
+ * 底盘检查时间
+ */
+ private Date chassisInspectTime;
+
+ /**
+ * 复检检查状态
+ */
+ private String carReInspectStatus;
+
+ /**
+ * 复检检查时间
+ */
+ private Date carReInspectTime;
+
+ /**
+ * 复检检查场地
+ */
+ @Excel(name = "复检检查场地")
+ private String carReSiteName;
+
+ /**
+ * 复检检查场地
+ */
+ private String carReInspectSite;
+
+ /**
+ * 车身检查员
+ */
+ private String carBodyInspectUserId;
+
+ /**
+ * 底盘检查员
+ */
+ private String chassisInspectUserId;
+
+ /**
+ * 复检检查员
+ */
+ private String carReInspectUserId;
+
+ /**
+ * 委托单状态 00 未完成 01 已完成
+ */
+ private String orderStatus;
+
+ public String getOrderStatus() {
+ return orderStatus;
+ }
+
+ public void setOrderStatus(String orderStatus) {
+ this.orderStatus = orderStatus;
+ }
+
+ public String getCarBodyInspectUserId() {
+ return carBodyInspectUserId;
+ }
+
+ public void setCarBodyInspectUserId(String carBodyInspectUserId) {
+ this.carBodyInspectUserId = carBodyInspectUserId;
+ }
+
+ public String getChassisInspectUserId() {
+ return chassisInspectUserId;
+ }
+
+ public void setChassisInspectUserId(String chassisInspectUserId) {
+ this.chassisInspectUserId = chassisInspectUserId;
+ }
+
+ public String getCarReInspectUserId() {
+ return carReInspectUserId;
+ }
+
+ public void setCarReInspectUserId(String carReInspectUserId) {
+ this.carReInspectUserId = carReInspectUserId;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getCarReSiteName() {
+ return carReSiteName;
+ }
+
+ public void setCarReSiteName(String carReSiteName) {
+ this.carReSiteName = carReSiteName;
+ }
+
+ public String getCarReInspectSite() {
+ return carReInspectSite;
+ }
+
+ public void setCarReInspectSite(String carReInspectSite) {
+ this.carReInspectSite = carReInspectSite;
+ }
+
+ public String getCarReInspectStatus() {
+ return carReInspectStatus;
+ }
+
+ public void setCarReInspectStatus(String carReInspectStatus) {
+ this.carReInspectStatus = carReInspectStatus;
+ }
+
+ public Date getCarReInspectTime() {
+ return carReInspectTime;
+ }
+
+ public void setCarReInspectTime(Date carReInspectTime) {
+ this.carReInspectTime = carReInspectTime;
+ }
+
+ public Date getCarBodyInspectTime() {
+ return carBodyInspectTime;
+ }
+
+ public void setCarBodyInspectTime(Date carBodyInspectTime) {
+ this.carBodyInspectTime = carBodyInspectTime;
+ }
+
+ public Date getChassisInspectTime() {
+ return chassisInspectTime;
+ }
+
+ public void setChassisInspectTime(Date chassisInspectTime) {
+ this.chassisInspectTime = chassisInspectTime;
+ }
+
+ public String getSrcType() {
+ return srcType;
+ }
+
+ public void setSrcType(String srcType) {
+ this.srcType = srcType;
+ }
+
+ public String getChassisSiteName() {
+ return chassisSiteName;
+ }
+
+ public void setChassisSiteName(String chassisSiteName) {
+ this.chassisSiteName = chassisSiteName;
+ }
+
+ public String getBodySiteName() {
+ return bodySiteName;
+ }
+
+ public void setBodySiteName(String bodySiteName) {
+ this.bodySiteName = bodySiteName;
+ }
+
+ public String getInspectOrgName() {
+ return inspectOrgName;
+ }
+
+ public void setInspectOrgName(String inspectOrgName) {
+ this.inspectOrgName = inspectOrgName;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public String getChassisInspectSite() {
+ return chassisInspectSite;
+ }
+
+ public void setChassisInspectSite(String chassisInspectSite) {
+ this.chassisInspectSite = chassisInspectSite;
+ }
+
+ public String getCarBodyInspectSite() {
+ return carBodyInspectSite;
+ }
+
+ public void setCarBodyInspectSite(String carBodyInspectSite) {
+ this.carBodyInspectSite = carBodyInspectSite;
+ }
+
+ public String getChassisInspectStatus() {
+ return chassisInspectStatus;
+ }
+
+ public void setChassisInspectStatus(String chassisInspectStatus) {
+ this.chassisInspectStatus = chassisInspectStatus;
+ }
+
+ public String getCarBodyInspectStatus() {
+ return carBodyInspectStatus;
+ }
+
+ public void setCarBodyInspectStatus(String carBodyInspectStatus) {
+ this.carBodyInspectStatus = carBodyInspectStatus;
+ }
+
+ public String getCarModel() {
+ return carModel;
+ }
+
+ public void setCarModel(String carModel) {
+ this.carModel = carModel;
+ }
+
+ public String getCarNumber() {
+ return carNumber;
+ }
+
+ public void setCarNumber(String carNumber) {
+ this.carNumber = carNumber;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("orgId", getOrgId())
+ .append("inspectOrgId", getInspectOrgId())
+ .append("orderId", getOrderId())
+ .append("companyId", getCompanyId())
+ .append("shipName", getShipName())
+ .append("carVin", getCarVin())
+ .append("chassisInspectSite", getChassisInspectSite())
+ .append("carBodyInspectSite", getCarBodyInspectSite())
+ .append("chassisInspectStatus", getChassisInspectStatus())
+ .append("carBodyInspectStatus", getCarBodyInspectStatus())
+ .append("carModel", getCarModel())
+ .append("carNumber", getCarNumber())
+ .append("status", getStatus())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalDetailHisInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalDetailHisInfo.java
new file mode 100644
index 00000000..70afb6d7
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalDetailHisInfo.java
@@ -0,0 +1,423 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+/**
+ * 车辆正式委托单信息明细历史对象 tbl_car_order_formal_detail_his_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblCarOrderFormalDetailHisInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @Excel(name = "主键")
+ private String id;
+
+ /**
+ * 版本号
+ */
+ @Excel(name = "版本号")
+ private String version;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+ @Excel(name = "检验单位id")
+ private String inspectOrgId;
+
+ /**
+ * 预录单号
+ */
+ @Excel(name = "预录单号")
+ private String preOrderId;
+
+ /**
+ * 委托单号
+ */
+ @Excel(name = "委托单号")
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyId;
+
+ /**
+ * 车架号
+ */
+ @Excel(name = "车架号")
+ private String carVin;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 底盘检查场地
+ */
+ @Excel(name = "底盘检查场地")
+ private String chassisInspectSite;
+
+ /**
+ * 车身检查场地
+ */
+ @Excel(name = "车身检查场地")
+ private String carBodyInspectSite;
+
+ /**
+ * 发运单号
+ */
+ @Excel(name = "发运单号")
+ private String waybillNumber;
+
+ /**
+ * 来源类型 00 excel导入 01 手工录入
+ */
+ @Excel(name = "来源类型 00 excel导入 01 手工录入")
+ private String srcType;
+
+ /**
+ * 启运港
+ */
+ @Excel(name = "启运港")
+ private String departPort;
+
+ /**
+ * 数量
+ */
+ @Excel(name = "数量")
+ private String carNumber;
+
+ /**
+ * 车型
+ */
+ @Excel(name = "车型")
+ private String carModel;
+
+ /**
+ * 目的港
+ */
+ @Excel(name = "目的港")
+ private String destinationPort;
+
+ /**
+ * 目的国
+ */
+ @Excel(name = "目的国")
+ private String destinationCountry;
+
+ /**
+ * 状态 00 正常 01 删除
+ */
+ @Excel(name = "状态 00 正常 01 删除")
+ private String status;
+
+ /**
+ * 导入时间
+ */
+ private Date createTime;
+
+ /**
+ * 导入人
+ */
+ @Excel(name = "导入人")
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ /**
+ * 备注
+ */
+ private String remarks;
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getPreOrderId() {
+ return preOrderId;
+ }
+
+ public void setPreOrderId(String preOrderId) {
+ this.preOrderId = preOrderId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getChassisInspectSite() {
+ return chassisInspectSite;
+ }
+
+ public void setChassisInspectSite(String chassisInspectSite) {
+ this.chassisInspectSite = chassisInspectSite;
+ }
+
+ public String getCarBodyInspectSite() {
+ return carBodyInspectSite;
+ }
+
+ public void setCarBodyInspectSite(String carBodyInspectSite) {
+ this.carBodyInspectSite = carBodyInspectSite;
+ }
+
+ public String getWaybillNumber() {
+ return waybillNumber;
+ }
+
+ public void setWaybillNumber(String waybillNumber) {
+ this.waybillNumber = waybillNumber;
+ }
+
+ public String getSrcType() {
+ return srcType;
+ }
+
+ public void setSrcType(String srcType) {
+ this.srcType = srcType;
+ }
+
+ public String getDepartPort() {
+ return departPort;
+ }
+
+ public void setDepartPort(String departPort) {
+ this.departPort = departPort;
+ }
+
+ public String getCarNumber() {
+ return carNumber;
+ }
+
+ public void setCarNumber(String carNumber) {
+ this.carNumber = carNumber;
+ }
+
+ public String getCarModel() {
+ return carModel;
+ }
+
+ public void setCarModel(String carModel) {
+ this.carModel = carModel;
+ }
+
+ public String getDestinationPort() {
+ return destinationPort;
+ }
+
+ public void setDestinationPort(String destinationPort) {
+ this.destinationPort = destinationPort;
+ }
+
+ public String getDestinationCountry() {
+ return destinationCountry;
+ }
+
+ public void setDestinationCountry(String destinationCountry) {
+ this.destinationCountry = destinationCountry;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("orgId", getOrgId())
+ .append("inspectOrgId", getInspectOrgId())
+ .append("preOrderId", getPreOrderId())
+ .append("orderId", getOrderId())
+ .append("companyId", getCompanyId())
+ .append("carVin", getCarVin())
+ .append("shipName", getShipName())
+ .append("chassisInspectSite", getChassisInspectSite())
+ .append("carBodyInspectSite", getCarBodyInspectSite())
+ .append("waybillNumber", getWaybillNumber())
+ .append("srcType", getSrcType())
+ .append("departPort", getDepartPort())
+ .append("carNumber", getCarNumber())
+ .append("carModel", getCarModel())
+ .append("destinationPort", getDestinationPort())
+ .append("destinationCountry", getDestinationCountry())
+ .append("status", getStatus())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalDetailInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalDetailInfo.java
new file mode 100644
index 00000000..44cf8a89
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalDetailInfo.java
@@ -0,0 +1,392 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 车辆正式委托单信息明细对象 tbl_car_order_formal_detail_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblCarOrderFormalDetailInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 版本号
+ */
+ private String version;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+ @Excel(name = "检验单位id")
+ private String inspectOrgId;
+
+ /**
+ * 预录单号
+ */
+ @Excel(name = "预录单号")
+ private String preOrderId;
+
+ /**
+ * 委托单号
+ */
+ @Excel(name = "委托单号")
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyId;
+
+ /**
+ * 车架号
+ */
+ @Excel(name = "车架号")
+ private String carVin;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 发运单号
+ */
+ @Excel(name = "发运单号")
+ private String waybillNumber;
+
+ /**
+ * 来源类型 00 excel导入 01 手工录入
+ */
+ @Excel(name = "来源类型 00 excel导入 01 手工录入")
+ private String srcType;
+
+ /**
+ * 启运港
+ */
+ @Excel(name = "启运港")
+ private String departPort;
+
+ /**
+ * 数量
+ */
+ @Excel(name = "数量")
+ private String carNumber;
+
+ /**
+ * 车型
+ */
+ @Excel(name = "车型")
+ private String carModel;
+
+ /**
+ * 目的港
+ */
+ @Excel(name = "目的港")
+ private String destinationPort;
+
+ /**
+ * 目的国
+ */
+ @Excel(name = "目的国")
+ private String destinationCountry;
+
+ /**
+ * 状态 00 正常 01 删除
+ */
+ @Excel(name = "状态 00 正常 01 删除")
+ private String status;
+
+ /**
+ * 导入时间
+ */
+ private Date createTime;
+
+ /**
+ * 导入人
+ */
+ @Excel(name = "导入人")
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ /**
+ * 备注
+ */
+ private String remarks;
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getPreOrderId() {
+ return preOrderId;
+ }
+
+ public void setPreOrderId(String preOrderId) {
+ this.preOrderId = preOrderId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getWaybillNumber() {
+ return waybillNumber;
+ }
+
+ public void setWaybillNumber(String waybillNumber) {
+ this.waybillNumber = waybillNumber;
+ }
+
+ public String getSrcType() {
+ return srcType;
+ }
+
+ public void setSrcType(String srcType) {
+ this.srcType = srcType;
+ }
+
+ public String getDepartPort() {
+ return departPort;
+ }
+
+ public void setDepartPort(String departPort) {
+ this.departPort = departPort;
+ }
+
+ public String getCarNumber() {
+ return carNumber;
+ }
+
+ public void setCarNumber(String carNumber) {
+ this.carNumber = carNumber;
+ }
+
+ public String getCarModel() {
+ return carModel;
+ }
+
+ public void setCarModel(String carModel) {
+ this.carModel = carModel;
+ }
+
+ public String getDestinationPort() {
+ return destinationPort;
+ }
+
+ public void setDestinationPort(String destinationPort) {
+ this.destinationPort = destinationPort;
+ }
+
+ public String getDestinationCountry() {
+ return destinationCountry;
+ }
+
+ public void setDestinationCountry(String destinationCountry) {
+ this.destinationCountry = destinationCountry;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("orgId", getOrgId())
+ .append("inspectOrgId", getInspectOrgId())
+ .append("preOrderId", getPreOrderId())
+ .append("orderId", getOrderId())
+ .append("companyId", getCompanyId())
+ .append("carVin", getCarVin())
+ .append("shipName", getShipName())
+ .append("waybillNumber", getWaybillNumber())
+ .append("srcType", getSrcType())
+ .append("departPort", getDepartPort())
+ .append("carNumber", getCarNumber())
+ .append("carModel", getCarModel())
+ .append("destinationPort", getDestinationPort())
+ .append("destinationCountry", getDestinationCountry())
+ .append("status", getStatus())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalHisInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalHisInfo.java
new file mode 100644
index 00000000..bae7bd9e
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalHisInfo.java
@@ -0,0 +1,305 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+/**
+ * 车辆正式委托单信息历史对象 tbl_car_order_formal_his_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblCarOrderFormalHisInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @Excel(name = "主键")
+ private String id;
+
+ /**
+ * 版本号
+ */
+ @Excel(name = "版本号")
+ private String version;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+ @Excel(name = "检验单位id")
+ private String inspectOrgId;
+
+ /**
+ * 预录单号
+ */
+ @Excel(name = "预录单号")
+ private String preOrderId;
+
+ /**
+ * 委托单号
+ */
+ @Excel(name = "委托单号")
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyId;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 00 未完成 01 已完成
+ */
+ @Excel(name = "00 未完成 01 已完成")
+ private String status;
+
+ /**
+ * 文件id
+ */
+ @Excel(name = "文件id")
+ private String fileId;
+
+ /**
+ * 文件名称
+ */
+ @Excel(name = "文件名称")
+ private String fileName;
+
+ /**
+ * 车辆总数
+ */
+ @Excel(name = "车辆总数")
+ private Integer carCount;
+
+ /**
+ * 导入时间
+ */
+ private Date createTime;
+
+ /**
+ * 导入人
+ */
+ @Excel(name = "导入人")
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getPreOrderId() {
+ return preOrderId;
+ }
+
+ public void setPreOrderId(String preOrderId) {
+ this.preOrderId = preOrderId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getFileId() {
+ return fileId;
+ }
+
+ public void setFileId(String fileId) {
+ this.fileId = fileId;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+ public Integer getCarCount() {
+ return carCount;
+ }
+
+ public void setCarCount(Integer carCount) {
+ this.carCount = carCount;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("orgId", getOrgId())
+ .append("inspectOrgId", getInspectOrgId())
+ .append("preOrderId", getPreOrderId())
+ .append("orderId", getOrderId())
+ .append("companyId", getCompanyId())
+ .append("shipName", getShipName())
+ .append("status", getStatus())
+ .append("fileId", getFileId())
+ .append("fileName", getFileName())
+ .append("carCount", getCarCount())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalInfo.java
new file mode 100644
index 00000000..3cd77ee3
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarOrderFormalInfo.java
@@ -0,0 +1,333 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+/**
+ * 车辆正式委托单信息对象 tbl_car_order_formal_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblCarOrderFormalInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @Excel(name = "主键")
+ private String id;
+
+ /**
+ * 版本号
+ */
+ @Excel(name = "版本号")
+ private String version;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+ @Excel(name = "检验单位id")
+ private String inspectOrgId;
+
+ /**
+ * 检验单位名称
+ */
+ @Excel(name = "检验单位名称")
+ private String inspectOrgName;
+
+ /**
+ * 预录单号
+ */
+ @Excel(name = "预录单号")
+ private String preOrderId;
+
+ /**
+ * 委托单号
+ */
+ @Excel(name = "委托单号")
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyName;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位ID")
+ private String companyId;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 00 未完成 01 已完成
+ */
+ @Excel(name = "00 未完成 01 已完成")
+ private String status;
+
+ /**
+ * 文件id
+ */
+ @Excel(name = "文件id")
+ private String fileId;
+
+ /**
+ * 文件名称
+ */
+ @Excel(name = "文件名称")
+ private String fileName;
+
+ /**
+ * 车辆总数
+ */
+ @Excel(name = "车辆总数")
+ private Integer carCount;
+
+ /**
+ * 导入时间
+ */
+ private Date createTime;
+
+ /**
+ * 导入人
+ */
+ @Excel(name = "导入人")
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ public String getInspectOrgName() {
+ return inspectOrgName;
+ }
+
+ public void setInspectOrgName(String inspectOrgName) {
+ this.inspectOrgName = inspectOrgName;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getPreOrderId() {
+ return preOrderId;
+ }
+
+ public void setPreOrderId(String preOrderId) {
+ this.preOrderId = preOrderId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getFileId() {
+ return fileId;
+ }
+
+ public void setFileId(String fileId) {
+ this.fileId = fileId;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+ public Integer getCarCount() {
+ return carCount;
+ }
+
+ public void setCarCount(Integer carCount) {
+ this.carCount = carCount;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("orgId", getOrgId())
+ .append("inspectOrgId", getInspectOrgId())
+ .append("preOrderId", getPreOrderId())
+ .append("orderId", getOrderId())
+ .append("companyId", getCompanyId())
+ .append("shipName", getShipName())
+ .append("status", getStatus())
+ .append("fileId", getFileId())
+ .append("fileName", getFileName())
+ .append("carCount", getCarCount())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarPreRecordDetailInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarPreRecordDetailInfo.java
new file mode 100644
index 00000000..481a21ee
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarPreRecordDetailInfo.java
@@ -0,0 +1,360 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 车辆预录信息明细对象 tbl_car_pre_record_detail_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblCarPreRecordDetailInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @Excel(name = "主键")
+ private String id;
+
+ /**
+ * 版本号
+ */
+ @Excel(name = "版本号")
+ private String version;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 预录单号
+ */
+ @Excel(name = "预录单号")
+ private String preOrderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyId;
+
+ /**
+ * 委托单位名称
+ */
+ private String companyName;
+
+ /**
+ * 车架号
+ */
+ @Excel(name = "车架号")
+ private String carVin;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 发运单号
+ */
+ @Excel(name = "发运单号")
+ private String waybillNumber;
+
+ /**
+ * 启运港
+ */
+ @Excel(name = "启运港")
+ private String departPort;
+
+ /**
+ * 数量
+ */
+ @Excel(name = "数量")
+ private String carNumber;
+
+ /**
+ * 车型
+ */
+ @Excel(name = "车型")
+ private String carModel;
+
+ /**
+ * 目的港
+ */
+ @Excel(name = "目的港")
+ private String destinationPort;
+
+ /**
+ * 目的国
+ */
+ @Excel(name = "目的国")
+ private String destinationCountry;
+
+ /**
+ * 状态 00 正常 01未见实车
+ */
+ private String status;
+
+ /**
+ * 导入时间
+ */
+ private Date createTime;
+
+ /**
+ * 导入人
+ */
+ @Excel(name = "导入人")
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ /**
+ * 备注
+ */
+ private String remarks;
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getPreOrderId() {
+ return preOrderId;
+ }
+
+ public void setPreOrderId(String preOrderId) {
+ this.preOrderId = preOrderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getWaybillNumber() {
+ return waybillNumber;
+ }
+
+ public void setWaybillNumber(String waybillNumber) {
+ this.waybillNumber = waybillNumber;
+ }
+
+ public String getDepartPort() {
+ return departPort;
+ }
+
+ public void setDepartPort(String departPort) {
+ this.departPort = departPort;
+ }
+
+ public String getCarNumber() {
+ return carNumber;
+ }
+
+ public void setCarNumber(String carNumber) {
+ this.carNumber = carNumber;
+ }
+
+ public String getCarModel() {
+ return carModel;
+ }
+
+ public void setCarModel(String carModel) {
+ this.carModel = carModel;
+ }
+
+ public String getDestinationPort() {
+ return destinationPort;
+ }
+
+ public void setDestinationPort(String destinationPort) {
+ this.destinationPort = destinationPort;
+ }
+
+ public String getDestinationCountry() {
+ return destinationCountry;
+ }
+
+ public void setDestinationCountry(String destinationCountry) {
+ this.destinationCountry = destinationCountry;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("orgId", getOrgId())
+ .append("preOrderId", getPreOrderId())
+ .append("companyId", getCompanyId())
+ .append("carVin", getCarVin())
+ .append("shipName", getShipName())
+ .append("waybillNumber", getWaybillNumber())
+ .append("departPort", getDepartPort())
+ .append("carNumber", getCarNumber())
+ .append("carModel", getCarModel())
+ .append("destinationPort", getDestinationPort())
+ .append("destinationCountry", getDestinationCountry())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarPreRecordInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarPreRecordInfo.java
new file mode 100644
index 00000000..c14287db
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCarPreRecordInfo.java
@@ -0,0 +1,290 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 车辆预录信息对象 tbl_car_pre_record_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblCarPreRecordInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @Excel(name = "主键")
+ private String id;
+
+ /**
+ * 版本号
+ */
+ @Excel(name = "版本号")
+ private String version;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 预录单号
+ */
+ @Excel(name = "预录单号")
+ private String preOrderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyId;
+
+ /**
+ * 委托单位名称
+ */
+ @Excel(name = "委托单位")
+ private String companyName;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 00 未生效 01 已生效
+ */
+ @Excel(name = "00 未生效 01 已生效")
+ private String status;
+
+ /**
+ * 文件id
+ */
+ @Excel(name = "文件id")
+ private String fileId;
+
+ /**
+ * 文件名称
+ */
+ @Excel(name = "文件名称")
+ private String fileName;
+
+ /**
+ * 车辆总数
+ */
+ @Excel(name = "车辆总数")
+ private Integer carCount;
+
+ /**
+ * 导入时间
+ */
+ private Date createTime;
+
+ /**
+ * 导入人
+ */
+ @Excel(name = "导入人")
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getPreOrderId() {
+ return preOrderId;
+ }
+
+ public void setPreOrderId(String preOrderId) {
+ this.preOrderId = preOrderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getFileId() {
+ return fileId;
+ }
+
+ public void setFileId(String fileId) {
+ this.fileId = fileId;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+ public Integer getCarCount() {
+ return carCount;
+ }
+
+ public void setCarCount(Integer carCount) {
+ this.carCount = carCount;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("orgId", getOrgId())
+ .append("preOrderId", getPreOrderId())
+ .append("companyId", getCompanyId())
+ .append("shipName", getShipName())
+ .append("status", getStatus())
+ .append("fileId", getFileId())
+ .append("fileName", getFileName())
+ .append("carCount", getCarCount())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCompanyInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCompanyInfo.java
new file mode 100644
index 00000000..c8620770
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblCompanyInfo.java
@@ -0,0 +1,226 @@
+package com.jiuyv.business.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 委托单位信息对象 tbl_company_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblCompanyInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 单位名称
+ */
+ @Excel(name = "单位名称")
+ private String companyName;
+
+ /**
+ * 所属单位id
+ */
+ private String orgId;
+
+ /**
+ * 联系人
+ */
+ @Excel(name = "联系人")
+ private String contactName;
+
+ /**
+ * 手机号
+ */
+ @Excel(name = "手机号")
+ private String contactPhone;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ private String updateUserId;
+
+ /**
+ * 00 正常 01 停用
+ */
+ private String status;
+
+ /**
+ * 00 正常 99 删除
+ */
+ @Excel(name = "00 正常 99 删除")
+ private String dataStatus;
+
+ /**
+ * 保留域1
+ */
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ private String rsv3;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getContactName() {
+ return contactName;
+ }
+
+ public void setContactName(String contactName) {
+ this.contactName = contactName;
+ }
+
+ public String getContactPhone() {
+ return contactPhone;
+ }
+
+ public void setContactPhone(String contactPhone) {
+ this.contactPhone = contactPhone;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getDataStatus() {
+ return dataStatus;
+ }
+
+ public void setDataStatus(String dataStatus) {
+ this.dataStatus = dataStatus;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("companyName", getCompanyName())
+ .append("orgId", getOrgId())
+ .append("contactName", getContactName())
+ .append("contactPhone", getContactPhone())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("status", getStatus())
+ .append("dataStatus", getDataStatus())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblFileInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblFileInfo.java
new file mode 100644
index 00000000..64d014c1
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblFileInfo.java
@@ -0,0 +1,231 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 文件信息对象 tbl_file_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblFileInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @Excel(name = "主键")
+ private String id;
+
+ /**
+ * 业务主键
+ */
+ @Excel(name = "业务主键")
+ private String businessId;
+
+ /**
+ * 文件类型 00 excel表 01图片
+ */
+ @Excel(name = "文件类型 00 excel表 01图片")
+ private String fileType;
+
+ /**
+ * 文件名称
+ */
+ @Excel(name = "文件名称")
+ private String fileName;
+
+ /**
+ * 文件路径
+ */
+ @Excel(name = "文件路径")
+ private String filePath;
+
+ /**
+ * 文件访问地址:相对路径
+ */
+ @Excel(name = "文件访问地址:相对路径")
+ private String fileUrl;
+
+ /**
+ * 00 正常 99 删除
+ */
+ @Excel(name = "00 正常 99 删除")
+ private String status;
+
+ /**
+ * 创建人id
+ */
+ @Excel(name = "创建人id")
+ private String createUserId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 修改人id
+ */
+ @Excel(name = "修改人id")
+ private String updateUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getBusinessId() {
+ return businessId;
+ }
+
+ public void setBusinessId(String businessId) {
+ this.businessId = businessId;
+ }
+
+ public String getFileType() {
+ return fileType;
+ }
+
+ public void setFileType(String fileType) {
+ this.fileType = fileType;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+ public String getFilePath() {
+ return filePath;
+ }
+
+ public void setFilePath(String filePath) {
+ this.filePath = filePath;
+ }
+
+ public String getFileUrl() {
+ return fileUrl;
+ }
+
+ public void setFileUrl(String fileUrl) {
+ this.fileUrl = fileUrl;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("businessId", getBusinessId())
+ .append("fileType", getFileType())
+ .append("fileName", getFileName())
+ .append("filePath", getFilePath())
+ .append("fileUrl", getFileUrl())
+ .append("status", getStatus())
+ .append("createUserId", getCreateUserId())
+ .append("createTime", getCreateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectRecordInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectRecordInfo.java
new file mode 100644
index 00000000..f507d96d
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectRecordInfo.java
@@ -0,0 +1,459 @@
+package com.jiuyv.business.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 点检记录信息对象 tbl_inspect_record_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblInspectRecordInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * version
+ */
+ private String version;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 检验单位id
+ */
+ @Excel(name = "检验单位id")
+ private String inspectOrgId;
+
+ /**
+ * 委托单号
+ */
+ @Excel(name = "委托单号")
+ private String orderId;
+
+ /**
+ * 委托单位
+ */
+ @Excel(name = "委托单位")
+ private String companyId;
+
+ /**
+ * 船名航次
+ */
+ @Excel(name = "船名航次")
+ private String shipName;
+
+ /**
+ * 车架号
+ */
+ @Excel(name = "车架号")
+ private String carVin;
+
+ /**
+ * 底盘检查场地
+ */
+ @Excel(name = "底盘检查场地")
+ private String chassisInspectSite;
+
+ /**
+ * 车身检查场地
+ */
+ @Excel(name = "车身检查场地")
+ private String carBodyInspectSite;
+
+ /**
+ * 底盘检查状态
+ */
+ @Excel(name = "底盘检查状态")
+ private String chassisInspectStatus;
+
+ /**
+ * 车身检查状态
+ */
+ @Excel(name = "车身检查状态")
+ private String carBodyInspectStatus;
+
+ /**
+ * 车身检查员
+ */
+ @Excel(name = "车身检查员")
+ private String carBodyInspectUserId;
+
+ /**
+ * 底盘检查员
+ */
+ @Excel(name = "底盘检查员")
+ private String chassisInspectUserId;
+
+ /**
+ * 车身检查开始时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "车身检查开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date carBodyInspectStartTime;
+
+ /**
+ * 车身检查完成时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "车身检查完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date carBodyInspectFinishTime;
+
+ /**
+ * 底盘检查开始时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "底盘检查开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date chassisInspectStartTime;
+
+ /**
+ * 底盘检查完成时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "底盘检查完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date chassisInspectFinishTime;
+
+ /**
+ * 创建人
+ */
+ private String createUserId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ private String rsv3;
+
+ /**
+ * 复检检查状态
+ */
+ private String carReInspectStatus;
+
+ /**
+ * 复检场地
+ */
+ private String carReInspectSite;
+
+ /**
+ * 复检开始时间
+ */
+ private Date carReInspectStartTime;
+
+ /**
+ * 复检结束时间
+ */
+ private Date carReInspectFinishTime;
+
+ /**
+ * 复检检查员
+ */
+ private String carReInspectUserId;
+
+ public String getCarReInspectStatus() {
+ return carReInspectStatus;
+ }
+
+ public void setCarReInspectStatus(String carReInspectStatus) {
+ this.carReInspectStatus = carReInspectStatus;
+ }
+
+ public String getCarReInspectSite() {
+ return carReInspectSite;
+ }
+
+ public void setCarReInspectSite(String carReInspectSite) {
+ this.carReInspectSite = carReInspectSite;
+ }
+
+ public Date getCarReInspectStartTime() {
+ return carReInspectStartTime;
+ }
+
+ public void setCarReInspectStartTime(Date carReInspectStartTime) {
+ this.carReInspectStartTime = carReInspectStartTime;
+ }
+
+ public Date getCarReInspectFinishTime() {
+ return carReInspectFinishTime;
+ }
+
+ public void setCarReInspectFinishTime(Date carReInspectFinishTime) {
+ this.carReInspectFinishTime = carReInspectFinishTime;
+ }
+
+ public String getCarReInspectUserId() {
+ return carReInspectUserId;
+ }
+
+ public void setCarReInspectUserId(String carReInspectUserId) {
+ this.carReInspectUserId = carReInspectUserId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getInspectOrgId() {
+ return inspectOrgId;
+ }
+
+ public void setInspectOrgId(String inspectOrgId) {
+ this.inspectOrgId = inspectOrgId;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getShipName() {
+ return shipName;
+ }
+
+ public void setShipName(String shipName) {
+ this.shipName = shipName;
+ }
+
+ public String getCarVin() {
+ return carVin;
+ }
+
+ public void setCarVin(String carVin) {
+ this.carVin = carVin;
+ }
+
+ public String getChassisInspectSite() {
+ return chassisInspectSite;
+ }
+
+ public void setChassisInspectSite(String chassisInspectSite) {
+ this.chassisInspectSite = chassisInspectSite;
+ }
+
+ public String getCarBodyInspectSite() {
+ return carBodyInspectSite;
+ }
+
+ public void setCarBodyInspectSite(String carBodyInspectSite) {
+ this.carBodyInspectSite = carBodyInspectSite;
+ }
+
+ public String getChassisInspectStatus() {
+ return chassisInspectStatus;
+ }
+
+ public void setChassisInspectStatus(String chassisInspectStatus) {
+ this.chassisInspectStatus = chassisInspectStatus;
+ }
+
+ public String getCarBodyInspectStatus() {
+ return carBodyInspectStatus;
+ }
+
+ public void setCarBodyInspectStatus(String carBodyInspectStatus) {
+ this.carBodyInspectStatus = carBodyInspectStatus;
+ }
+
+ public String getCarBodyInspectUserId() {
+ return carBodyInspectUserId;
+ }
+
+ public void setCarBodyInspectUserId(String carBodyInspectUserId) {
+ this.carBodyInspectUserId = carBodyInspectUserId;
+ }
+
+ public String getChassisInspectUserId() {
+ return chassisInspectUserId;
+ }
+
+ public void setChassisInspectUserId(String chassisInspectUserId) {
+ this.chassisInspectUserId = chassisInspectUserId;
+ }
+
+ public Date getCarBodyInspectStartTime() {
+ return carBodyInspectStartTime;
+ }
+
+ public void setCarBodyInspectStartTime(Date carBodyInspectStartTime) {
+ this.carBodyInspectStartTime = carBodyInspectStartTime;
+ }
+
+ public Date getCarBodyInspectFinishTime() {
+ return carBodyInspectFinishTime;
+ }
+
+ public void setCarBodyInspectFinishTime(Date carBodyInspectFinishTime) {
+ this.carBodyInspectFinishTime = carBodyInspectFinishTime;
+ }
+
+ public Date getChassisInspectStartTime() {
+ return chassisInspectStartTime;
+ }
+
+ public void setChassisInspectStartTime(Date chassisInspectStartTime) {
+ this.chassisInspectStartTime = chassisInspectStartTime;
+ }
+
+ public Date getChassisInspectFinishTime() {
+ return chassisInspectFinishTime;
+ }
+
+ public void setChassisInspectFinishTime(Date chassisInspectFinishTime) {
+ this.chassisInspectFinishTime = chassisInspectFinishTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("orgId", getOrgId())
+ .append("inspectOrgId", getInspectOrgId())
+ .append("orderId", getOrderId())
+ .append("companyId", getCompanyId())
+ .append("shipName", getShipName())
+ .append("carVin", getCarVin())
+ .append("chassisInspectSite", getChassisInspectSite())
+ .append("carBodyInspectSite", getCarBodyInspectSite())
+ .append("chassisInspectStatus", getChassisInspectStatus())
+ .append("carBodyInspectStatus", getCarBodyInspectStatus())
+ .append("carBodyInspectUserId", getCarBodyInspectUserId())
+ .append("chassisInspectUserId", getChassisInspectUserId())
+ .append("carBodyInspectStartTime", getCarBodyInspectStartTime())
+ .append("carBodyInspectFinishTime", getCarBodyInspectFinishTime())
+ .append("chassisInspectStartTime", getChassisInspectStartTime())
+ .append("chassisInspectFinishTime", getChassisInspectFinishTime())
+ .append("createUserId", getCreateUserId())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectSiteHisInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectSiteHisInfo.java
new file mode 100644
index 00000000..a46c7b59
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectSiteHisInfo.java
@@ -0,0 +1,223 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 检查场地信息历史对象 tbl_inspect_site_his_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblInspectSiteHisInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 版本号
+ */
+ private String version;
+
+ /**
+ * 场地名称
+ */
+ @Excel(name = "场地名称")
+ private String siteName;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 备注
+ */
+ @Excel(name = "备注")
+ private String remarks;
+
+ /**
+ * 00 正常 01停用
+ */
+ @Excel(name = "00 正常 01停用")
+ private String status;
+
+ /**
+ * 00 正常 99 删除
+ */
+ private String dataStatus;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ private String rsv3;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getSiteName() {
+ return siteName;
+ }
+
+ public void setSiteName(String siteName) {
+ this.siteName = siteName;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getDataStatus() {
+ return dataStatus;
+ }
+
+ public void setDataStatus(String dataStatus) {
+ this.dataStatus = dataStatus;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("siteName", getSiteName())
+ .append("orgId", getOrgId())
+ .append("remarks", getRemarks())
+ .append("status", getStatus())
+ .append("dataStatus", getDataStatus())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectSiteInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectSiteInfo.java
new file mode 100644
index 00000000..a00bf740
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectSiteInfo.java
@@ -0,0 +1,233 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 检查场地信息对象 tbl_inspect_site_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblInspectSiteInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 版本号
+ */
+ private String version;
+
+ /**
+ * 场地名称
+ */
+ @Excel(name = "场地名称")
+ private String siteName;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 备注
+ */
+ @Excel(name = "备注")
+ private String remarks;
+
+ /**
+ * 00 正常 01停用
+ */
+ @Excel(name = "00 正常 01停用")
+ private String status;
+
+ /**
+ * 00 正常 99 删除
+ */
+ private String dataStatus;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ private String rsv3;
+
+ private String deptName;
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getSiteName() {
+ return siteName;
+ }
+
+ public void setSiteName(String siteName) {
+ this.siteName = siteName;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getDataStatus() {
+ return dataStatus;
+ }
+
+ public void setDataStatus(String dataStatus) {
+ this.dataStatus = dataStatus;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("version", getVersion())
+ .append("siteName", getSiteName())
+ .append("orgId", getOrgId())
+ .append("remarks", getRemarks())
+ .append("status", getStatus())
+ .append("dataStatus", getDataStatus())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectorInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectorInfo.java
new file mode 100644
index 00000000..afacd096
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblInspectorInfo.java
@@ -0,0 +1,290 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 检验员信息对象 tbl_inspector_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblInspectorInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 用户名
+ */
+ @Excel(name = "用户名")
+ private String username;
+
+ /**
+ * 姓名
+ */
+ @Excel(name = "姓名")
+ private String realname;
+
+ /**
+ * 密码：加密码
+ */
+ private String password;
+
+ /**
+ * 手机号
+ */
+ @Excel(name = "手机号")
+ private String phone;
+
+ /**
+ * 所属单位id
+ */
+ @Excel(name = "所属单位id")
+ private String orgId;
+
+ /**
+ * 00 正常 01 停用 02 锁定
+ */
+ @Excel(name = "00 正常 01 停用 02 锁定")
+ private String status;
+
+ /**
+ * 00 正常 99 删除
+ */
+ private String dataStatus;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 创建人id
+ */
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人id
+ */
+ private String updateUserId;
+
+ /**
+ * 是否首次登录 00 是 01 否
+ */
+ private String firstLoginFlag;
+
+ /**
+ * 密码错次 5次
+ */
+ private Integer pwdErrCnt;
+
+ /**
+ * 最后一次登录时间
+ */
+ private Date lastLoginTime;
+
+ /**
+ * 保留域1
+ */
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ private String rsv3;
+
+ private String deptName;
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getRealname() {
+ return realname;
+ }
+
+ public void setRealname(String realname) {
+ this.realname = realname;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getDataStatus() {
+ return dataStatus;
+ }
+
+ public void setDataStatus(String dataStatus) {
+ this.dataStatus = dataStatus;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getFirstLoginFlag() {
+ return firstLoginFlag;
+ }
+
+ public void setFirstLoginFlag(String firstLoginFlag) {
+ this.firstLoginFlag = firstLoginFlag;
+ }
+
+ public Integer getPwdErrCnt() {
+ return pwdErrCnt;
+ }
+
+ public void setPwdErrCnt(Integer pwdErrCnt) {
+ this.pwdErrCnt = pwdErrCnt;
+ }
+
+ public Date getLastLoginTime() {
+ return lastLoginTime;
+ }
+
+ public void setLastLoginTime(Date lastLoginTime) {
+ this.lastLoginTime = lastLoginTime;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("username", getUsername())
+ .append("realname", getRealname())
+ .append("password", getPassword())
+ .append("phone", getPhone())
+ .append("orgId", getOrgId())
+ .append("status", getStatus())
+ .append("dataStatus", getDataStatus())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("firstLoginFlag", getFirstLoginFlag())
+ .append("pwdErrCnt", getPwdErrCnt())
+ .append("lastLoginTime", getLastLoginTime())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblNgPartInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblNgPartInfo.java
new file mode 100644
index 00000000..14542d80
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblNgPartInfo.java
@@ -0,0 +1,272 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * NG部位信息对象 tbl_ng_part_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblNgPartInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * NG部位名称
+ */
+ @Excel(name = "NG部位名称")
+ private String ngPartName;
+
+ /**
+ * NG部位英文名称
+ */
+ @Excel(name = "NG部位英文名称")
+ private String ngPartEnName;
+
+ /**
+ * NG部位类型
+ */
+ @Excel(name = "NG部位类型")
+ private String ngPartType;
+
+ /**
+ * 部位类型
+ */
+ @Excel(name = "部位类型")
+ private String partType;
+
+ /**
+ * 父级id
+ */
+ @Excel(name = "父级id")
+ private String parentId;
+
+ /**
+ * 排序
+ */
+ @Excel(name = "排序")
+ private String sort;
+
+ /**
+ * 是否手填 00 否 01 是
+ */
+ private String handFill;
+
+ /**
+ * 00 正常 01停用
+ */
+ @Excel(name = "00 正常 01停用")
+ private String status;
+
+ /**
+ * 00 正常 99 删除
+ */
+ @Excel(name = "00 正常 99 删除")
+ private String dataStatus;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ @Excel(name = "创建人")
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ public String getHandFill() {
+ return handFill;
+ }
+
+ public void setHandFill(String handFill) {
+ this.handFill = handFill;
+ }
+
+ public String getPartType() {
+ return partType;
+ }
+
+ public void setPartType(String partType) {
+ this.partType = partType;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getNgPartName() {
+ return ngPartName;
+ }
+
+ public void setNgPartName(String ngPartName) {
+ this.ngPartName = ngPartName;
+ }
+
+ public String getNgPartEnName() {
+ return ngPartEnName;
+ }
+
+ public void setNgPartEnName(String ngPartEnName) {
+ this.ngPartEnName = ngPartEnName;
+ }
+
+ public String getNgPartType() {
+ return ngPartType;
+ }
+
+ public void setNgPartType(String ngPartType) {
+ this.ngPartType = ngPartType;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getSort() {
+ return sort;
+ }
+
+ public void setSort(String sort) {
+ this.sort = sort;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getDataStatus() {
+ return dataStatus;
+ }
+
+ public void setDataStatus(String dataStatus) {
+ this.dataStatus = dataStatus;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("ngPartName", getNgPartName())
+ .append("ngPartEnName", getNgPartEnName())
+ .append("ngPartType", getNgPartType())
+ .append("parentId", getParentId())
+ .append("sort", getSort())
+ .append("status", getStatus())
+ .append("dataStatus", getDataStatus())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblPollutantInfo.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblPollutantInfo.java
new file mode 100644
index 00000000..9a1434cb
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/domain/TblPollutantInfo.java
@@ -0,0 +1,259 @@
+package com.jiuyv.business.domain;
+
+import com.jiuyv.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 污染物信息对象 tbl_pollutant_info
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public class TblPollutantInfo {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @Excel(name = "主键")
+ private String id;
+
+ /**
+ * 污染物名称
+ */
+ @Excel(name = "污染物名称")
+ private String pollutantName;
+
+ /**
+ * 污染物英文名称
+ */
+ @Excel(name = "污染物英文名称")
+ private String pollutantEnName;
+
+ /**
+ * 污染物类型 00污染物种类 01 污染物具体种类 02 污染物详细描述
+ */
+ @Excel(name = "污染物类型")
+ private String pollutantType;
+
+ /**
+ * 父级id
+ */
+ @Excel(name = "父级id")
+ private String parentId;
+
+ /**
+ * 排序
+ */
+ @Excel(name = "排序")
+ private String sort;
+
+ /**
+ * 是否手填 00 否 01 是
+ */
+ private String handFill;
+
+ /**
+ * 00 正常 01 停用
+ */
+ @Excel(name = "00 正常 01 停用")
+ private String status;
+
+ /**
+ * 00 正常 99 删除
+ */
+ @Excel(name = "00 正常 99 删除")
+ private String dataStatus;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ @Excel(name = "创建人")
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private String updateUserId;
+
+ /**
+ * 保留域1
+ */
+ @Excel(name = "保留域1")
+ private String rsv1;
+
+ /**
+ * 保留域2
+ */
+ @Excel(name = "保留域2")
+ private String rsv2;
+
+ /**
+ * 保留域3
+ */
+ @Excel(name = "保留域3")
+ private String rsv3;
+
+ public String getHandFill() {
+ return handFill;
+ }
+
+ public void setHandFill(String handFill) {
+ this.handFill = handFill;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getPollutantName() {
+ return pollutantName;
+ }
+
+ public void setPollutantName(String pollutantName) {
+ this.pollutantName = pollutantName;
+ }
+
+ public String getPollutantEnName() {
+ return pollutantEnName;
+ }
+
+ public void setPollutantEnName(String pollutantEnName) {
+ this.pollutantEnName = pollutantEnName;
+ }
+
+ public String getPollutantType() {
+ return pollutantType;
+ }
+
+ public void setPollutantType(String pollutantType) {
+ this.pollutantType = pollutantType;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getSort() {
+ return sort;
+ }
+
+ public void setSort(String sort) {
+ this.sort = sort;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getDataStatus() {
+ return dataStatus;
+ }
+
+ public void setDataStatus(String dataStatus) {
+ this.dataStatus = dataStatus;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getRsv1() {
+ return rsv1;
+ }
+
+ public void setRsv1(String rsv1) {
+ this.rsv1 = rsv1;
+ }
+
+ public String getRsv2() {
+ return rsv2;
+ }
+
+ public void setRsv2(String rsv2) {
+ this.rsv2 = rsv2;
+ }
+
+ public String getRsv3() {
+ return rsv3;
+ }
+
+ public void setRsv3(String rsv3) {
+ this.rsv3 = rsv3;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("pollutantName", getPollutantName())
+ .append("pollutantEnName", getPollutantEnName())
+ .append("pollutantType", getPollutantType())
+ .append("parentId", getParentId())
+ .append("sort", getSort())
+ .append("status", getStatus())
+ .append("dataStatus", getDataStatus())
+ .append("createTime", getCreateTime())
+ .append("createUserId", getCreateUserId())
+ .append("updateTime", getUpdateTime())
+ .append("updateUserId", getUpdateUserId())
+ .append("rsv1", getRsv1())
+ .append("rsv2", getRsv2())
+ .append("rsv3", getRsv3())
+ .toString();
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectDetailHisInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectDetailHisInfoMapper.java
new file mode 100644
index 00000000..7705e2c8
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectDetailHisInfoMapper.java
@@ -0,0 +1,63 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblCarInspectDetailHisInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 车辆检查信息明细历史Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCarInspectDetailHisInfoMapper {
+ /**
+ * 查询车辆检查信息明细历史
+ *
+ * @param id 车辆检查信息明细历史主键
+ * @return 车辆检查信息明细历史
+ */
+ TblCarInspectDetailHisInfo selectTblCarInspectDetailHisInfoById(String id);
+
+ /**
+ * 查询车辆检查信息明细历史列表
+ *
+ * @param tblCarInspectDetailHisInfo 车辆检查信息明细历史
+ * @return 车辆检查信息明细历史集合
+ */
+ List selectTblCarInspectDetailHisInfoList(TblCarInspectDetailHisInfo tblCarInspectDetailHisInfo);
+
+ /**
+ * 新增车辆检查信息明细历史
+ *
+ * @param tblCarInspectDetailHisInfo 车辆检查信息明细历史
+ * @return 结果
+ */
+ int insertTblCarInspectDetailHisInfo(TblCarInspectDetailHisInfo tblCarInspectDetailHisInfo);
+
+ /**
+ * 修改车辆检查信息明细历史
+ *
+ * @param tblCarInspectDetailHisInfo 车辆检查信息明细历史
+ * @return 结果
+ */
+ int updateTblCarInspectDetailHisInfo(TblCarInspectDetailHisInfo tblCarInspectDetailHisInfo);
+
+ /**
+ * 删除车辆检查信息明细历史
+ *
+ * @param id 车辆检查信息明细历史主键
+ * @return 结果
+ */
+ int deleteTblCarInspectDetailHisInfoById(String id);
+
+ /**
+ * 批量删除车辆检查信息明细历史
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ int deleteTblCarInspectDetailHisInfoByIds(String[] ids);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectDetailInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectDetailInfoMapper.java
new file mode 100644
index 00000000..1bddc015
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectDetailInfoMapper.java
@@ -0,0 +1,90 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.app.vo.inspect.ResQueryInspectDetailVO;
+import com.jiuyv.business.domain.TblCarInspectDetailInfo;
+import com.jiuyv.business.vo.inspect.ReqExportSumInfoVO;
+import com.jiuyv.business.vo.inspect.ResExportInspectDetailVO;
+import com.jiuyv.business.vo.inspect.ResExportSumDetailVO;
+import com.jiuyv.business.vo.inspect.ResQueryInspectDetailPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 车辆检查信息明细Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCarInspectDetailInfoMapper {
+ /**
+ * 查询车辆检查信息明细
+ *
+ * @param id 车辆检查信息明细主键
+ * @return 车辆检查信息明细
+ */
+ ResQueryInspectDetailPage selectTblCarInspectDetailInfoById(String id);
+
+ /**
+ * 查询车辆检查信息明细列表
+ *
+ * @param tblCarInspectDetailInfo 车辆检查信息明细
+ * @return 车辆检查信息明细集合
+ */
+ List selectTblCarInspectDetailInfoList(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ /**
+ * 新增车辆检查信息明细
+ *
+ * @param tblCarInspectDetailInfo 车辆检查信息明细
+ * @return 结果
+ */
+ int insertTblCarInspectDetailInfo(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ /**
+ * 修改车辆检查信息明细
+ *
+ * @param tblCarInspectDetailInfo 车辆检查信息明细
+ * @return 结果
+ */
+ int updateTblCarInspectDetailInfo(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ /**
+ * 删除车辆检查信息明细
+ *
+ * @param id 车辆检查信息明细主键
+ * @return 结果
+ */
+ int deleteTblCarInspectDetailInfoById(String id);
+
+ /**
+ * 批量删除车辆检查信息明细
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ int deleteTblCarInspectDetailInfoByIds(String[] ids);
+
+ List selectExportInspectDetailInfoList(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ List queryInspectDetailPage(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ List selectExportSumInfo(ReqExportSumInfoVO cond);
+
+ List selectExportSumInfoV2(ReqExportSumInfoVO cond);
+
+
+ List queryInspectDetailList(TblCarInspectDetailInfo detailCond);
+
+ TblCarInspectDetailInfo selectTblCarInspectDetailInfoById2(String id);
+
+ List selectTblCarInspectDetailInfoListV2(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ TblCarInspectDetailInfo selectNoPollutantCar(@Param("carVin") String carVin,@Param("checkType") String checkType);
+
+ List selectExportInspectDetailInfoListV2(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ int conutSelfNoNgCount(TblCarInspectDetailInfo detailCond);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectHisInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectHisInfoMapper.java
new file mode 100644
index 00000000..89076a3a
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectHisInfoMapper.java
@@ -0,0 +1,47 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblCarInspectHisInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 车辆检查信息主历史Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCarInspectHisInfoMapper {
+ /**
+ * 查询车辆检查信息主历史
+ *
+ * @param id 车辆检查信息主历史主键
+ * @return 车辆检查信息主历史
+ */
+ TblCarInspectHisInfo selectTblCarInspectHisInfoById(String id);
+
+ /**
+ * 查询车辆检查信息主历史列表
+ *
+ * @param tblCarInspectHisInfo 车辆检查信息主历史
+ * @return 车辆检查信息主历史集合
+ */
+ List selectTblCarInspectHisInfoList(TblCarInspectHisInfo tblCarInspectHisInfo);
+
+ /**
+ * 新增车辆检查信息主历史
+ *
+ * @param tblCarInspectHisInfo 车辆检查信息主历史
+ * @return 结果
+ */
+ int insertTblCarInspectHisInfo(TblCarInspectHisInfo tblCarInspectHisInfo);
+
+ /**
+ * 修改车辆检查信息主历史
+ *
+ * @param tblCarInspectHisInfo 车辆检查信息主历史
+ * @return 结果
+ */
+ int updateTblCarInspectHisInfo(TblCarInspectHisInfo tblCarInspectHisInfo);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectInfoMapper.java
new file mode 100644
index 00000000..4c53f652
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarInspectInfoMapper.java
@@ -0,0 +1,71 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.app.vo.index.ResInspectDetailVO;
+import com.jiuyv.business.app.vo.inspect.ResQueryInspectOrderVO;
+import com.jiuyv.business.domain.TblCarInspectInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 车辆检查信息Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCarInspectInfoMapper {
+ /**
+ * 查询车辆检查信息
+ *
+ * @param id 车辆检查信息主键
+ * @return 车辆检查信息
+ */
+ TblCarInspectInfo selectTblCarInspectInfoById(String id);
+
+ /**
+ * 查询车辆检查信息列表
+ *
+ * @param tblCarInspectInfo 车辆检查信息
+ * @return 车辆检查信息集合
+ */
+ List selectTblCarInspectInfoList(TblCarInspectInfo tblCarInspectInfo);
+
+ /**
+ * 新增车辆检查信息
+ *
+ * @param tblCarInspectInfo 车辆检查信息
+ * @return 结果
+ */
+ int insertTblCarInspectInfo(TblCarInspectInfo tblCarInspectInfo);
+
+ /**
+ * 修改车辆检查信息
+ *
+ * @param tblCarInspectInfo 车辆检查信息
+ * @return 结果
+ */
+ int updateTblCarInspectInfo(TblCarInspectInfo tblCarInspectInfo);
+
+ List queryOrderDetailPage(TblCarInspectInfo conditicon);
+
+ TblCarInspectInfo selectTblCarInspectInfoByCarVin(String carVin);
+
+ ResQueryInspectOrderVO selectTblCarInspectInfo(TblCarInspectInfo condition);
+
+ List querySelfOrderDetailPage(TblCarInspectInfo conditicon);
+
+ List queryOrderDetailPageV2(TblCarInspectInfo conditicon);
+
+ int updateTblCarInspectInfo2(TblCarInspectInfo updateMain);
+
+ TblCarInspectInfo selectTblCarInspectInfoById2(String mainId);
+
+ int countSelfOrderDetailPage(TblCarInspectInfo conditicon);
+
+ int countOrderDetailPageV2(TblCarInspectInfo conditicon);
+
+ void deleteByOrderId(String orderId);
+
+ void deleteById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalDetailHisInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalDetailHisInfoMapper.java
new file mode 100644
index 00000000..b4998999
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalDetailHisInfoMapper.java
@@ -0,0 +1,63 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblCarOrderFormalDetailHisInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 车辆正式委托单信息明细历史Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCarOrderFormalDetailHisInfoMapper {
+ /**
+ * 查询车辆正式委托单信息明细历史
+ *
+ * @param id 车辆正式委托单信息明细历史主键
+ * @return 车辆正式委托单信息明细历史
+ */
+ TblCarOrderFormalDetailHisInfo selectTblCarOrderFormalDetailHisInfoById(String id);
+
+ /**
+ * 查询车辆正式委托单信息明细历史列表
+ *
+ * @param tblCarOrderFormalDetailHisInfo 车辆正式委托单信息明细历史
+ * @return 车辆正式委托单信息明细历史集合
+ */
+ List selectTblCarOrderFormalDetailHisInfoList(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo);
+
+ /**
+ * 新增车辆正式委托单信息明细历史
+ *
+ * @param tblCarOrderFormalDetailHisInfo 车辆正式委托单信息明细历史
+ * @return 结果
+ */
+ int insertTblCarOrderFormalDetailHisInfo(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo);
+
+ /**
+ * 修改车辆正式委托单信息明细历史
+ *
+ * @param tblCarOrderFormalDetailHisInfo 车辆正式委托单信息明细历史
+ * @return 结果
+ */
+ int updateTblCarOrderFormalDetailHisInfo(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo);
+
+ /**
+ * 删除车辆正式委托单信息明细历史
+ *
+ * @param id 车辆正式委托单信息明细历史主键
+ * @return 结果
+ */
+ int deleteTblCarOrderFormalDetailHisInfoById(String id);
+
+ /**
+ * 批量删除车辆正式委托单信息明细历史
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ int deleteTblCarOrderFormalDetailHisInfoByIds(String[] ids);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalDetailInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalDetailInfoMapper.java
new file mode 100644
index 00000000..feba37ba
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalDetailInfoMapper.java
@@ -0,0 +1,53 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblCarOrderFormalDetailInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 车辆正式委托单信息明细Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCarOrderFormalDetailInfoMapper {
+ /**
+ * 查询车辆正式委托单信息明细
+ *
+ * @param id 车辆正式委托单信息明细主键
+ * @return 车辆正式委托单信息明细
+ */
+ TblCarOrderFormalDetailInfo selectTblCarOrderFormalDetailInfoById(String id);
+
+ /**
+ * 查询车辆正式委托单信息明细列表
+ *
+ * @param tblCarOrderFormalDetailInfo 车辆正式委托单信息明细
+ * @return 车辆正式委托单信息明细集合
+ */
+ List selectTblCarOrderFormalDetailInfoList(TblCarOrderFormalDetailInfo tblCarOrderFormalDetailInfo);
+
+ /**
+ * 新增车辆正式委托单信息明细
+ *
+ * @param tblCarOrderFormalDetailInfo 车辆正式委托单信息明细
+ * @return 结果
+ */
+ int insertTblCarOrderFormalDetailInfo(TblCarOrderFormalDetailInfo tblCarOrderFormalDetailInfo);
+
+ /**
+ * 修改车辆正式委托单信息明细
+ *
+ * @param tblCarOrderFormalDetailInfo 车辆正式委托单信息明细
+ * @return 结果
+ */
+ int updateTblCarOrderFormalDetailInfo(TblCarOrderFormalDetailInfo tblCarOrderFormalDetailInfo);
+
+ /**
+ * 根据委托单id删除委托单信息明细
+ *
+ */
+ void deleteByOrderId(String orderId);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalHisInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalHisInfoMapper.java
new file mode 100644
index 00000000..15bf5ec3
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalHisInfoMapper.java
@@ -0,0 +1,63 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblCarOrderFormalHisInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 车辆正式委托单信息历史Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCarOrderFormalHisInfoMapper {
+ /**
+ * 查询车辆正式委托单信息历史
+ *
+ * @param id 车辆正式委托单信息历史主键
+ * @return 车辆正式委托单信息历史
+ */
+ TblCarOrderFormalHisInfo selectTblCarOrderFormalHisInfoById(String id);
+
+ /**
+ * 查询车辆正式委托单信息历史列表
+ *
+ * @param tblCarOrderFormalHisInfo 车辆正式委托单信息历史
+ * @return 车辆正式委托单信息历史集合
+ */
+ List selectTblCarOrderFormalHisInfoList(TblCarOrderFormalHisInfo tblCarOrderFormalHisInfo);
+
+ /**
+ * 新增车辆正式委托单信息历史
+ *
+ * @param tblCarOrderFormalHisInfo 车辆正式委托单信息历史
+ * @return 结果
+ */
+ int insertTblCarOrderFormalHisInfo(TblCarOrderFormalHisInfo tblCarOrderFormalHisInfo);
+
+ /**
+ * 修改车辆正式委托单信息历史
+ *
+ * @param tblCarOrderFormalHisInfo 车辆正式委托单信息历史
+ * @return 结果
+ */
+ int updateTblCarOrderFormalHisInfo(TblCarOrderFormalHisInfo tblCarOrderFormalHisInfo);
+
+ /**
+ * 删除车辆正式委托单信息历史
+ *
+ * @param id 车辆正式委托单信息历史主键
+ * @return 结果
+ */
+ int deleteTblCarOrderFormalHisInfoById(String id);
+
+ /**
+ * 批量删除车辆正式委托单信息历史
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ int deleteTblCarOrderFormalHisInfoByIds(String[] ids);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalInfoMapper.java
new file mode 100644
index 00000000..c8856bc5
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarOrderFormalInfoMapper.java
@@ -0,0 +1,72 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblCarOrderFormalInfo;
+import com.jiuyv.business.vo.orderformal.NoCheckCarInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 车辆正式委托单信息Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCarOrderFormalInfoMapper {
+ /**
+ * 查询车辆正式委托单信息
+ *
+ * @param id 车辆正式委托单信息主键
+ * @return 车辆正式委托单信息
+ */
+ TblCarOrderFormalInfo selectTblCarOrderFormalInfoById(String id);
+
+ /**
+ * 查询车辆正式委托单信息列表
+ *
+ * @param tblCarOrderFormalInfo 车辆正式委托单信息
+ * @return 车辆正式委托单信息集合
+ */
+ List selectTblCarOrderFormalInfoList(TblCarOrderFormalInfo tblCarOrderFormalInfo);
+
+ /**
+ * 新增车辆正式委托单信息
+ *
+ * @param tblCarOrderFormalInfo 车辆正式委托单信息
+ * @return 结果
+ */
+ int insertTblCarOrderFormalInfo(TblCarOrderFormalInfo tblCarOrderFormalInfo);
+
+ /**
+ * 修改车辆正式委托单信息
+ *
+ * @param tblCarOrderFormalInfo 车辆正式委托单信息
+ * @return 结果
+ */
+ int updateTblCarOrderFormalInfo(TblCarOrderFormalInfo tblCarOrderFormalInfo);
+
+ /**
+ * 删除车辆正式委托单信息
+ *
+ * @param id 车辆正式委托单信息主键
+ * @return 结果
+ */
+ int deleteTblCarOrderFormalInfoById(String id);
+
+ /**
+ * 查询委托单对应的未检查车辆信息
+ *
+ * @param id
+ * @return
+ */
+ List checkCarStatus(String id);
+
+ TblCarOrderFormalInfo selectTblCarOrderFormalInfoByOrderId(String orderId);
+
+ /**
+ * 根据预录单号查询委托单信息
+ *
+ */
+ TblCarOrderFormalInfo selectByPreOrderId(String preOrderId);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarPreRecordDetailInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarPreRecordDetailInfoMapper.java
new file mode 100644
index 00000000..c824786a
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarPreRecordDetailInfoMapper.java
@@ -0,0 +1,55 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblCarPreRecordDetailInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 车辆预录信息明细Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCarPreRecordDetailInfoMapper {
+ /**
+ * 查询车辆预录信息明细
+ *
+ * @param preOrderId 车辆预录单号
+ * @return 车辆预录信息明细
+ */
+ List selectTblCarPreRecordDetailInfoById(String preOrderId);
+
+ /**
+ * 查询车辆预录信息明细列表
+ *
+ * @param tblCarPreRecordDetailInfo 车辆预录信息明细
+ * @return 车辆预录信息明细集合
+ */
+ List selectTblCarPreRecordDetailInfoList(TblCarPreRecordDetailInfo tblCarPreRecordDetailInfo);
+
+ /**
+ * 新增车辆预录信息明细
+ *
+ * @param tblCarPreRecordDetailInfo 车辆预录信息明细
+ * @return 结果
+ */
+ int insertTblCarPreRecordDetailInfo(TblCarPreRecordDetailInfo tblCarPreRecordDetailInfo);
+
+ /**
+ * 根据preOrderId更新车辆预录信息明细
+ *
+ * @param tblCarPreRecordDetailInfo 车辆预录信息明细
+ * @return 结果
+ */
+ int updateTblCarPreRecordDetailInfo(TblCarPreRecordDetailInfo tblCarPreRecordDetailInfo);
+
+ /**
+ * 删除车辆预录信息明细
+ *
+ * @param preId 车辆预录单号
+ * @return 结果
+ */
+ int deleteTblCarPreRecordDetailInfoByPreId(String preId);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarPreRecordInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarPreRecordInfoMapper.java
new file mode 100644
index 00000000..ecaaa62a
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCarPreRecordInfoMapper.java
@@ -0,0 +1,63 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblCarPreRecordInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 车辆预录信息Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCarPreRecordInfoMapper {
+ /**
+ * 查询车辆预录信息
+ *
+ * @param preOrderId 车辆预录单号
+ * @return 车辆预录信息
+ */
+ TblCarPreRecordInfo selectTblCarPreRecordInfoByPreId(String preOrderId);
+
+ /**
+ * 查询车辆预录信息
+ *
+ * @param id
+ * @return 车辆预录信息
+ */
+ TblCarPreRecordInfo selectTblCarPreRecordInfoById(String id);
+
+ /**
+ * 查询车辆预录信息列表
+ *
+ * @param tblCarPreRecordInfo 车辆预录信息
+ * @return 车辆预录信息集合
+ */
+ List selectTblCarPreRecordInfoList(TblCarPreRecordInfo tblCarPreRecordInfo);
+
+ /**
+ * 新增车辆预录信息
+ *
+ * @param tblCarPreRecordInfo 车辆预录信息
+ * @return 结果
+ */
+ int insertTblCarPreRecordInfo(TblCarPreRecordInfo tblCarPreRecordInfo);
+
+ /**
+ * 修改车辆预录信息
+ *
+ * @param tblCarPreRecordInfo 车辆预录信息
+ * @return 结果
+ */
+ int updateTblCarPreRecordInfo(TblCarPreRecordInfo tblCarPreRecordInfo);
+
+ /**
+ * 删除车辆预录信息
+ *
+ * @param id 车辆预录信息主键
+ * @return 结果
+ */
+ int deleteTblCarPreRecordInfoById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCompanyInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCompanyInfoMapper.java
new file mode 100644
index 00000000..3d00c764
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblCompanyInfoMapper.java
@@ -0,0 +1,63 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblCompanyInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 委托单位信息Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblCompanyInfoMapper {
+ /**
+ * 查询委托单位信息
+ *
+ * @param id 委托单位信息主键
+ * @return 委托单位信息
+ */
+ TblCompanyInfo selectTblCompanyInfoById(String id);
+
+ /**
+ * 检查委托单位信息是否唯一
+ *
+ * @param tblCompanyInfo 委托单位信息
+ * @return 委托单位信息
+ */
+ TblCompanyInfo checkCompanyNameUnique(TblCompanyInfo tblCompanyInfo);
+
+ /**
+ * 查询委托单位信息列表
+ *
+ * @param tblCompanyInfo 委托单位信息
+ * @return 委托单位信息集合
+ */
+ List selectTblCompanyInfoList(TblCompanyInfo tblCompanyInfo);
+
+ /**
+ * 新增委托单位信息
+ *
+ * @param tblCompanyInfo 委托单位信息
+ * @return 结果
+ */
+ int insertTblCompanyInfo(TblCompanyInfo tblCompanyInfo);
+
+ /**
+ * 修改委托单位信息
+ *
+ * @param tblCompanyInfo 委托单位信息
+ * @return 结果
+ */
+ int updateTblCompanyInfo(TblCompanyInfo tblCompanyInfo);
+
+ /**
+ * 删除委托单位信息
+ *
+ * @param tblCompanyInfo 委托单位信息
+ * @return 结果
+ */
+ int deleteTblCompanyInfoById(TblCompanyInfo tblCompanyInfo);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblFileInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblFileInfoMapper.java
new file mode 100644
index 00000000..5867ec37
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblFileInfoMapper.java
@@ -0,0 +1,66 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblFileInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 文件信息Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblFileInfoMapper {
+ /**
+ * 查询文件信息
+ *
+ * @param id 文件信息主键
+ * @return 文件信息
+ */
+ TblFileInfo selectTblFileInfoById(String id);
+
+ /**
+ * 查询文件信息列表
+ *
+ * @param tblFileInfo 文件信息
+ * @return 文件信息集合
+ */
+ List selectTblFileInfoList(TblFileInfo tblFileInfo);
+
+ /**
+ * 新增文件信息
+ *
+ * @param tblFileInfo 文件信息
+ * @return 结果
+ */
+ int insertTblFileInfo(TblFileInfo tblFileInfo);
+
+ /**
+ * 修改文件信息
+ *
+ * @param tblFileInfo 文件信息
+ * @return 结果
+ */
+ int updateTblFileInfo(TblFileInfo tblFileInfo);
+
+ /**
+ * 删除文件信息
+ *
+ * @param id 文件信息主键
+ * @return 结果
+ */
+ int deleteTblFileInfoById(String id);
+
+ /**
+ * 批量删除文件信息
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ int deleteTblFileInfoByIds(String[] ids);
+
+ Set selectTblFileInfoListV2(TblFileInfo file);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectRecordInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectRecordInfoMapper.java
new file mode 100644
index 00000000..21f2bca8
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectRecordInfoMapper.java
@@ -0,0 +1,46 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblInspectRecordInfo;
+import com.jiuyv.business.vo.inspectrecord.ResQueryInspectRecordPage;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 点检记录信息Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblInspectRecordInfoMapper {
+ /**
+ * 查询点检记录信息列表
+ *
+ * @param tblInspectRecordInfo 点检记录信息
+ * @return 点检记录信息集合
+ */
+ List selectTblInspectRecordInfoList(TblInspectRecordInfo tblInspectRecordInfo);
+
+ /**
+ * 根据orderId和carVin查询点检记录 update by 20231019
+ *
+ * @param tblInspectRecordInfo
+ * @return
+ */
+ TblInspectRecordInfo selectTblInspectRecordInfoByCarVin(TblInspectRecordInfo tblInspectRecordInfo);
+
+ void insertTblInspectRecordInfo(TblInspectRecordInfo newRecord);
+
+ void updateTblInspectRecordInfo(TblInspectRecordInfo dbRecord);
+
+ /**
+ * 删除点检记录信息
+ *
+ * @param id 点检记录信息主键
+ * @return 结果
+ */
+ int deleteTblInspectRecordInfoById(String id);
+
+ void updateTblInspectRecordInfo2(TblInspectRecordInfo updateRecord);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectSiteHisInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectSiteHisInfoMapper.java
new file mode 100644
index 00000000..64315346
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectSiteHisInfoMapper.java
@@ -0,0 +1,56 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblInspectSiteHisInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 检查场地信息历史Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblInspectSiteHisInfoMapper {
+ /**
+ * 查询检查场地信息历史
+ *
+ * @param id 检查场地信息历史主键
+ * @return 检查场地信息历史
+ */
+ TblInspectSiteHisInfo selectTblInspectSiteHisInfoById(String id);
+
+ /**
+ * 查询检查场地信息历史列表
+ *
+ * @param tblInspectSiteHisInfo 检查场地信息历史
+ * @return 检查场地信息历史集合
+ */
+ List selectTblInspectSiteHisInfoList(TblInspectSiteHisInfo tblInspectSiteHisInfo);
+
+ /**
+ * 新增检查场地信息历史
+ *
+ * @param tblInspectSiteHisInfo 检查场地信息历史
+ * @return 结果
+ */
+ int insertTblInspectSiteHisInfo(TblInspectSiteHisInfo tblInspectSiteHisInfo);
+
+ /**
+ * 修改检查场地信息历史
+ *
+ * @param tblInspectSiteHisInfo 检查场地信息历史
+ * @return 结果
+ */
+ int updateTblInspectSiteHisInfo(TblInspectSiteHisInfo tblInspectSiteHisInfo);
+
+ /**
+ * 删除检查场地信息历史
+ *
+ * @param id 检查场地信息历史主键
+ * @return 结果
+ */
+ int deleteTblInspectSiteHisInfoById(String id);
+
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectSiteInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectSiteInfoMapper.java
new file mode 100644
index 00000000..637dca90
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectSiteInfoMapper.java
@@ -0,0 +1,62 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblInspectSiteInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 检查场地信息Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblInspectSiteInfoMapper {
+ /**
+ * 查询检查场地信息
+ *
+ * @param id 检查场地信息主键
+ * @return 检查场地信息
+ */
+ TblInspectSiteInfo selectTblInspectSiteInfoById(String id);
+
+ /**
+ * 查询检查场地信息列表
+ *
+ * @param tblInspectSiteInfo 检查场地信息
+ * @return 检查场地信息集合
+ */
+ List selectTblInspectSiteInfoList(TblInspectSiteInfo tblInspectSiteInfo);
+
+ /**
+ * 校验检查场地名称是否唯一
+ *
+ * @return 结果
+ */
+ public TblInspectSiteInfo checkSiteNameUnique(TblInspectSiteInfo tblInspectSiteInfo);
+
+ /**
+ * 新增检查场地信息
+ *
+ * @param tblInspectSiteInfo 检查场地信息
+ * @return 结果
+ */
+ int insertTblInspectSiteInfo(TblInspectSiteInfo tblInspectSiteInfo);
+
+ /**
+ * 修改检查场地信息
+ *
+ * @param tblInspectSiteInfo 检查场地信息
+ * @return 结果
+ */
+ int updateTblInspectSiteInfo(TblInspectSiteInfo tblInspectSiteInfo);
+
+ /**
+ * 删除检查场地信息
+ *
+ * @param id 检查场地信息主键
+ * @return 结果
+ */
+ int deleteTblInspectSiteInfoById(TblInspectSiteInfo siteInfo);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectorInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectorInfoMapper.java
new file mode 100644
index 00000000..06cf0c46
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblInspectorInfoMapper.java
@@ -0,0 +1,68 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.domain.TblInspectorInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 检验员信息Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblInspectorInfoMapper {
+ /**
+ * 查询检验员信息
+ *
+ * @param id 检验员信息主键
+ * @return 检验员信息
+ */
+ TblInspectorInfo selectTblInspectorInfoById(String id);
+
+ /**
+ * 查询检验员信息列表
+ *
+ * @param tblInspectorInfo 检验员信息
+ * @return 检验员信息集合
+ */
+ List selectTblInspectorInfoList(TblInspectorInfo tblInspectorInfo);
+
+ /**
+ * 校验用户名称是否唯一
+ *
+ * @return 结果
+ */
+ public TblInspectorInfo checkUserNameUnique(TblInspectorInfo tblInspectorInfo);
+
+ /**
+ * 新增检验员信息
+ *
+ * @param tblInspectorInfo 检验员信息
+ * @return 结果
+ */
+ int insertTblInspectorInfo(TblInspectorInfo tblInspectorInfo);
+
+ /**
+ * 重置检验员密码
+ *
+ * @return 结果
+ */
+ public int resetUserPwd(TblInspectorInfo tblInspectorInfo);
+
+ /**
+ * 修改检验员信息
+ *
+ * @param tblInspectorInfo 检验员信息
+ * @return 结果
+ */
+ int updateTblInspectorInfo(TblInspectorInfo tblInspectorInfo);
+
+ /**
+ * 删除检验员信息
+ *
+ * @return 结果
+ */
+ int deleteTblInspectorInfoById(TblInspectorInfo tblInspectorInfo);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblNgPartInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblNgPartInfoMapper.java
new file mode 100644
index 00000000..7fc85064
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblNgPartInfoMapper.java
@@ -0,0 +1,73 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.app.dto.NgPartDTO;
+import com.jiuyv.business.domain.TblNgPartInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * NG部位信息Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblNgPartInfoMapper {
+ /**
+ * 查询NG部位信息
+ *
+ * @param id NG部位信息主键
+ * @return NG部位信息
+ */
+ TblNgPartInfo selectTblNgPartInfoById(String id);
+
+ /**
+ * 查询NG部位信息列表
+ *
+ * @param tblNgPartInfo NG部位信息
+ * @return NG部位信息集合
+ */
+ List selectTblNgPartInfoList(TblNgPartInfo tblNgPartInfo);
+
+ /**
+ * 检查NG部位名称是否唯一
+ *
+ * @param tblNgPartInfo NG部位信息
+ * @return NG部位信息集合
+ */
+ TblNgPartInfo checkPartNameUnique(TblNgPartInfo tblNgPartInfo);
+
+ /**
+ * 新增NG部位信息
+ *
+ * @param tblNgPartInfo NG部位信息
+ * @return 结果
+ */
+ int insertTblNgPartInfo(TblNgPartInfo tblNgPartInfo);
+
+ /**
+ * 修改NG部位信息
+ *
+ * @param tblNgPartInfo NG部位信息
+ * @return 结果
+ */
+ int updateTblNgPartInfo(TblNgPartInfo tblNgPartInfo);
+
+ /**
+ * 是否存在子节点
+ *
+ * @param id
+ * @return 结果
+ */
+ int hasChildById(String id);
+
+ /**
+ * 删除NG部位信息
+ *
+ * @return 结果
+ */
+ int deleteTblNgPartInfoById(TblNgPartInfo tblNgPartInfo);
+
+ NgPartDTO selectById(String ngPartId);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblPollutantInfoMapper.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblPollutantInfoMapper.java
new file mode 100644
index 00000000..718746ad
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/mapper/TblPollutantInfoMapper.java
@@ -0,0 +1,73 @@
+package com.jiuyv.business.mapper;
+
+import com.jiuyv.business.app.dto.PollutantDTO;
+import com.jiuyv.business.domain.TblPollutantInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 污染物信息Mapper接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Mapper
+public interface TblPollutantInfoMapper {
+ /**
+ * 查询污染物信息
+ *
+ * @param id 污染物信息主键
+ * @return 污染物信息
+ */
+ TblPollutantInfo selectTblPollutantInfoById(String id);
+
+ /**
+ * 查询污染物信息列表
+ *
+ * @param tblPollutantInfo 污染物信息
+ * @return 污染物信息集合
+ */
+ List selectTblPollutantInfoList(TblPollutantInfo tblPollutantInfo);
+
+ /**
+ * 检查污染物名称是否唯一
+ *
+ * @param tblPollutantInfo
+ * @return
+ */
+ TblPollutantInfo checkPollutantNameUnique(TblPollutantInfo tblPollutantInfo);
+
+ /**
+ * 新增污染物信息
+ *
+ * @param tblPollutantInfo 污染物信息
+ * @return 结果
+ */
+ int insertTblPollutantInfo(TblPollutantInfo tblPollutantInfo);
+
+ /**
+ * 修改污染物信息
+ *
+ * @param tblPollutantInfo 污染物信息
+ * @return 结果
+ */
+ int updateTblPollutantInfo(TblPollutantInfo tblPollutantInfo);
+
+ /**
+ * 是否存在子节点
+ *
+ * @param id
+ * @return 结果
+ */
+ int hasChildById(String id);
+
+ /**
+ * 删除污染物信息
+ *
+ * @return 结果
+ */
+ int deleteTblPollutantInfoById(TblPollutantInfo tblPollutantInfo);
+
+ PollutantDTO selectById(String pollutantId);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectDetailHisInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectDetailHisInfoService.java
new file mode 100644
index 00000000..979f5c32
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectDetailHisInfoService.java
@@ -0,0 +1,61 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCarInspectDetailHisInfo;
+
+import java.util.List;
+
+/**
+ * 车辆检查信息明细历史Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CarInspectDetailHisInfoService {
+ /**
+ * 查询车辆检查信息明细历史
+ *
+ * @param id 车辆检查信息明细历史主键
+ * @return 车辆检查信息明细历史
+ */
+ TblCarInspectDetailHisInfo selectTblCarInspectDetailHisInfoById(String id);
+
+ /**
+ * 查询车辆检查信息明细历史列表
+ *
+ * @param tblCarInspectDetailHisInfo 车辆检查信息明细历史
+ * @return 车辆检查信息明细历史集合
+ */
+ List selectTblCarInspectDetailHisInfoList(TblCarInspectDetailHisInfo tblCarInspectDetailHisInfo);
+
+ /**
+ * 新增车辆检查信息明细历史
+ *
+ * @param tblCarInspectDetailHisInfo 车辆检查信息明细历史
+ * @return 结果
+ */
+ int insertTblCarInspectDetailHisInfo(TblCarInspectDetailHisInfo tblCarInspectDetailHisInfo);
+
+ /**
+ * 修改车辆检查信息明细历史
+ *
+ * @param tblCarInspectDetailHisInfo 车辆检查信息明细历史
+ * @return 结果
+ */
+ int updateTblCarInspectDetailHisInfo(TblCarInspectDetailHisInfo tblCarInspectDetailHisInfo);
+
+ /**
+ * 批量删除车辆检查信息明细历史
+ *
+ * @param ids 需要删除的车辆检查信息明细历史主键集合
+ * @return 结果
+ */
+ int deleteTblCarInspectDetailHisInfoByIds(String[] ids);
+
+ /**
+ * 删除车辆检查信息明细历史信息
+ *
+ * @param id 车辆检查信息明细历史主键
+ * @return 结果
+ */
+ int deleteTblCarInspectDetailHisInfoById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectDetailInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectDetailInfoService.java
new file mode 100644
index 00000000..1496d513
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectDetailInfoService.java
@@ -0,0 +1,88 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCarInspectDetailInfo;
+import com.jiuyv.business.vo.inspect.ReqExportSumInfoVO;
+import com.jiuyv.business.vo.inspect.ResExportInspectDetailVO;
+import com.jiuyv.business.vo.inspect.ResExportSumFileVO;
+import com.jiuyv.business.vo.inspect.ResQueryInspectDetailPage;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 车辆检查信息明细Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CarInspectDetailInfoService {
+ /**
+ * 查询车辆检查信息明细
+ *
+ * @param id 车辆检查信息明细主键
+ * @return 车辆检查信息明细
+ */
+ ResQueryInspectDetailPage selectTblCarInspectDetailInfoById(String id);
+
+ /**
+ * 查询车辆检查信息明细列表
+ *
+ * @param tblCarInspectDetailInfo 车辆检查信息明细
+ * @return 车辆检查信息明细集合
+ */
+ List selectTblCarInspectDetailInfoList(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ /**
+ * 新增车辆检查信息明细
+ *
+ * @param tblCarInspectDetailInfo 车辆检查信息明细
+ * @return 结果
+ */
+ int insertTblCarInspectDetailInfo(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ /**
+ * 修改车辆检查信息明细
+ *
+ * @param tblCarInspectDetailInfo 车辆检查信息明细
+ * @return 结果
+ */
+ int updateTblCarInspectDetailInfo(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ /**
+ * 批量删除车辆检查信息明细
+ *
+ * @param ids 需要删除的车辆检查信息明细主键集合
+ * @return 结果
+ */
+ int deleteTblCarInspectDetailInfoByIds(String[] ids);
+
+ /**
+ * 删除车辆检查信息明细信息
+ *
+ * @param id 车辆检查信息明细主键
+ * @return 结果
+ */
+ int deleteTblCarInspectDetailInfoById(String id);
+
+ List selectExportInspectDetailInfoList(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ List queryInspectDetailPage(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ /**
+ * 导出汇总
+ * @param req
+ */
+ ResExportSumFileVO exportSum(ReqExportSumInfoVO req);
+
+ byte[] downloadImage(String imageUrl) throws IOException;
+
+ Set getZipImgs(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+
+ /**
+ * 读取本地磁盘文件
+ * @param tblCarInspectDetailInfo
+ * @return
+ */
+ Set getLocalImagePaths(TblCarInspectDetailInfo tblCarInspectDetailInfo);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectHisInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectHisInfoService.java
new file mode 100644
index 00000000..2e921339
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectHisInfoService.java
@@ -0,0 +1,45 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCarInspectHisInfo;
+
+import java.util.List;
+
+/**
+ * 车辆检查信息主历史Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CarInspectHisInfoService {
+ /**
+ * 查询车辆检查信息主历史
+ *
+ * @param id 车辆检查信息主历史主键
+ * @return 车辆检查信息主历史
+ */
+ TblCarInspectHisInfo selectTblCarInspectHisInfoById(String id);
+
+ /**
+ * 查询车辆检查信息主历史列表
+ *
+ * @param tblCarInspectHisInfo 车辆检查信息主历史
+ * @return 车辆检查信息主历史集合
+ */
+ List selectTblCarInspectHisInfoList(TblCarInspectHisInfo tblCarInspectHisInfo);
+
+ /**
+ * 新增车辆检查信息主历史
+ *
+ * @param tblCarInspectHisInfo 车辆检查信息主历史
+ * @return 结果
+ */
+ int insertTblCarInspectHisInfo(TblCarInspectHisInfo tblCarInspectHisInfo);
+
+ /**
+ * 修改车辆检查信息主历史
+ *
+ * @param tblCarInspectHisInfo 车辆检查信息主历史
+ * @return 结果
+ */
+ int updateTblCarInspectHisInfo(TblCarInspectHisInfo tblCarInspectHisInfo);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectInfoService.java
new file mode 100644
index 00000000..353195d3
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarInspectInfoService.java
@@ -0,0 +1,57 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCarInspectInfo;
+import com.jiuyv.business.vo.inspect.InspectResultResVO;
+import com.jiuyv.business.vo.inspect.InspectUpdateReqVO;
+
+import java.util.List;
+
+/**
+ * 车辆检查信息Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CarInspectInfoService {
+ /**
+ * 查询车辆检查信息
+ *
+ * @param id 车辆检查信息主键
+ * @return 车辆检查信息
+ */
+ TblCarInspectInfo selectTblCarInspectInfoById(String id);
+
+ /**
+ * 查询车辆检查信息列表
+ *
+ * @param tblCarInspectInfo 车辆检查信息
+ * @return 车辆检查信息集合
+ */
+ List selectTblCarInspectInfoList(TblCarInspectInfo tblCarInspectInfo);
+
+ /**
+ * 新增车辆检查信息
+ *
+ * @param tblCarInspectInfo 车辆检查信息
+ * @return 结果
+ */
+ int insertTblCarInspectInfo(TblCarInspectInfo tblCarInspectInfo);
+
+ /**
+ * 修改车辆检查信息
+ *
+ * @param reqVO 车辆检查信息
+ * @return 结果
+ */
+ int updateTblCarInspectInfo(InspectUpdateReqVO reqVO);
+
+ /**
+ * 获取检查结果
+ *
+ * @param id
+ * @return
+ */
+ InspectResultResVO getCheckResult(String id);
+
+ void delete(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalDetailHisInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalDetailHisInfoService.java
new file mode 100644
index 00000000..e5de308a
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalDetailHisInfoService.java
@@ -0,0 +1,45 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCarOrderFormalDetailHisInfo;
+
+import java.util.List;
+
+/**
+ * 车辆正式委托单信息明细历史Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CarOrderFormalDetailHisInfoService {
+ /**
+ * 查询车辆正式委托单信息明细历史
+ *
+ * @param id 车辆正式委托单信息明细历史主键
+ * @return 车辆正式委托单信息明细历史
+ */
+ TblCarOrderFormalDetailHisInfo selectTblCarOrderFormalDetailHisInfoById(String id);
+
+ /**
+ * 查询车辆正式委托单信息明细历史列表
+ *
+ * @param tblCarOrderFormalDetailHisInfo 车辆正式委托单信息明细历史
+ * @return 车辆正式委托单信息明细历史集合
+ */
+ List selectTblCarOrderFormalDetailHisInfoList(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo);
+
+ /**
+ * 新增车辆正式委托单信息明细历史
+ *
+ * @param tblCarOrderFormalDetailHisInfo 车辆正式委托单信息明细历史
+ * @return 结果
+ */
+ int insertTblCarOrderFormalDetailHisInfo(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo);
+
+ /**
+ * 修改车辆正式委托单信息明细历史
+ *
+ * @param tblCarOrderFormalDetailHisInfo 车辆正式委托单信息明细历史
+ * @return 结果
+ */
+ int updateTblCarOrderFormalDetailHisInfo(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalDetailInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalDetailInfoService.java
new file mode 100644
index 00000000..b93e42a7
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalDetailInfoService.java
@@ -0,0 +1,38 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCarOrderFormalDetailInfo;
+
+import java.util.List;
+
+/**
+ * 车辆正式委托单信息明细Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CarOrderFormalDetailInfoService {
+ /**
+ * 查询车辆正式委托单信息明细
+ *
+ * @param id 车辆正式委托单信息明细主键
+ * @return 车辆正式委托单信息明细
+ */
+ TblCarOrderFormalDetailInfo selectTblCarOrderFormalDetailInfoById(String id);
+
+ /**
+ * 查询车辆正式委托单信息明细列表
+ *
+ * @param tblCarOrderFormalDetailInfo 车辆正式委托单信息明细
+ * @return 车辆正式委托单信息明细集合
+ */
+ List selectTblCarOrderFormalDetailInfoList(TblCarOrderFormalDetailInfo tblCarOrderFormalDetailInfo);
+
+ /**
+ * 修改车辆正式委托单信息明细
+ *
+ * @param tblCarOrderFormalDetailInfo 车辆正式委托单信息明细
+ * @return 结果
+ */
+ int updateTblCarOrderFormalDetailInfo(TblCarOrderFormalDetailInfo tblCarOrderFormalDetailInfo);
+
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalHisInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalHisInfoService.java
new file mode 100644
index 00000000..b3ff282d
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalHisInfoService.java
@@ -0,0 +1,61 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCarOrderFormalHisInfo;
+
+import java.util.List;
+
+/**
+ * 车辆正式委托单信息历史Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CarOrderFormalHisInfoService {
+ /**
+ * 查询车辆正式委托单信息历史
+ *
+ * @param id 车辆正式委托单信息历史主键
+ * @return 车辆正式委托单信息历史
+ */
+ TblCarOrderFormalHisInfo selectTblCarOrderFormalHisInfoById(String id);
+
+ /**
+ * 查询车辆正式委托单信息历史列表
+ *
+ * @param tblCarOrderFormalHisInfo 车辆正式委托单信息历史
+ * @return 车辆正式委托单信息历史集合
+ */
+ List selectTblCarOrderFormalHisInfoList(TblCarOrderFormalHisInfo tblCarOrderFormalHisInfo);
+
+ /**
+ * 新增车辆正式委托单信息历史
+ *
+ * @param tblCarOrderFormalHisInfo 车辆正式委托单信息历史
+ * @return 结果
+ */
+ int insertTblCarOrderFormalHisInfo(TblCarOrderFormalHisInfo tblCarOrderFormalHisInfo);
+
+ /**
+ * 修改车辆正式委托单信息历史
+ *
+ * @param tblCarOrderFormalHisInfo 车辆正式委托单信息历史
+ * @return 结果
+ */
+ int updateTblCarOrderFormalHisInfo(TblCarOrderFormalHisInfo tblCarOrderFormalHisInfo);
+
+ /**
+ * 批量删除车辆正式委托单信息历史
+ *
+ * @param ids 需要删除的车辆正式委托单信息历史主键集合
+ * @return 结果
+ */
+ int deleteTblCarOrderFormalHisInfoByIds(String[] ids);
+
+ /**
+ * 删除车辆正式委托单信息历史信息
+ *
+ * @param id 车辆正式委托单信息历史主键
+ * @return 结果
+ */
+ int deleteTblCarOrderFormalHisInfoById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalInfoService.java
new file mode 100644
index 00000000..87508d7d
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarOrderFormalInfoService.java
@@ -0,0 +1,77 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCarOrderFormalInfo;
+import com.jiuyv.business.vo.orderformal.OrderFormalCompleteCheckReqVO;
+import com.jiuyv.business.vo.orderformal.OrderFormalCompleteCheckResVO;
+import com.jiuyv.business.vo.prerecordetail.OrderFormalDetailAddReqVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 车辆正式委托单信息Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CarOrderFormalInfoService {
+ /**
+ * 查询车辆正式委托单信息
+ *
+ * @param id 车辆正式委托单信息主键
+ * @return 车辆正式委托单信息
+ */
+ TblCarOrderFormalInfo selectTblCarOrderFormalInfoById(String id);
+
+ /**
+ * 查询车辆正式委托单信息列表
+ *
+ * @param tblCarOrderFormalInfo 车辆正式委托单信息
+ * @return 车辆正式委托单信息集合
+ */
+ List selectTblCarOrderFormalInfoList(TblCarOrderFormalInfo tblCarOrderFormalInfo);
+
+ /**
+ * 新增车辆正式委托单信息
+ *
+ * @param tblCarOrderFormalInfo 车辆正式委托单信息
+ * @return 结果
+ */
+ int insertTblCarOrderFormalInfo(TblCarOrderFormalInfo tblCarOrderFormalInfo);
+
+ /**
+ * 完成委托单前，检查车辆状态
+ *
+ * @param reqVO 车辆正式委托单信息
+ * @return 结果
+ */
+ OrderFormalCompleteCheckResVO checkCarStatus(OrderFormalCompleteCheckReqVO reqVO);
+
+ /**
+ * 修改车辆正式委托单信息
+ *
+ * @param reqVO 车辆正式委托单信息
+ * @return 结果
+ */
+ int updateTblCarOrderFormalInfo(OrderFormalCompleteCheckReqVO reqVO);
+
+ /**
+ * 新增车辆
+ *
+ * @param reqVO 车辆正式委托单信息明细
+ * @return 结果
+ */
+ String saveOrderDetailInfo(OrderFormalDetailAddReqVO reqVO);
+
+ /**
+ * 导入车辆
+ *
+ */
+ String importCar(MultipartFile file, String id);
+
+ /**
+ * 更新委托单车辆的数量
+ *
+ */
+ void updateCarTotalNumber(String orderId, Integer count);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarPreRecordDetailInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarPreRecordDetailInfoService.java
new file mode 100644
index 00000000..203bf1bd
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarPreRecordDetailInfoService.java
@@ -0,0 +1,23 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCarPreRecordDetailInfo;
+import com.jiuyv.business.vo.prerecordetail.PreRecordDetailQueryReqVO;
+
+import java.util.List;
+
+/**
+ * 车辆预录信息明细Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CarPreRecordDetailInfoService {
+
+ /**
+ * 查询车辆预录信息明细列表
+ *
+ * @param reqVO 车辆预录信息明细
+ * @return 车辆预录信息明细集合
+ */
+ List selectTblCarPreRecordDetailInfoList(PreRecordDetailQueryReqVO reqVO);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarPreRecordInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarPreRecordInfoService.java
new file mode 100644
index 00000000..ee0fc570
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CarPreRecordInfoService.java
@@ -0,0 +1,61 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCarPreRecordInfo;
+import com.jiuyv.business.vo.prerecord.PreRecordEffectReqVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 车辆预录信息Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CarPreRecordInfoService {
+ /**
+ * 导入车辆预录数据
+ *
+ * @param file 车辆预录清单文件
+ * @return 结果
+ */
+ String importData(MultipartFile file, String companyId) throws Exception;
+
+ /**
+ * @param reqVO
+ * @return
+ */
+ String effectData(PreRecordEffectReqVO reqVO);
+
+ /**
+ * 查询车辆预录信息
+ *
+ * @param id 车辆预录信息主键
+ * @return 车辆预录信息
+ */
+ TblCarPreRecordInfo selectTblCarPreRecordInfoById(String id);
+
+ /**
+ * 查询车辆预录信息列表
+ *
+ * @param tblCarPreRecordInfo 车辆预录信息
+ * @return 车辆预录信息集合
+ */
+ List selectTblCarPreRecordInfoList(TblCarPreRecordInfo tblCarPreRecordInfo);
+
+ /**
+ * 新增车辆预录信息
+ *
+ * @param tblCarPreRecordInfo 车辆预录信息
+ * @return 结果
+ */
+ public int insertTblCarPreRecordInfo(TblCarPreRecordInfo tblCarPreRecordInfo);
+
+ /**
+ * 删除车辆预录信息信息
+ *
+ * @param id 车辆预录信息主键
+ * @return 结果
+ */
+ int deleteTblCarPreRecordInfoById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CompanyInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CompanyInfoService.java
new file mode 100644
index 00000000..7d95cf93
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/CompanyInfoService.java
@@ -0,0 +1,64 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblCompanyInfo;
+import com.jiuyv.business.vo.company.CompanyInfoAddReqVO;
+import com.jiuyv.business.vo.company.CompanyInfoQueryReqVO;
+import com.jiuyv.business.vo.company.CompanyInfoQueryResVO;
+import com.jiuyv.business.vo.company.CompanyInfoUpdateReqVO;
+
+import java.util.List;
+
+/**
+ * 委托单位信息Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface CompanyInfoService {
+ /**
+ * 查询委托单位信息
+ *
+ * @param id 委托单位信息主键
+ * @return 委托单位信息
+ */
+ CompanyInfoQueryResVO selectTblCompanyInfoById(String id);
+
+ /**
+ * 查询委托单位信息列表
+ *
+ * @param companyInfoQueryReqVO 委托单位信息
+ * @return 委托单位信息集合
+ */
+ List selectTblCompanyInfoList(CompanyInfoQueryReqVO companyInfoQueryReqVO);
+
+ /**
+ * 校验委托单位名称是否唯一
+ *
+ * @return 结果
+ */
+ public String checkCompanyNameUnique(TblCompanyInfo tblCompanyInfo);
+
+ /**
+ * 新增委托单位信息
+ *
+ * @param companyInfoAddReqVO 委托单位信息
+ * @return 结果
+ */
+ int insertTblCompanyInfo(CompanyInfoAddReqVO companyInfoAddReqVO);
+
+ /**
+ * 修改委托单位信息
+ *
+ * @param companyInfoUpdateReqVO 委托单位信息
+ * @return 结果
+ */
+ int updateTblCompanyInfo(CompanyInfoUpdateReqVO companyInfoUpdateReqVO);
+
+ /**
+ * 删除委托单位信息信息
+ *
+ * @param id 委托单位信息主键
+ * @return 结果
+ */
+ int deleteTblCompanyInfoById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/FileInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/FileInfoService.java
new file mode 100644
index 00000000..a9709593
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/FileInfoService.java
@@ -0,0 +1,61 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblFileInfo;
+
+import java.util.List;
+
+/**
+ * 文件信息Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface FileInfoService {
+ /**
+ * 查询文件信息
+ *
+ * @param id 文件信息主键
+ * @return 文件信息
+ */
+ TblFileInfo selectTblFileInfoById(String id);
+
+ /**
+ * 查询文件信息列表
+ *
+ * @param tblFileInfo 文件信息
+ * @return 文件信息集合
+ */
+ List selectTblFileInfoList(TblFileInfo tblFileInfo);
+
+ /**
+ * 新增文件信息
+ *
+ * @param tblFileInfo 文件信息
+ * @return 结果
+ */
+ int insertTblFileInfo(TblFileInfo tblFileInfo);
+
+ /**
+ * 修改文件信息
+ *
+ * @param tblFileInfo 文件信息
+ * @return 结果
+ */
+ int updateTblFileInfo(TblFileInfo tblFileInfo);
+
+ /**
+ * 批量删除文件信息
+ *
+ * @param ids 需要删除的文件信息主键集合
+ * @return 结果
+ */
+ int deleteTblFileInfoByIds(String[] ids);
+
+ /**
+ * 删除文件信息信息
+ *
+ * @param id 文件信息主键
+ * @return 结果
+ */
+ int deleteTblFileInfoById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectRecordInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectRecordInfoService.java
new file mode 100644
index 00000000..0f131f43
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectRecordInfoService.java
@@ -0,0 +1,22 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblInspectRecordInfo;
+import com.jiuyv.business.vo.inspectrecord.ResQueryInspectRecordPage;
+
+import java.util.List;
+
+/**
+ * 点检记录信息Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface InspectRecordInfoService {
+ /**
+ * 查询点检记录信息列表
+ *
+ * @param tblInspectRecordInfo 点检记录信息
+ * @return 点检记录信息集合
+ */
+ List selectTblInspectRecordInfoList(TblInspectRecordInfo tblInspectRecordInfo);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectSiteHisInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectSiteHisInfoService.java
new file mode 100644
index 00000000..3d72a513
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectSiteHisInfoService.java
@@ -0,0 +1,53 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblInspectSiteHisInfo;
+
+import java.util.List;
+
+/**
+ * 检查场地信息历史Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface InspectSiteHisInfoService {
+ /**
+ * 查询检查场地信息历史
+ *
+ * @param id 检查场地信息历史主键
+ * @return 检查场地信息历史
+ */
+ TblInspectSiteHisInfo selectTblInspectSiteHisInfoById(String id);
+
+ /**
+ * 查询检查场地信息历史列表
+ *
+ * @param tblInspectSiteHisInfo 检查场地信息历史
+ * @return 检查场地信息历史集合
+ */
+ List selectTblInspectSiteHisInfoList(TblInspectSiteHisInfo tblInspectSiteHisInfo);
+
+ /**
+ * 新增检查场地信息历史
+ *
+ * @param tblInspectSiteHisInfo 检查场地信息历史
+ * @return 结果
+ */
+ int insertTblInspectSiteHisInfo(TblInspectSiteHisInfo tblInspectSiteHisInfo);
+
+ /**
+ * 修改检查场地信息历史
+ *
+ * @param tblInspectSiteHisInfo 检查场地信息历史
+ * @return 结果
+ */
+ int updateTblInspectSiteHisInfo(TblInspectSiteHisInfo tblInspectSiteHisInfo);
+
+ /**
+ * 删除检查场地信息历史信息
+ *
+ * @param id 检查场地信息历史主键
+ * @return 结果
+ */
+ int deleteTblInspectSiteHisInfoById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectSiteInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectSiteInfoService.java
new file mode 100644
index 00000000..107dcdd2
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectSiteInfoService.java
@@ -0,0 +1,64 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblInspectSiteInfo;
+import com.jiuyv.business.vo.inspectSite.InspectSiteInfoAddReqVO;
+import com.jiuyv.business.vo.inspectSite.InspectSiteInfoQueryReqVO;
+import com.jiuyv.business.vo.inspectSite.InspectSiteInfoQueryResVO;
+import com.jiuyv.business.vo.inspectSite.InspectSiteInfoUpdateReqVO;
+
+import java.util.List;
+
+/**
+ * 检查场地信息Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface InspectSiteInfoService {
+ /**
+ * 查询检查场地信息
+ *
+ * @param id 检查场地信息主键
+ * @return 检查场地信息
+ */
+ InspectSiteInfoQueryResVO selectTblInspectSiteInfoById(String id);
+
+ /**
+ * 查询检查场地信息列表
+ *
+ * @param infoQueryReqVO 检查场地信息
+ * @return 检查场地信息集合
+ */
+ List selectTblInspectSiteInfoList(InspectSiteInfoQueryReqVO infoQueryReqVO);
+
+ /**
+ * 校验检查场地名称是否唯一
+ *
+ * @return 结果
+ */
+ public String checkSiteNameUnique(TblInspectSiteInfo tblInspectSiteInfo);
+
+ /**
+ * 新增检查场地信息
+ *
+ * @param infoAddReqVO 检查场地信息
+ * @return 结果
+ */
+ int insertTblInspectSiteInfo(InspectSiteInfoAddReqVO infoAddReqVO);
+
+ /**
+ * 修改检查场地信息
+ *
+ * @param infoUpdateReqVO 检查场地信息
+ * @return 结果
+ */
+ int updateTblInspectSiteInfo(InspectSiteInfoUpdateReqVO infoUpdateReqVO);
+
+ /**
+ * 删除检查场地信息信息
+ *
+ * @param id 检查场地信息主键
+ * @return 结果
+ */
+ int deleteTblInspectSiteInfoById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectorInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectorInfoService.java
new file mode 100644
index 00000000..85148b46
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/InspectorInfoService.java
@@ -0,0 +1,74 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblInspectorInfo;
+import com.jiuyv.business.vo.inspector.InspectorInfoAddReqVO;
+import com.jiuyv.business.vo.inspector.InspectorInfoQueryReqVO;
+import com.jiuyv.business.vo.inspector.InspectorInfoQueryResVO;
+import com.jiuyv.business.vo.inspector.InspectorInfoResetReqVO;
+import com.jiuyv.business.vo.inspector.InspectorInfoUpdateReqVO;
+
+import java.util.List;
+
+/**
+ * 检验员信息Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface InspectorInfoService {
+ /**
+ * 查询检验员信息
+ *
+ * @param id 检验员信息主键
+ * @return 检验员信息
+ */
+ InspectorInfoQueryResVO selectTblInspectorInfoById(String id);
+
+ /**
+ * 查询检验员信息列表
+ *
+ * @param inspectorInfoQueryVo 检验员信息
+ * @return 检验员信息集合
+ */
+ List selectTblInspectorInfoList(InspectorInfoQueryReqVO inspectorInfoQueryVo);
+
+ /**
+ * 校验用户名称是否唯一
+ *
+ * @return 结果
+ */
+ public String checkUserNameUnique(TblInspectorInfo inspectorInfo);
+
+ /**
+ * 新增检验员信息
+ *
+ * @param inspectorInfoAddReqVO 检验员信息
+ * @return 结果
+ */
+ int insertTblInspectorInfo(InspectorInfoAddReqVO inspectorInfoAddReqVO);
+
+ /**
+ * 重置检验员密码
+ *
+ * @param infoResetReqVO 检验员信息
+ * @return 结果
+ */
+ public int resetPwd(InspectorInfoResetReqVO infoResetReqVO);
+
+ /**
+ * 修改检验员信息
+ *
+ * @param infoUpdateReqVO 检验员信息
+ * @return 结果
+ */
+ int updateTblInspectorInfo(InspectorInfoUpdateReqVO infoUpdateReqVO);
+
+ /**
+ * 删除检验员信息信息
+ *
+ * @param id 检验员信息主键
+ * @return 结果
+ */
+ int deleteTblInspectorInfoById(String id);
+
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/NgPartInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/NgPartInfoService.java
new file mode 100644
index 00000000..5bdd1ef0
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/NgPartInfoService.java
@@ -0,0 +1,73 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblNgPartInfo;
+import com.jiuyv.business.vo.ngpart.NgPartInfoAddReqVO;
+import com.jiuyv.business.vo.ngpart.NgPartInfoGetReqVO;
+import com.jiuyv.business.vo.ngpart.NgPartInfoGetResVO;
+import com.jiuyv.business.vo.ngpart.NgPartInfoQueryReqVO;
+import com.jiuyv.business.vo.ngpart.NgPartInfoQueryResVO;
+import com.jiuyv.business.vo.ngpart.NgPartInfoUpdateReqVO;
+
+import java.util.List;
+
+/**
+ * NG部位信息Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface NgPartInfoService {
+ /**
+ * 查询NG部位信息
+ *
+ * @return NG部位信息
+ */
+ NgPartInfoGetResVO selectTblNgPartInfoById(NgPartInfoGetReqVO ngPartInfoGetReqVO);
+
+ /**
+ * 查询NG部位信息列表
+ *
+ * @param ngPartInfoQueryReqVO NG部位信息
+ * @return NG部位信息集合
+ */
+ List selectTblNgPartInfoList(NgPartInfoQueryReqVO ngPartInfoQueryReqVO);
+
+ /**
+ * 检查NG部位名称是否唯一
+ *
+ * @param tblNgPartInfo NG部位信息
+ * @return NG部位信息集合
+ */
+ String checkPartNameUnique(TblNgPartInfo tblNgPartInfo);
+
+ /**
+ * 新增NG部位信息
+ *
+ * @param ngPartInfoAddReqVO NG部位信息
+ * @return 结果
+ */
+ int insertTblNgPartInfo(NgPartInfoAddReqVO ngPartInfoAddReqVO);
+
+ /**
+ * 修改NG部位信息
+ *
+ * @param ngPartInfoUpdateReqVO NG部位信息
+ * @return 结果
+ */
+ int updateTblNgPartInfo(NgPartInfoUpdateReqVO ngPartInfoUpdateReqVO);
+
+ /**
+ * 是否存在子节点
+ *
+ * @return 结果 true 存在 false 不存在
+ */
+ boolean hasChildById(String id);
+
+ /**
+ * 删除NG部位信息信息
+ *
+ * @param id NG部位信息主键
+ * @return 结果
+ */
+ int deleteTblNgPartInfoById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/PollutantInfoService.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/PollutantInfoService.java
new file mode 100644
index 00000000..c3d912e6
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/PollutantInfoService.java
@@ -0,0 +1,73 @@
+package com.jiuyv.business.service;
+
+import com.jiuyv.business.domain.TblPollutantInfo;
+import com.jiuyv.business.vo.pollutant.PollutantInfoAddReqVO;
+import com.jiuyv.business.vo.pollutant.PollutantInfoGetReqVO;
+import com.jiuyv.business.vo.pollutant.PollutantInfoGetResVO;
+import com.jiuyv.business.vo.pollutant.PollutantInfoQueryReqVO;
+import com.jiuyv.business.vo.pollutant.PollutantInfoQueryResVO;
+import com.jiuyv.business.vo.pollutant.PollutantInfoUpdateReqVO;
+
+import java.util.List;
+
+/**
+ * 污染物信息Service接口
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+public interface PollutantInfoService {
+ /**
+ * 查询污染物信息
+ *
+ * @return 污染物信息
+ */
+ PollutantInfoGetResVO selectTblPollutantInfoById(PollutantInfoGetReqVO pollutantInfoGetReqVO);
+
+ /**
+ * 查询污染物信息列表
+ *
+ * @param pollutantInfoQueryReqVO 污染物信息
+ * @return 污染物信息集合
+ */
+ List selectTblPollutantInfoList(PollutantInfoQueryReqVO pollutantInfoQueryReqVO);
+
+ /**
+ * 检查污染物名称是否唯一
+ *
+ * @param tblPollutantInfo 污染物信息
+ * @return 污染物信息集合
+ */
+ String checkPollutantNameUnique(TblPollutantInfo tblPollutantInfo);
+
+ /**
+ * 新增污染物信息
+ *
+ * @param pollutantInfoAddReqVO 污染物信息
+ * @return 结果
+ */
+ int insertTblPollutantInfo(PollutantInfoAddReqVO pollutantInfoAddReqVO);
+
+ /**
+ * 修改污染物信息
+ *
+ * @param pollutantInfoUpdateReqVO 污染物信息
+ * @return 结果
+ */
+ int updateTblPollutantInfo(PollutantInfoUpdateReqVO pollutantInfoUpdateReqVO);
+
+ /**
+ * 是否存在子节点
+ *
+ * @return 结果 true 存在 false 不存在
+ */
+ boolean hasChildById(String id);
+
+ /**
+ * 删除污染物信息信息
+ *
+ * @param id 污染物信息主键
+ * @return 结果
+ */
+ int deleteTblPollutantInfoById(String id);
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/impl/CarInspectDetailHisInfoServiceImpl.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/impl/CarInspectDetailHisInfoServiceImpl.java
new file mode 100644
index 00000000..33e8406e
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/impl/CarInspectDetailHisInfoServiceImpl.java
@@ -0,0 +1,93 @@
+package com.jiuyv.business.service.impl;
+
+import com.jiuyv.business.domain.TblCarInspectDetailHisInfo;
+import com.jiuyv.business.mapper.TblCarInspectDetailHisInfoMapper;
+import com.jiuyv.business.service.CarInspectDetailHisInfoService;
+import com.jiuyv.common.utils.CarcheckDateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 车辆检查信息明细历史Service业务层处理
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Service
+public class CarInspectDetailHisInfoServiceImpl implements CarInspectDetailHisInfoService {
+ @Autowired
+ private TblCarInspectDetailHisInfoMapper tblCarInspectDetailHisInfoMapper;
+
+ /**
+ * 查询车辆检查信息明细历史
+ *
+ * @param id 车辆检查信息明细历史主键
+ * @return 车辆检查信息明细历史
+ */
+ @Override
+ public TblCarInspectDetailHisInfo selectTblCarInspectDetailHisInfoById(String id) {
+ return tblCarInspectDetailHisInfoMapper.selectTblCarInspectDetailHisInfoById(id);
+ }
+
+ /**
+ * 查询车辆检查信息明细历史列表
+ *
+ * @param tblCarInspectDetailHisInfo 车辆检查信息明细历史
+ * @return 车辆检查信息明细历史
+ */
+ @Override
+ public List selectTblCarInspectDetailHisInfoList(TblCarInspectDetailHisInfo tblCarInspectDetailHisInfo) {
+ return tblCarInspectDetailHisInfoMapper.selectTblCarInspectDetailHisInfoList(tblCarInspectDetailHisInfo);
+ }
+
+ /**
+ * 新增车辆检查信息明细历史
+ *
+ * @param tblCarInspectDetailHisInfo 车辆检查信息明细历史
+ * @return 结果
+ */
+ @Override
+ @Transactional
+ public int insertTblCarInspectDetailHisInfo(TblCarInspectDetailHisInfo tblCarInspectDetailHisInfo) {
+ tblCarInspectDetailHisInfo.setCreateTime(CarcheckDateUtils.getNowDate());
+ return tblCarInspectDetailHisInfoMapper.insertTblCarInspectDetailHisInfo(tblCarInspectDetailHisInfo);
+ }
+
+ /**
+ * 修改车辆检查信息明细历史
+ *
+ * @param tblCarInspectDetailHisInfo 车辆检查信息明细历史
+ * @return 结果
+ */
+ @Override
+ @Transactional
+ public int updateTblCarInspectDetailHisInfo(TblCarInspectDetailHisInfo tblCarInspectDetailHisInfo) {
+ tblCarInspectDetailHisInfo.setUpdateTime(CarcheckDateUtils.getNowDate());
+ return tblCarInspectDetailHisInfoMapper.updateTblCarInspectDetailHisInfo(tblCarInspectDetailHisInfo);
+ }
+
+ /**
+ * 批量删除车辆检查信息明细历史
+ *
+ * @param ids 需要删除的车辆检查信息明细历史主键
+ * @return 结果
+ */
+ @Override
+ public int deleteTblCarInspectDetailHisInfoByIds(String[] ids) {
+ return tblCarInspectDetailHisInfoMapper.deleteTblCarInspectDetailHisInfoByIds(ids);
+ }
+
+ /**
+ * 删除车辆检查信息明细历史信息
+ *
+ * @param id 车辆检查信息明细历史主键
+ * @return 结果
+ */
+ @Override
+ public int deleteTblCarInspectDetailHisInfoById(String id) {
+ return tblCarInspectDetailHisInfoMapper.deleteTblCarInspectDetailHisInfoById(id);
+ }
+}
diff --git a/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/impl/CarInspectDetailInfoServiceImpl.java b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/impl/CarInspectDetailInfoServiceImpl.java
new file mode 100644
index 00000000..f17f971b
--- /dev/null
+++ b/car-check/carcheck-admin/src/main/java/com/jiuyv/business/service/impl/CarInspectDetailInfoServiceImpl.java
@@ -0,0 +1,333 @@
+package com.jiuyv.business.service.impl;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.util.MapUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.fill.FillConfig;
+import com.jiuyv.business.constant.CarConstants;
+import com.jiuyv.business.domain.TblCarInspectDetailInfo;
+import com.jiuyv.business.domain.TblFileInfo;
+import com.jiuyv.business.mapper.TblCarInspectDetailInfoMapper;
+import com.jiuyv.business.mapper.TblFileInfoMapper;
+import com.jiuyv.business.service.CarInspectDetailInfoService;
+import com.jiuyv.business.vo.inspect.ReqExportSumInfoVO;
+import com.jiuyv.business.vo.inspect.ResExportInspectDetailVO;
+import com.jiuyv.business.vo.inspect.ResExportSumDetailVO;
+import com.jiuyv.business.vo.inspect.ResExportSumFileVO;
+import com.jiuyv.business.vo.inspect.ResQueryInspectDetailPage;
+import com.jiuyv.common.enums.DataStatusEnum;
+import com.jiuyv.common.exception.ServiceException;
+import com.jiuyv.common.utils.CarcheckDateUtils;
+import com.jiuyv.common.utils.JsonUtil;
+import com.jiuyv.common.utils.SecurityUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+
+/**
+ * 车辆检查信息明细Service业务层处理
+ *
+ * @author jiuyv
+ * @date 2023-07-18
+ */
+@Service
+public class CarInspectDetailInfoServiceImpl implements CarInspectDetailInfoService {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(CarInspectDetailInfoServiceImpl.class);
+
+ @Autowired
+ private TblCarInspectDetailInfoMapper tblCarInspectDetailInfoMapper;
+
+ @Value("${carcheck.templatePath}")
+ private String templatePath;
+
+ @Value("${carcheck.tempExcelDir}")
+ private String tempExcelDir;
+
+
+ @Autowired
+ private TblFileInfoMapper fileInfoMapper;
+
+ @Value("${carcheck.app.fileViewUrl}")
+ private String fileViewUrl;
+
+ @Autowired
+ private RestTemplate restTemplate;
+
+ // public CarInspectDetailInfoServiceImpl(RestTemplate restTemplate) {
+ // this.restTemplate = restTemplate;
+ // }
+
+
+ /**
+ * 查询车辆检查信息明细
+ *
+ * @return 车辆检查信息明细
+ */
+ @Override
+ public ResQueryInspectDetailPage selectTblCarInspectDetailInfoById(String id) {
+ ResQueryInspectDetailPage result = tblCarInspectDetailInfoMapper.selectTblCarInspectDetailInfoById(id);
+ TblFileInfo fileCond = new TblFileInfo();
+ fileCond.setBusinessId(id);
+ fileCond.setStatus(DataStatusEnum.NORMAL.getCode());
+ List imgs = new ArrayList<>();
+ List dbFiles = fileInfoMapper.selectTblFileInfoList(fileCond);
+ for (TblFileInfo dbFile : dbFiles) {
+ String fileUrl = dbFile.getFileUrl();
+ fileUrl = fileViewUrl + fileUrl;
+ imgs.add(fileUrl);
+ }
+
+ String partComment = result.getPartComment();
+ if (StringUtils.isNotBlank(partComment)) {
+ result.setInspectPartSecondName(partComment);
+ }
+ String pollutantComment = result.getPollutantComment();
+ if (StringUtils.isNotBlank(pollutantComment)) {
+ result.setPollutantDetailDescName(pollutantComment);
+ }
+
+ result.setImgs(imgs);
+ return result;
+ }
+
+ /**
+ * 查询车辆检查信息明细列表
+ *
+ * @param tblCarInspectDetailInfo 车辆检查信息明细
+ * @return 车辆检查信息明细
+ */
+ @Override
+ public List selectTblCarInspectDetailInfoList(TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ return tblCarInspectDetailInfoMapper.selectTblCarInspectDetailInfoList(tblCarInspectDetailInfo);
+ }
+
+ /**
+ * 新增车辆检查信息明细
+ *
+ * @param tblCarInspectDetailInfo 车辆检查信息明细
+ * @return 结果
+ */
+ @Override
+ @Transactional
+ public int insertTblCarInspectDetailInfo(TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ tblCarInspectDetailInfo.setCreateTime(CarcheckDateUtils.getNowDate());
+ return tblCarInspectDetailInfoMapper.insertTblCarInspectDetailInfo(tblCarInspectDetailInfo);
+ }
+
+ /**
+ * 修改车辆检查信息明细
+ *
+ * @param tblCarInspectDetailInfo 车辆检查信息明细
+ * @return 结果
+ */
+ @Override
+ @Transactional
+ public int updateTblCarInspectDetailInfo(TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ tblCarInspectDetailInfo.setUpdateTime(CarcheckDateUtils.getNowDate());
+ return tblCarInspectDetailInfoMapper.updateTblCarInspectDetailInfo(tblCarInspectDetailInfo);
+ }
+
+ /**
+ * 批量删除车辆检查信息明细
+ *
+ * @param ids 需要删除的车辆检查信息明细主键
+ * @return 结果
+ */
+ @Override
+ public int deleteTblCarInspectDetailInfoByIds(String[] ids) {
+ return tblCarInspectDetailInfoMapper.deleteTblCarInspectDetailInfoByIds(ids);
+ }
+
+ /**
+ * 删除车辆检查信息明细信息
+ *
+ * @param id 车辆检查信息明细主键
+ * @return 结果
+ */
+ @Override
+ public int deleteTblCarInspectDetailInfoById(String id) {
+ return tblCarInspectDetailInfoMapper.deleteTblCarInspectDetailInfoById(id);
+ }
+
+ @Override
+ public List selectExportInspectDetailInfoList(TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ Long deptId = SecurityUtils.getDeptId();
+ String inspectOrgId = tblCarInspectDetailInfo.getInspectOrgId();
+ if(StringUtils.isNotBlank(inspectOrgId)){
+ tblCarInspectDetailInfo.setInspectOrgId(inspectOrgId);
+ }else{
+ if(!CarConstants.PARENT_DEPT_ID.equals(deptId+"")){
+ tblCarInspectDetailInfo.setInspectOrgId(deptId+"");
+ }
+ }
+ List list = tblCarInspectDetailInfoMapper.selectExportInspectDetailInfoListV2(tblCarInspectDetailInfo);
+ return list;
+ }
+
+ @Override
+ public List queryInspectDetailPage(TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ tblCarInspectDetailInfo.setDataStatus(CarConstants.STATUS_NOMAL);
+ Long deptId = SecurityUtils.getDeptId();
+ String inspectOrgId = tblCarInspectDetailInfo.getInspectOrgId();
+ if (StringUtils.isNotBlank(inspectOrgId)) {
+ tblCarInspectDetailInfo.setInspectOrgId(inspectOrgId);
+ } else if (null != deptId && !CarConstants.PARENT_DEPT_ID.equals(deptId + "")) {
+ //兄弟公司查询条件
+ tblCarInspectDetailInfo.setInspectOrgId(deptId + "");
+ }
+
+ //外部用户（委托单位）查询条件
+ String companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
+ if (StringUtils.isNotBlank(companyId)) {
+ tblCarInspectDetailInfo.setCompanyId(companyId);
+ }
+ List list = tblCarInspectDetailInfoMapper.queryInspectDetailPage(tblCarInspectDetailInfo);
+ return list;
+ }
+
+ @Override
+ public ResExportSumFileVO exportSum(ReqExportSumInfoVO req) {
+ ResExportSumFileVO result = new ResExportSumFileVO();
+
+ ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ HttpServletResponse response = servletRequestAttributes.getResponse();
+ String shipName = req.getShipName();
+ if (StringUtils.isBlank(shipName)) {
+ throw new ServiceException("船名航次不能为空");
+
+ }
+ String inspectTime = req.getInspectTime();
+// if(StringUtils.isBlank(inspectTime)){
+// throw new ServiceException("；；；；检查时间不能为空");
+// }
+
+ // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
+ // {} 代表普通变量 {.} 代表是list的变量
+ String templateFileName = templatePath;
+
+ String fileName = "表2-装船前生物安全风险检验情况清单_" + System.currentTimeMillis() + ".xls";
+ String generalFileName = tempExcelDir + fileName;
+ // 方案1
+ try (ExcelWriter excelWriter = EasyExcel.write(generalFileName).withTemplate(templateFileName).build()) {
+ WriteSheet writeSheet = EasyExcel.writerSheet().build();
+ // 这里注意 入参用了forceNewRow 代表在写入list的时候不管list下面有没有空行 都会创建一行，然后下面的数据往后移动。默认 是false，会直接使用下一行，如果没有则创建。
+ // forceNewRow 如果设置了true,有个缺点 就是他会把所有的数据都放到内存了，所以慎用
+ // 简单的说 如果你的模板有list,且list不是最后一行，下面还有数据需要填充 就必须设置 forceNewRow=true 但是这个就会把所有数据放到内存 会很耗内存
+ // 如果数据量大 list不是最后一行 参照下一个
+ FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
+ // List list = new ArrayList<>();
+ // ReqExportSumInfoVO cond = new ReqExportSumInfoVO();
+ // cond.setShipName(shipName);
+ // cond.setInspectTime(inspectTime);
+ req.setDataStatus(CarConstants.STATUS_NOMAL);
+ Long deptId = SecurityUtils.getDeptId();
+ String inspectOrgId = req.getInspectOrgId();
+ if(StringUtils.isNotBlank(inspectOrgId)){
+ req.setInspectOrgId(inspectOrgId);
+ }else{
+ if(!CarConstants.PARENT_DEPT_ID.equals(deptId+"")){
+ req.setInspectOrgId(deptId+"");
+ }
+ }
+ List list = tblCarInspectDetailInfoMapper.selectExportSumInfoV2(req);
+ for (ResExportSumDetailVO res : list) {
+ String partComment = res.getPartComment();
+ if (StringUtils.isNotBlank(partComment)) {
+ res.setInspectPartSecondName(partComment);
+ }
+ String pollutantComment = res.getPollutantComment();
+ if (StringUtils.isNotBlank(pollutantComment)) {
+ res.setPollutantDetailDescName(pollutantComment);
+ }
+ }
+
+ LOGGER.info("list>>>{}", JsonUtil.toJSONString(list));
+
+ excelWriter.fill(list, fillConfig, writeSheet);
+ // excelWriter.fill(data(), fillConfig, writeSheet);
+ Map map = MapUtils.newHashMap();
+ map.put("shipName", shipName);
+ map.put("totalCount", list.size());
+ map.put("inspectTime", inspectTime);
+ excelWriter.fill(map, writeSheet);
+
+ result.setFileName(fileName);
+ result.setGeneratedFileName(generalFileName);
+ return result;
+ }
+ }
+
+ public byte[] downloadImage(String imageUrl) throws IOException {
+ try {
+ return restTemplate.getForObject(imageUrl, byte[].class);
+ } catch (Exception e) {
+ throw new ServiceException("Failed to download image from URL: " + imageUrl);
+ }
+ }
+
+ @Override
+ public Set getZipImgs(TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ //List dbDetails = tblCarInspectDetailInfoMapper.selectTblCarInspectDetailInfoList(tblCarInspectDetailInfo);
+ List dbDetails = tblCarInspectDetailInfoMapper.selectTblCarInspectDetailInfoListV2(tblCarInspectDetailInfo);
+ List detailIds = dbDetails.stream().map(item -> item.getId()).collect(Collectors.toList());
+ Set imgUrls = new HashSet<>();
+ for (String detailId : detailIds) {
+ TblFileInfo file = new TblFileInfo();
+ file.setBusinessId(detailId);
+ List dbImgs = fileInfoMapper.selectTblFileInfoList(file);
+ for (TblFileInfo fileInfo : dbImgs) {
+ String imgUrl = fileViewUrl + fileInfo.getFileUrl();
+ imgUrls.add(imgUrl);
+ }
+ }
+ return imgUrls;
+ }
+
+ @Override
+ public Set getLocalImagePaths(TblCarInspectDetailInfo tblCarInspectDetailInfo) {
+ Long deptId = SecurityUtils.getDeptId();
+ String inspectOrgId = tblCarInspectDetailInfo.getInspectOrgId();
+ if(StringUtils.isNotBlank(inspectOrgId)){
+ tblCarInspectDetailInfo.setInspectOrgId(inspectOrgId);
+ }else{
+ if(!CarConstants.PARENT_DEPT_ID.equals(deptId+"")){
+ tblCarInspectDetailInfo.setInspectOrgId(deptId+"");
+ }
+ }
+
+ List dbDetails = tblCarInspectDetailInfoMapper.selectTblCarInspectDetailInfoListV2(tblCarInspectDetailInfo);
+ List detailIds = dbDetails.stream().map(item -> item.getId()).collect(Collectors.toList());
+ Set imgUrls = new HashSet<>();
+ for (String detailId : detailIds) {
+ TblFileInfo file = new TblFileInfo();
+ file.setBusinessId(detailId);
+ //List dbImgs = fileInfoMapper.selectTblFileInfoListV2(file);
+ Set