diff --git a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java index e28c101..78c1a14 100644 --- a/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java +++ b/src/main/java/com/zcloud/controller/maintenance/MaintenanceController.java @@ -60,8 +60,7 @@ public class MaintenanceController 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"); //档案状态 maintenanceService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -157,6 +156,11 @@ public class MaintenanceController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = maintenanceService.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"); + } + } map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/controller/operations/OperationsController.java b/src/main/java/com/zcloud/controller/operations/OperationsController.java index 9bef7ca..d6fd22e 100644 --- a/src/main/java/com/zcloud/controller/operations/OperationsController.java +++ b/src/main/java/com/zcloud/controller/operations/OperationsController.java @@ -60,7 +60,7 @@ public class OperationsController 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"); //档案状态 operationsService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -156,6 +156,11 @@ public class OperationsController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID page.setPd(pd); List varList = operationsService.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"); + } + } map.put("varList", varList); map.put("page", page); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java index fed1081..982a184 100644 --- a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java @@ -82,5 +82,7 @@ public interface FreightTrailerMapper { void editScrapStatus(PageData pd); PageData findByPlateNumber(PageData pd2); + + PageData vehicle(PageData pd); } diff --git a/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java b/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java index b06c52f..cdfbc61 100644 --- a/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java +++ b/src/main/java/com/zcloud/service/freighttrailer/FreightTrailerService.java @@ -82,5 +82,7 @@ public interface FreightTrailerService { void editScrapStatus(PageData pd); PageData findByPlateNumber(PageData pd2); + + PageData vehicle(PageData pd); } diff --git a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java index 55d94cf..1493bfa 100644 --- a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java +++ b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java @@ -122,5 +122,10 @@ public class FreightTrailerServiceImpl implements FreightTrailerService { public PageData findByPlateNumber(PageData pd2) { return freightTrailerMapper.findByPlateNumber(pd2); } + + @Override + public PageData vehicle(PageData pd) { + return freightTrailerMapper.vehicle(pd); + } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml index 40b299a..9890017 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml @@ -57,6 +57,7 @@ f.OPERATORNAME, f.OPERATTIME, f.AGE, + f.GENDER, f.EDUCATIONALLEVEL, f.DEPARTMENT, f.JOBTYPE, @@ -111,6 +112,7 @@ OPERATORNAME, OPERATTIME, AGE, + GENDER, EDUCATIONALLEVEL, DEPARTMENT, JOBTYPE, @@ -165,6 +167,7 @@ #{OPERATORNAME}, #{OPERATTIME}, #{AGE}, + #{GENDER}, #{EDUCATIONALLEVEL}, #{DEPARTMENT}, #{JOBTYPE}, diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml index 0039907..2d358b3 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCommitmentMapper.xml @@ -160,6 +160,7 @@ and COALESCE(c.VALIDSTATUS, '0') = #{pd.VALIDSTATUS} + ORDER BY c.OPERATTIME DESC + + + @@ -263,14 +267,16 @@ f.*, case when f.DUE_DATE < NOW() then 0 else 1 end as DUE_DATE_TYPE, v1.PLATE_NUMBER, - v1.TRAFFIC_TYPE + v1.TRAFFIC_TYPE, + o.ISSCRAP AS OPEAR_ISSCRAP, + btmf.ISSCRAP AS FREIGHT_ISSCRAP from f 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 - WHERE f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} AND (o.ISSCRAP = '0' OR btmf.ISSCRAP = '0') + WHERE f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.BASICINFO_LICENSE_PLATE LIKE CONCAT(CONCAT('%', #{pd.BASICINFO_LICENSE_PLATE}),'%')