wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

BUG优化

dev
xiepeng 2024-04-03 17:56:58 +08:00
parent bd7f1054fb
commit 1d133a37c9
23 changed files with 343 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/main/java/com/zcloud/controller/assignedManage/AssignedManageController.java
View File

@ -7,14 +7,11 @@ import com.zcloud.service.assignedManage.AssignedManageService;
import com.zcloud.service.freighttrailer.FreightTrailerService;
import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
import com.zcloud.service.system.ImgFilesService;
import com.zcloud.service.taxationManage.TaxationManageService;
import com.zcloud.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.*;
@ -25,9 +22,6 @@ public class AssignedManageController extends BaseController {
@Autowired
private AssignedManageService assignedManageService;
@Autowired
private Smb smb;
@Autowired
private ImgFilesService imgfilesService;
@ -58,6 +52,27 @@ public class AssignedManageController extends BaseController {
pd.put("VEHICLE_TYPE",pd.get("ASSIGNED_VEHICLE_MODEL"));
pd.put("NOW_CONTACT_NUMBER",pd.get("NOW_OWNERS_NUMBER"));
assignedManageService.save(pd);
PageData pageData = assignedManageService.findById(pd);
String vehicle = pageData.getString("RAW_PLATE_NUMBER");
PageData pd2 = new PageData();
pd2.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
pd2.put("ID", vehicle);
List<PageData> vehicleInfo = freightTrailerService.vehicleList(pd2);
if ("1".equals(vehicleInfo.get(0).get("TRAFFIC_TYPE") + "")) {
// 营运车辆
PageData operating = new PageData();
operating.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
operating.put("OPERATING_ID", vehicleInfo.get(0).get("ID"));
operating.put("ISASSIGNED", "1");
operatingVehiclesService.setAssinedStatus(operating);
}else if("2".equals(vehicleInfo.get(0).get("TRAFFIC_TYPE") + "")) {
// 货运挂车
PageData freightTrailer = new PageData();
freightTrailer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
freightTrailer.put("FREIGHTTRAILER_ID", vehicleInfo.get(0).get("ID"));
freightTrailer.put("ISASSIGNED", "1");
freightTrailerService.setAssinedStatus(freightTrailer);
}
map.put("pd", pd);
map.put("result", errInfo);
return map;
@ -77,6 +92,31 @@ public class AssignedManageController extends BaseController {
pd.put("DELETOR", Jurisdiction.getUSER_ID());
pd.put("DELETORNAME", Jurisdiction.getUsername());
pd.put("DELETTIME", DateUtil.date2Str(new Date()));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData assignedInfo = new PageData();
assignedInfo.put("ASSIGNED_ID", pd.get("ASSIGNED_ID"));
assignedInfo.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData pageData = assignedManageService.findById(assignedInfo);
String vehicle = pageData.getString("RAW_PLATE_NUMBER");
PageData pd2 = new PageData();
pd2.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
pd2.put("ID", vehicle);
List<PageData> vehicleInfo = freightTrailerService.vehicleList(pd2);
if ("1".equals(vehicleInfo.get(0).get("TRAFFIC_TYPE") + "")) {
// 营运车辆
PageData operating = new PageData();
operating.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
operating.put("OPERATING_ID", vehicleInfo.get(0).get("ID"));
operating.put("ISASSIGNED", "0");
operatingVehiclesService.setAssinedStatus(operating);
}else if("2".equals(vehicleInfo.get(0).get("TRAFFIC_TYPE") + "")) {
// 货运挂车
PageData freightTrailer = new PageData();
freightTrailer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
freightTrailer.put("FREIGHTTRAILER_ID", vehicleInfo.get(0).get("ID"));
freightTrailer.put("ISASSIGNED", "0");
freightTrailerService.setAssinedStatus(freightTrailer);
}
assignedManageService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
@ -126,7 +166,11 @@ public class AssignedManageController extends BaseController {
pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd = assignedManageService.findById(pd);
PageData pd2 = new PageData();
pd2.put("CORPINFO_ID", pd.getString("CORPINFO_ID"));
pd2.put("ID", pd.get("RAW_PLATE_NUMBER"));
List<PageData> pageData = freightTrailerService.vehicleList(pd2);
pd.put("PLATE_NUMBER",pageData.get(0).get("PLATE_NUMBER"));
pd.put("FOREIGN_KEY", pd.getString("ASSIGNED_ID"));
pd.put("TYPE",120);
List<PageData> nowVehicleOperationCertificateImgs = imgfilesService.listAll(pd);//车头照片
@ -183,7 +227,7 @@ public class AssignedManageController extends BaseController {
return map;
}
@RequestMapping(value = "/getassignedoperationvehiclelist")
/*@RequestMapping(value = "/getassignedoperationvehiclelist")
@ResponseBody
public Object getAssignedOperationVehicleList() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
@ -201,9 +245,31 @@ public class AssignedManageController extends BaseController {
map.put("varList", operationList);
map.put("result", errInfo);
return map;
}*/
@RequestMapping(value = "/getAssignedVehicleList")
@ResponseBody
public Object getAssignedVehicleList() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
String corpId = Jurisdiction.getCORPINFO_ID();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> allOperatingVehicleList = operatingVehiclesService.getPulldownVehicleList(pd); // 查询出所有不包括 删除、报废的车辆
List<PageData> allAssignedList = assignedManageService.assignedList(corpId); // 所有过户的车辆
for (int i = 0; i < allAssignedList.size(); i++) {
for (int j = 0; j < allOperatingVehicleList.size(); j++) {
if(allAssignedList.get(i).get("RAW_PLATE_NUMBER").equals(allOperatingVehicleList.get(j).get("OPERATING_ID"))) {
allOperatingVehicleList.remove(j);
}
}
}
map.put("varList", allOperatingVehicleList);
map.put("result", errInfo);
return map;
}
@RequestMapping(value = "/getassignedfreighttrailerlist")
/*@RequestMapping(value = "/getassignedfreighttrailerlist")
@ResponseBody
public Object getAssignedFreightTrailerList() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
@ -221,5 +287,25 @@ public class AssignedManageController extends BaseController {
map.put("varList", freightList);
map.put("result", errInfo);
return map;
}*/
@RequestMapping(value = "/getAssignedFreightTrailerList")
@ResponseBody
public Object getAssignedFreightTrailerList() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
String corpId = Jurisdiction.getCORPINFO_ID();
List<PageData> freightList = freightTrailerService.getPulldownVehicleList(corpId);
List<PageData> assignedList = assignedManageService.assignedList(corpId);
for (int i = 0; i < assignedList.size(); i++) {
for (int j = 0; j < freightList.size(); j++) {
if(assignedList.get(i).get("RAW_PLATE_NUMBER").equals(freightList.get(j).get("FREIGHTTRAILER_ID"))) {
freightList.remove(j);
}
}
}
map.put("varList", freightList);
map.put("result", errInfo);
return map;
}
}

12
src/main/java/com/zcloud/controller/beidou/BeidouController.java
View File

@ -71,8 +71,8 @@ public class BeidouController extends BaseController {
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业
pd.put("ARCHIVES_TYPE", "正常"); //档案状态
pd.put("ARCHIVES_TYPE", "0"); //档案状态
pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态
String ffile = DateUtil.getDays();
if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -214,6 +214,14 @@ public class BeidouController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
page.setPd(pd);
List<PageData> varList = beidouService.list(page); //列出Question列表
for (PageData operation : varList) {
if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
operation.put("ARCHIVES_TYPE", "1");
}
if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
operation.put("ARCHIVES_TYPE", "2");
}
}
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);

1
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCommitmentController.java
View File

@ -169,7 +169,6 @@ public class TrafficSecurityCommitmentController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
page.setPd(pd);
List<PageData> varList = securityCommitmentService.listForSecurityCommitmentUser(page);
map.put("varList", varList);

12
src/main/java/com/zcloud/controller/inspectAnnually/InspectAnnuallyController.java
View File

@ -61,8 +61,8 @@ public class InspectAnnuallyController extends BaseController {
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
pd.put("ARCHIVES_TYPE", "正常"); //档案状态
pd.put("ARCHIVES_TYPE", "0"); //档案状态
pd.put("VEHICLE",pd.get("PLATE_NUMBER"));
inspectAnnuallyService.save(pd);
map.put("pd", pd);
map.put("result", errInfo);
@ -158,6 +158,14 @@ public class InspectAnnuallyController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
page.setPd(pd);
List<PageData> varList = inspectAnnuallyService.list(page); //列出Question列表
for (PageData operation : varList) {
if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
operation.put("ARCHIVES_TYPE", "2");
}
if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
operation.put("ARCHIVES_TYPE", "1");
}
}
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);

4
src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java
View File

@ -61,6 +61,7 @@ public class MaintenanceController extends BaseController {
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
pd.put("ARCHIVES_TYPE", "0"); //档案状态
pd.put("VEHICLE", pd.get("PLATE_NUMBER")); //档案状态
maintenanceService.save(pd);
map.put("pd", pd);
map.put("result", errInfo);
@ -160,6 +161,9 @@ public class MaintenanceController extends BaseController {
if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
operation.put("ARCHIVES_TYPE", "2");
}
if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
operation.put("ARCHIVES_TYPE", "1");
}
}
map.put("varList", varList);
map.put("page", page);

4
src/main/java/com/zcloud/controller/operations/OperationsController.java
View File

@ -61,6 +61,7 @@ public class OperationsController extends BaseController {
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
pd.put("ARCHIVES_TYPE", "0"); //档案状态
pd.put("VEHICLE", pd.get("PLATE_NUMBER"));
operationsService.save(pd);
map.put("pd", pd);
map.put("result", errInfo);
@ -160,6 +161,9 @@ public class OperationsController extends BaseController {
if("1".equals(operation.get("OPEAR_ISSCRAP")) || "1".equals(operation.get("FREIGHT_ISSCRAP"))) {
operation.put("ARCHIVES_TYPE", "2");
}
if("1".equals(operation.get("OPEAR_ISASSIGNED")) || "1".equals(operation.get("FREIGHT_ISASSIGNED"))) {
operation.put("ARCHIVES_TYPE", "1");
}
}
map.put("varList", varList);
map.put("page", page);

38
src/main/java/com/zcloud/controller/scrapManage/ScrapManageController.java
View File

@ -181,7 +181,7 @@ public class ScrapManageController extends BaseController {
return map;
}
@RequestMapping(value = "/getscrapoperationvehiclelist")
/*@RequestMapping(value = "/getscrapoperationvehiclelist")
@ResponseBody
public Object getScrapOperationVehicleList() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
@ -199,6 +199,28 @@ public class ScrapManageController extends BaseController {
map.put("varList", operationList);
map.put("result", errInfo);
return map;
}*/
@RequestMapping(value = "/getScrapOperationVehicleList")
@ResponseBody
public Object getScrapOperationVehicleList() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
String corpId = Jurisdiction.getCORPINFO_ID();
PageData pd = new PageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> operationList = operatingVehiclesService.getScrapPulldownVehicleList(pd); //列出Question列表
List<PageData> scrapList = scrapManageService.scrapListAll(corpId);
for (int i = 0; i < scrapList.size(); i++) {
for (int j = 0; j < operationList.size(); j++) {
if(scrapList.get(i).get("PLATE_NUMBER").equals(operationList.get(j).get("PLATE_NUMBER"))) {
operationList.remove(j);
}
}
}
map.put("varList", operationList);
map.put("result", errInfo);
return map;
}
/*@RequestMapping(value = "/getscrapfreighttrailerlist")
@ -221,13 +243,21 @@ public class ScrapManageController extends BaseController {
return map;
}*/
@RequestMapping(value = "/getscrapfreighttrailerlist")
@RequestMapping(value = "/getScrapFreightTrailerList")
@ResponseBody
public Object getScrapFreightTrailerList() throws Exception {
public Object getAssignedFreightTrailerList() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
String corpId = Jurisdiction.getCORPINFO_ID();
List<PageData> freightList = freightTrailerService.trailerList(corpId);
List<PageData> freightList = freightTrailerService.getScrapPulldownVehicleList(corpId);
List<PageData> scrapList = scrapManageService.scrapListAll(corpId);
for (int i = 0; i < scrapList.size(); i++) {
for (int j = 0; j < freightList.size(); j++) {
if(scrapList.get(i).get("PLATE_NUMBER").equals(freightList.get(j).get("PLATE_NUMBER"))) {
freightList.remove(j);
}
}
}
map.put("varList", freightList);
map.put("result", errInfo);
return map;

5
src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java
View File

@ -51,6 +51,7 @@ public class TaxationManageController extends BaseController {
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人id
pd.put("CREATORNAME", Jurisdiction.getUsername()); //添加人名字
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("ARCHIVES_TYPE", "0"); //档案状态
if("".equals(pd.getString("EXPIRE_STATUS"))) {
String expireDate = pd.getString("EXPIRE_DATE");
String day = DateUtil.getDay();
@ -109,9 +110,9 @@ public class TaxationManageController extends BaseController {
String day = DateUtil.getDay();
boolean flag = DateUtil.compareDate(expireDate, day);
if(flag) {
pd.put("EXPIRE_STATUS","未到期");
pd.put("EXPIRE_STATUS","1");
}else{
pd.put("EXPIRE_STATUS","已到期");
pd.put("EXPIRE_STATUS","0");
}
taxationManageService.edit(pd);
map.put("pd", pd);

7
src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java
View File

@ -84,5 +84,12 @@ public interface FreightTrailerMapper {
PageData findByPlateNumber(PageData pd2);
PageData vehicle(PageData pd);
List<PageData> getPulldownVehicleList(String corpId);
void setAssinedStatus(PageData freightTrailer);
List<PageData> getScrapPulldownVehicleList(String corpId);
}

6
src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java
View File

@ -45,4 +45,10 @@ public interface OperatingVehiclesMapper {
List<PageData> listOut(PageData pd);
List<PageData> listAll(PageData pd);
List<PageData> getPulldownVehicleList(PageData pd);
void setAssinedStatus(PageData operating);
List<PageData> getScrapPulldownVehicleList(PageData pd);
}

6
src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java
View File

@ -84,5 +84,11 @@ public interface FreightTrailerService {
PageData findByPlateNumber(PageData pd2);
PageData vehicle(PageData pd);
List<PageData> getPulldownVehicleList(String corpId);
void setAssinedStatus(PageData freightTrailer);
List<PageData> getScrapPulldownVehicleList(String corpId);
}

15
src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java
View File

@ -127,5 +127,20 @@ public class FreightTrailerServiceImpl implements FreightTrailerService {
public PageData vehicle(PageData pd) {
return freightTrailerMapper.vehicle(pd);
}
@Override
public List<PageData> getPulldownVehicleList(String corpId) {
return freightTrailerMapper.getPulldownVehicleList(corpId);
}
@Override
public void setAssinedStatus(PageData freightTrailer) {
freightTrailerMapper.setAssinedStatus(freightTrailer);
}
@Override
public List<PageData> getScrapPulldownVehicleList(String corpId) {
return freightTrailerMapper.getScrapPulldownVehicleList(corpId);
}
}

6
src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java
View File

@ -45,4 +45,10 @@ public interface OperatingVehiclesService {
List<PageData> listOut(PageData pd);
List<PageData> listAll(PageData pd);
List<PageData> getPulldownVehicleList(PageData pd);
void setAssinedStatus(PageData operating);
List<PageData> getScrapPulldownVehicleList(PageData pd);
}

15
src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java
View File

@ -71,4 +71,19 @@ public class OperatingVehiclesServiceImpl implements OperatingVehiclesService {
public List<PageData> listAll(PageData pd) {
return operatingVehiclesMapper.listAll(pd);
}
@Override
public List<PageData> getPulldownVehicleList(PageData pd) {
return operatingVehiclesMapper.getPulldownVehicleList(pd);
}
@Override
public void setAssinedStatus(PageData operating) {
operatingVehiclesMapper.setAssinedStatus(operating);
}
@Override
public List<PageData> getScrapPulldownVehicleList(PageData pd) {
return operatingVehiclesMapper.getScrapPulldownVehicleList(pd);
}
}

4
src/main/resources/mybatis/datasource/assignedManage/AssignedManageMapper.xml
View File

@ -423,9 +423,11 @@
<!-- 列表(全部) -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.*
f.*,
v.PLATE_NUMBER
from
<include refid="tableName"></include> f
INNER JOIN v_traffic v on v.ID = f.RAW_PLATE_NUMBER
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.ASSIGNED_TYPE != null and pd.ASSIGNED_TYPE != ''"><!-- 关键词检索 -->
and f.ASSIGNED_TYPE = #{pd.ASSIGNED_TYPE}

37
src/main/resources/mybatis/datasource/beidou/BeidouMapper.xml
View File

@ -52,7 +52,8 @@
OPERATTIME,
DELETEOR,
DELETEORNAME,
DELETTIME
DELETTIME,
ARCHIVES_TYPE
</sql>
<!-- 字段值定义 -->
@ -99,7 +100,8 @@
#{OPERATTIME},
#{DELETEOR},
#{DELETEORNAME},
#{DELETTIME}
#{DELETTIME},
#{ARCHIVES_TYPE}
</sql>
@ -149,7 +151,8 @@
NOTES = #{NOTES},
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME}
OPERATTIME = #{OPERATTIME},
ARCHIVES_TYPE = #{ARCHIVES_TYPE}
where
BEIDOU_ID = #{BEIDOU_ID}
</update>
@ -202,10 +205,11 @@
f.OPERATTIME,
f.DELETEOR,
f.DELETEORNAME,
f.DELETTIME
f.DELETTIME,
v.PLATE_NUMBER
from
<include refid="tableName"></include>
f
<include refid="tableName"></include> f
INNER JOIN v_traffic v on v.ID = f.VEHICLE
where
f.BEIDOU_ID = #{BEIDOU_ID}
</select>
@ -262,20 +266,17 @@
select
f.*,
case when f.DUE_DATE &lt; NOW() then 0 else 1 end as DUE_DATE_TYPE,
v1.PLATE_NUMBER
/*case
when btsm.PLATE_NUMBER is not null then '1'
when bta.RAW_PLATE_NUMBER is not null then '2'
else f.ARCHIVES_TYPE
end as NEW_ARCHIVES_TYPE*/
v1.PLATE_NUMBER,
o.ISSCRAP AS OPEAR_ISSCRAP,
btmf.ISSCRAP AS FREIGHT_ISSCRAP,
o.ISASSIGNED AS OPEAR_ISASSIGNED,
btmf.ISASSIGNED AS FREIGHT_ISASSIGNED
from
<include refid="tableName"></include> f
INNER JOIN v_traffic v1 on f.VEHICLE=v1.ID
/*LEFT JOIN BUS_TRAFFIC_SCRAP_MANAGEMENT btsm on v1.PLATE_NUMBER = btsm.PLATE_NUMBER
LEFT JOIN BUS_TRAFFIC_ASSIGNED bta on v1.PLATE_NUMBER = bta.RAW_PLATE_NUMBER*/
LEFT JOIN bus_traffic_mechanical_freighttrailer btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE
LEFT JOIN bus_traffic_operatingvehicle bto on bto.OPERATING_ID = f.VEHICLE
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and (btmf.ISSCRAP = '0' OR bto.ISSCRAP = '0')
INNER JOIN v_traffic v1 on f.VEHICLE = v1.ID
LEFT JOIN BUS_TRAFFIC_OPERATINGVEHICLE o on o.OPERATING_ID = f.VEHICLE
LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.BASICINFO_LICENSE_PLATE != null and pd.BASICINFO_LICENSE_PLATE != ''">
and f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%')
</if>

1
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyOccupationalHazardsMapper.xml
View File

@ -152,6 +152,7 @@
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''">
and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS}
</if>
ORDER BY c.OPERATTIME DESC
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">

1
src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyResponsibilityMapper.xml
View File

@ -152,6 +152,7 @@
<if test="pd.VALIDSTATUS != null and pd.VALIDSTATUS != ''"><!-- 关键词检索-有效状态 -->
and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS}
</if>
ORDER BY c.OPERATTIME DESC
</select>
<select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">

41
src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml
View File

@ -211,7 +211,7 @@
<if test="pd.DEPARTMENT_NAME != null and pd.DEPARTMENT_NAME != ''">
and de.NAME LIKE CONCAT(CONCAT('%', #{pd.DEPARTMENT_NAME}),'%')
</if>
ORDER BY f.CREATTIME DESC
ORDER BY f.OPERATTIME DESC
</select>
<!-- 所属企业列表 -->
@ -226,12 +226,25 @@
<!-- 货运挂车列表ALL -->
<select id="trailerList" parameterType="page" resultType="pd">
select
*
*,
v.PLATE_NUMBER
from
<include refid="tableName"></include> f
INNER JOIN v_traffic v on v.ID = f.FREIGHTTRAILER_ID
where f.ISDELETE = '0' and f.CORPINFO_ID = #{corpId} AND f.ISSCRAP = '0'
</select>
<select id="getPulldownVehicleList" resultType="com.zcloud.entity.PageData">
select
*,
v.ID
from
<include refid="tableName"></include> f
INNER JOIN v_traffic v on v.ID = f.FREIGHTTRAILER_ID
where
f.ISDELETE = '0' AND f.CORPINFO_ID = #{corpId} AND f.ISSCRAP = '0'
</select>
<!-- 货运挂车列表ALL -->
<select id="vehicleList" parameterType="page" resultType="pd">
select
@ -299,4 +312,28 @@
where f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID} and f.PLATE_NUMBER = #{PLATE_NUMBER}
</select>
<update id="setAssinedStatus" parameterType="pd">
update
<include refid="tableName"></include>
set
ISASSIGNED = #{ISASSIGNED}
where
FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID}
and
CORPINFO_ID = #{CORPINFO_ID}
</update>
<select id="getScrapPulldownVehicleList" resultType="com.zcloud.entity.PageData">
select
*,
v.ID
from
<include refid="tableName"></include> f
INNER JOIN v_traffic v on v.ID = f.FREIGHTTRAILER_ID
where
f.ISDELETE = '0' AND f.CORPINFO_ID = #{corpId} AND f.ISASSIGNED = '0'
</select>
</mapper>

15
src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml
View File

@ -161,7 +161,8 @@
f.CREATORNAME,
f.CREATTIME,
(SELECT sd.NAME FROM sys_dictionaries sd where sd.DICTIONARIES_ID=f.ANNUAL_INSPECTION_CYCLE) as ANNUAL_INSPECTION_CYCLE_NAME,
v.COMPANY_AREA as AREA
v.COMPANY_AREA as AREA,
v.PLATE_NUMBER
from
<include refid="tableName"></include> f
left join v_traffic v on f.VEHICLE = v.ID
@ -183,14 +184,18 @@
b.NAME,
f.*,
case when f.DUE_DATE &lt; NOW() then 0 else 1 end as DUE_DATE_TYPE,
v1.PLATE_NUMBER
v1.PLATE_NUMBER,
o.ISSCRAP AS OPEAR_ISSCRAP,
btmf.ISSCRAP AS FREIGHT_ISSCRAP,
o.ISASSIGNED AS OPEAR_ISASSIGNED,
btmf.ISASSIGNED AS FREIGHT_ISASSIGNED
from
<include refid="tableName"></include> f
left join sys_dictionaries b on f.ANNUAL_INSPECTION_CYCLE = b.DICTIONARIES_ID AND b.PARENT_ID = '8b7dea3977fd4360a3cc8112368b90ff'
INNER JOIN v_traffic v1 on f.VEHICLE = v1.ID
LEFT JOIN bus_traffic_operatingvehicle bto on bto.OPERATING_ID = f.VEHICLE
LEFT JOIN bus_traffic_mechanical_freighttrailer btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and (bto.ISSCRAP = '0' OR btmf.ISSCRAP = '0')
LEFT JOIN BUS_TRAFFIC_OPERATINGVEHICLE o on o.OPERATING_ID = f.VEHICLE
LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE
where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
<if test="pd.PLATE_NUMBER != null and pd.PLATE_NUMBER != ''">
and v1.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%')
</if>

11
src/main/resources/mybatis/datasource/maintenance/MaintenanceMapper.xml
View File

@ -203,10 +203,11 @@
f.OPERATTIME,
f.DELETEOR,
f.DELETEORNAME,
f.DELETTIME
f.DELETTIME,
v.PLATE_NUMBER
from
<include refid="tableName"></include>
f
<include refid="tableName"></include> f
INNER JOIN v_traffic v on v.ID = f.VEHICLE
where
f.MAINTENANCE_ID = #{MAINTENANCE_ID}
</select>
@ -226,7 +227,9 @@
case when f.DUE_DATE &lt; NOW() then 0 else 1 end as DUE_DATE_TYPE,
v1.PLATE_NUMBER,
o.ISSCRAP AS OPEAR_ISSCRAP,
btmf.ISSCRAP AS FREIGHT_ISSCRAP
btmf.ISSCRAP AS FREIGHT_ISSCRAP,
o.ISASSIGNED AS OPEAR_ISASSIGNED,
btmf.ISASSIGNED AS FREIGHT_ISASSIGNED
from
<include refid="tableName"></include>
f

43
src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml
View File

@ -301,6 +301,17 @@
CORPINFO_ID = #{CORPINFO_ID}
</update>
<update id="setAssinedStatus" parameterType="pd">
update
<include refid="tableName"></include>
set
ISASSIGNED = #{ISASSIGNED}
where
OPERATING_ID = #{OPERATING_ID}
and
CORPINFO_ID = #{CORPINFO_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findByfindByPlateNumber" parameterType="pd" resultType="pd">
@ -318,7 +329,30 @@
*
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
where
f.ISDELETE = '0'
</select>
<select id="getPulldownVehicleList" resultType="com.zcloud.entity.PageData">
select
<include refid="Field"></include>,
v.ID
from
<include refid="tableName"></include> f
inner join v_traffic v on v.ID = f.OPERATING_ID
where
f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID} AND f.ISSCRAP = '0'
</select>
<select id="getScrapPulldownVehicleList" resultType="com.zcloud.entity.PageData">
select
<include refid="Field"></include>,
v.ID
from
<include refid="tableName"></include> f
inner join v_traffic v on v.ID = f.OPERATING_ID
where
f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID} AND f.ISASSIGNED = '0'
</select>
<!-- 列表 -->
@ -543,10 +577,11 @@
<select id="operationVehicleList" parameterType="page" resultType="pd">
select
*
*,
v.PLATE_NUMBER
from
<include refid="tableName"></include>
f
<include refid="tableName"></include> f
INNER JOIN v_traffic v on v.ID = f.OPERATING_ID
where f.CORPINFO_ID = #{corpId}
and f.ISDELETE = '0'
and f.ISSCRAP = '0'

14
src/main/resources/mybatis/datasource/operations/OperationsMapper.xml
View File

@ -142,7 +142,6 @@
OPERATOR = #{OPERATOR},
OPERATORNAME = #{OPERATORNAME},
OPERATTIME = #{OPERATTIME}
ARCHIVES_TYPE = #{ARCHIVES_TYPE}
where
OPERATIONS_ID = #{OPERATIONS_ID}
</update>
@ -191,9 +190,12 @@
f.DELETEOR,
f.DELETEORNAME,
f.DELETTIME,
v.PLATE_NUMBER,
sd.NAME as CYCLE_NAME,
v.PLATE_NUMBER
from
<include refid="tableName"></include> f
LEFT JOIN sys_dictionaries sd on sd.DICTIONARIES_ID = f.CYCLE
INNER JOIN v_traffic v on v.ID = f.VEHICLE
where
f.OPERATIONS_ID = #{OPERATIONS_ID}
@ -263,16 +265,18 @@
<select id="datalistPage2" parameterType="page" resultType="pd">
select
b.NAME,
b.NAME AS CYCLE_NAME,
f.*,
case when f.DUE_DATE &lt; NOW() then 0 else 1 end as DUE_DATE_TYPE,
v1.PLATE_NUMBER,
v1.TRAFFIC_TYPE,
o.ISSCRAP AS OPEAR_ISSCRAP,
btmf.ISSCRAP AS FREIGHT_ISSCRAP
btmf.ISSCRAP AS FREIGHT_ISSCRAP,
o.ISASSIGNED AS OPEAR_ISASSIGNED,
btmf.ISASSIGNED AS FREIGHT_ISASSIGNED
from
<include refid="tableName"></include> f
left join sys_dictionaries b on b.DICTIONARIES_ID=f.CYCLE AND b.PARENT_ID='8b7dea3977fd4360a3cc8112368b90ff'
left join sys_dictionaries b on b.DICTIONARIES_ID = f.CYCLE AND b.PARENT_ID='8b7dea3977fd4360a3cc8112368b90ff'
INNER JOIN v_traffic v1 on f.VEHICLE = v1.ID
LEFT JOIN BUS_TRAFFIC_OPERATINGVEHICLE o on o.OPERATING_ID = f.VEHICLE
LEFT JOIN BUS_TRAFFIC_MECHANICAL_FREIGHTTRAILER btmf on btmf.FREIGHTTRAILER_ID = f.VEHICLE
@ -306,7 +310,7 @@
-- DATE_SUB函数用于计算提前提醒的日期。它从到期日期中减去一定天数，以得到提醒开始的日期。
-- DATE_SUB的第一个参数是到期日期（f.DUE_DATE），
-- 第二个参数INTERVAL f.REMINDER_DAYS DAY指定从到期日期向前推算的天数（f.REMINDER_DAYS字段的值）
and NOW() BETWEEN DATE_SUB(f.DUE_DATE, INTERVAL f.REMINDER_DAYS DAY) AND f.DUE_DATE
and case when f.DUE_DATE &lt; NOW() then 0 else 1 end = #{pd.DUE_DATE_TYPE}
</if>
ORDER BY f.CREATTIME DESC
</select>