Merge remote-tracking branch 'origin/dev' into dev

运营车辆
2024-03-01 10:18:37 +08:00 · 2024-03-01 10:01:48 +08:00
11 changed files with 1588 additions and 5 deletions
--- a/pom.xml
+++ b/pom.xml
@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>

 	<groupId>com.zcloud</groupId>
-	<artifactId>integrated_whb</artifactId>
+	<artifactId>integrated_traffic</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>war</packaging><!-- 以war运行是改成war -->

-	<name>integrated_whb</name>
-	<description>integrated_whb for Spring Boot</description>
+	<name>integrated_traffic</name>
+	<description>integrated_traffic for Spring Boot</description>

 	<parent>
 		<groupId>org.springframework.boot</groupId>
@ -510,7 +510,7 @@
 	</dependencies>

 	<build>
-		<!-- <finalName>integrated_whb</finalName>
+		<!-- <finalName>integrated_traffic</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
@ -537,7 +537,7 @@
 				</includes>
 			</resource>
 		</resources> -->
-		<finalName>integrated_whb</finalName>
+		<finalName>integrated_traffic</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
--- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java
+++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java
@ -0,0 +1,191 @@
+package com.zcloud.controller.operatingvehicles;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.logs.LogAnno;
+import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
+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.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/operatingvehicles")
+public class OperatingVehiclesController extends BaseController {
+
+    @Autowired
+    private OperatingVehiclesService operatingVehiclesService;
+
+    @Autowired
+    private Smb smb;
+
+    /**新增
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/add")
+    @ResponseBody
+    public Object add(
+            @RequestParam(value="headstockFile",required=false) MultipartFile headstockFile,
+            @RequestParam(value="drivinglicenseFile",required=false) MultipartFile drivinglicenseFile,
+            @RequestParam(value="operatingCertificateFile",required=false) MultipartFile operatingCertificateFile
+    ) throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd.put("OPERATING_ID", this.get32UUID());	//运营车辆主键
+        pd.put("ISDELETE", "0");	//是否删除(0:有效 1：删除)
+        pd.put("CREATOR", Jurisdiction.getUSER_ID());	//添加人id
+        pd.put("CREATORNAME", Jurisdiction.getUsername());	//添加人名字
+        pd.put("CREATTIME", DateUtil.date2Str(new Date()));	//添加时间
+        pd.put("OPERATOR", Jurisdiction.getUSER_ID());	//修改人id
+        pd.put("OPERATORNAME", Jurisdiction.getUsername()); // 修改人名字
+        pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间
+        if (null != headstockFile && !headstockFile.isEmpty()) {
+            String  ffile = DateUtil.getDays();
+            //本地
+//			String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile;	//文件上传路径
+//			String fileName = FileUpload.fileUp(file, filePath, this.get32UUID());				//执行上传
+            //服务器
+            String fileName = this.get32UUID()+headstockFile.getOriginalFilename().substring(headstockFile.getOriginalFilename().lastIndexOf("."));
+            smb.sshSftp(headstockFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
+            pd.put("HEADSTOCK_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+        }
+        if (null != drivinglicenseFile && !drivinglicenseFile.isEmpty()) {
+            String  ffile = DateUtil.getDays();
+            //本地
+//			String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile;	//文件上传路径
+//			String fileName = FileUpload.fileUp(file, filePath, this.get32UUID());				//执行上传
+            //服务器
+            String fileName = this.get32UUID()+drivinglicenseFile.getOriginalFilename().substring(drivinglicenseFile.getOriginalFilename().lastIndexOf("."));
+            smb.sshSftp(drivinglicenseFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
+            pd.put("DRIVINGLICENSE_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+        }
+        if (null != operatingCertificateFile && !operatingCertificateFile.isEmpty()) {
+            String  ffile = DateUtil.getDays();
+            //本地
+//			String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile;	//文件上传路径
+//			String fileName = FileUpload.fileUp(file, filePath, this.get32UUID());				//执行上传
+            //服务器
+            String fileName = this.get32UUID()+operatingCertificateFile.getOriginalFilename().substring(operatingCertificateFile.getOriginalFilename().lastIndexOf("."));
+            smb.sshSftp(operatingCertificateFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
+            pd.put("OPERATING_CERTIFICATE_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+        }
+        operatingVehiclesService.save(pd);
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    /**删除
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/delete")
+    @ResponseBody
+    public Object delete() throws Exception{
+        Map<String,String> map = new HashMap<String,String>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        map.put("result", errInfo);				//返回结果
+        return map;
+    }
+
+    /**修改
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/edit")
+    @ResponseBody
+    public Object edit(
+            @RequestParam(value="headstockFile",required=false) MultipartFile headstockFile,
+            @RequestParam(value="drivinglicenseFile",required=false) MultipartFile drivinglicenseFile,
+            @RequestParam(value="operatingCertificateFile",required=false) MultipartFile operatingCertificateFile
+    ) throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd.put("OPERATOR", Jurisdiction.getCORPINFO_ID());
+        pd.put("OPERATORNAME", Jurisdiction.getUsername());
+        pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
+        if (null != headstockFile && !headstockFile.isEmpty()) {
+            String  ffile = DateUtil.getDays();
+            //本地
+//			String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile;	//文件上传路径
+//			String fileName = FileUpload.fileUp(file, filePath, this.get32UUID());				//执行上传
+            //服务器
+            String fileName = this.get32UUID()+headstockFile.getOriginalFilename().substring(headstockFile.getOriginalFilename().lastIndexOf("."));
+            smb.sshSftp(headstockFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
+            pd.put("HEADSTOCK_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+        }
+        if (null != drivinglicenseFile && !drivinglicenseFile.isEmpty   ()) {
+            String  ffile = DateUtil.getDays();
+            //本地
+//			String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile;	//文件上传路径
+//			String fileName = FileUpload.fileUp(file, filePath, this.get32UUID());				//执行上传
+            //服务器
+            String fileName = this.get32UUID()+drivinglicenseFile.getOriginalFilename().substring(drivinglicenseFile.getOriginalFilename().lastIndexOf("."));
+            smb.sshSftp(drivinglicenseFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
+            pd.put("DRIVINGLICENSE_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+        }
+        if (null != operatingCertificateFile && !operatingCertificateFile.isEmpty()) {
+            String  ffile = DateUtil.getDays();
+            //本地
+//			String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile;	//文件上传路径
+//			String fileName = FileUpload.fileUp(file, filePath, this.get32UUID());				//执行上传
+            //服务器
+            String fileName = this.get32UUID()+operatingCertificateFile.getOriginalFilename().substring(operatingCertificateFile.getOriginalFilename().lastIndexOf("."));
+            smb.sshSftp(operatingCertificateFile, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
+            pd.put("OPERATING_CERTIFICATE_PHOTO", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
+        }
+        operatingVehiclesService.edit(pd);
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+    /**去修改页面获取数据
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value="/goEdit")
+    @ResponseBody
+    public Object goEdit() throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd = operatingVehiclesService.findById(pd);
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
+
+    @RequestMapping(value="/list")
+    @ResponseBody
+    public Object list(Page page) throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String KEYWORDS = pd.getString("KEYWORDS");						//关键词检索条件
+        if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
+        page.setPd(pd);
+        List<PageData> varList = operatingVehiclesService.list(page);	//列出MajorDangerSource列表
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+}
--- a/src/main/java/com/zcloud/controller/system/DictionariesController.java
+++ b/src/main/java/com/zcloud/controller/system/DictionariesController.java
@ -593,4 +593,441 @@ public class DictionariesController extends BaseController {
        map.put("result", errInfo);
        return map;
    }
+
+    @RequestMapping(value = "/getVehicleColor")
+    @ResponseBody
+    public Object getVehicleColor() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listVehicleColor(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getTransportationEnterprise")
+    @ResponseBody
+    public Object getTransportationEnterprise() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listTransportationEnterprise(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getNetworkStatus")
+    @ResponseBody
+    public Object getNetworkStatus() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listNetworkStatus(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getDynamicSupervision")
+    @ResponseBody
+    public Object getDynamicSupervision() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listDynamicSupervision(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getActiveSafety")
+    @ResponseBody
+    public Object getActiveSafety() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listActiveSafety(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getLicenseStatus")
+    @ResponseBody
+    public Object getLicenseStatus() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listLicenseStatus(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getTransportCategory")
+    @ResponseBody
+    public Object getTransportCategory() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetTransportCategory(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getBelongingDepartment")
+    @ResponseBody
+    public Object getBelongingDepartment() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetBelongingDepartment(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getFnGetFuelType")
+    @ResponseBody
+    public Object getFnGetFuelType() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetFnGetFuelType(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getEmissionStandard")
+    @ResponseBody
+    public Object getEmissionStandard() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetEmissionStandard(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getExpireStatus")
+    @ResponseBody
+    public Object getExpireStatus() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetExpireStatus(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getRemindStatus")
+    @ResponseBody
+    public Object getRemindStatus() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetRemindStatus(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getTransportEnterprises")
+    @ResponseBody
+    public Object getTransportEnterprises() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetTransportEnterprises(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getTrailerVehicle")
+    @ResponseBody
+    public Object getTrailerVehicle() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetTrailerVehicle(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getTaxesPeriod")
+    @ResponseBody
+    public Object getTaxesPeriod() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetTaxesPeriod(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getAssignedType")
+    @ResponseBody
+    public Object getAssignedType() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetAssignedType(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getAssignedWay")
+    @ResponseBody
+    public Object getAssignedWay() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetAssignedWay(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+    @RequestMapping(value = "/getAssignedVehicleModel")
+    @ResponseBody
+    public Object getAssignedVehicleModel() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetAssignedVehicleModel(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
+    @RequestMapping(value = "/getAssignedVehicle")
+    @ResponseBody
+    public Object getAssignedVehicle() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        String DICTIONARIES_ID = pd.getString("DICTIONARIES_ID");
+        DICTIONARIES_ID = Tools.isEmpty(DICTIONARIES_ID) ? "0" : DICTIONARIES_ID;
+        List<Dictionaries> varList = dictionariesService.listgetAssignedVehicle(DICTIONARIES_ID); //用传过来的ID获取此ID下的子列表数据
+        List<PageData> pdList = new ArrayList<PageData>();
+        for (Dictionaries d : varList) {
+            PageData pdf = new PageData();
+            pdf.put("DICTIONARIES_ID", d.getDICTIONARIES_ID());
+            pdf.put("BIANMA", d.getBIANMA());
+            pdf.put("NAME", d.getNAME());
+            pdList.add(pdf);
+        }
+        map.put("list", pdList);
+        map.put("result", errInfo);                //返回结果
+        return map;
+    }
+
 }
--- a/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/operatingvehicles/OperatingVehiclesMapper.java
@ -0,0 +1,36 @@
+package com.zcloud.mapper.datasource.operatingvehicles;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+public interface OperatingVehiclesMapper {
+
+    /**新增
+     * @param pd
+     * @throws Exception
+     */
+    void save(PageData pd);
+
+    /**删除
+     * @param pd
+     * @throws Exception
+     */
+    void delete(PageData pd);
+
+    /**修改
+     * @param pd
+     * @throws Exception
+     */
+    void edit(PageData pd);
+
+    /**通过id获取数据
+     * @param pd
+     * @throws Exception
+     */
+    PageData findById(PageData pd);
+
+
+    List<PageData> datalistPage(Page page);
+}
--- a/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/system/DictionariesMapper.java
@ -116,4 +116,42 @@ public interface DictionariesMapper {
 	 * @throws Exception
 	 */
 	List<PageData> getIdsByRecuByParentId(String parentId);
+
+	List<Dictionaries> listVehicleColor(String parentId);
+
+	List<Dictionaries> listTransportationEnterprise(String parentId);
+
+	List<Dictionaries> listNetworkStatus(String parentId);
+
+	List<Dictionaries> listDynamicSupervision(String parentId);
+
+	List<Dictionaries> listActiveSafety(String parentId);
+
+	List<Dictionaries> listLicenseStatus(String parentId);
+
+    List<Dictionaries> listTransportCategory(String parentId);
+
+	List<Dictionaries> listgetBelongingDepartment(String parentId);
+
+	List<Dictionaries> listgetFnGetFuelType(String parentId);
+
+	List<Dictionaries> listgetEmissionStandard(String parentId);
+
+    List<Dictionaries> listgetExpireStatus(String parentId);
+
+	List<Dictionaries> listgetRemindStatus(String parentId);
+
+	List<Dictionaries> listgetTransportEnterprises(String parentId);
+
+    List<Dictionaries> listgetTrailerVehicle(String parentId);
+
+    List<Dictionaries> listgetTaxesPeriod(String parentId);
+
+    List<Dictionaries> listgetAssignedType(String parentId);
+
+    List<Dictionaries> listgetAssignedWay(String parentId);
+
+	List<Dictionaries> listgetAssignedVehicleModel(String parentId);
+
+    List<Dictionaries> listgetAssignedVehicle(String parentId);
 }
--- a/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java
+++ b/src/main/java/com/zcloud/service/operatingvehicles/OperatingVehiclesService.java
@ -0,0 +1,35 @@
+package com.zcloud.service.operatingvehicles;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+public interface OperatingVehiclesService {
+
+    /**新增
+     * @param pd
+     * @throws Exception
+     */
+    public void save(PageData pd)throws Exception;
+
+    /**删除
+     * @param pd
+     * @throws Exception
+     */
+    public void delete(PageData pd)throws Exception;
+
+    /**修改
+     * @param pd
+     * @throws Exception
+     */
+    public void edit(PageData pd)throws Exception;
+
+    /**通过id获取数据
+     * @param pd
+     * @throws Exception
+     */
+    public PageData findById(PageData pd)throws Exception;
+
+    public List<PageData> list(Page page);
+}
--- a/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java
+++ b/src/main/java/com/zcloud/service/operatingvehicles/impl/OperatingVehiclesServiceImpl.java
@ -0,0 +1,44 @@
+package com.zcloud.service.operatingvehicles.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.operatingvehicles.OperatingVehiclesMapper;
+import com.zcloud.service.operatingvehicles.OperatingVehiclesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional //开启事物
+public class OperatingVehiclesServiceImpl implements OperatingVehiclesService {
+
+    @Autowired
+    private OperatingVehiclesMapper operatingVehiclesMapper;
+
+    @Override
+    public void save(PageData pd) throws Exception {
+        operatingVehiclesMapper.save(pd);
+    }
+
+    @Override
+    public void delete(PageData pd) throws Exception {
+        operatingVehiclesMapper.delete(pd);
+    }
+
+    @Override
+    public void edit(PageData pd) throws Exception {
+        operatingVehiclesMapper.edit(pd);
+    }
+
+    @Override
+    public PageData findById(PageData pd) throws Exception {
+        return operatingVehiclesMapper.findById(pd);
+    }
+
+    @Override
+    public List<PageData> list(Page page) {
+        return operatingVehiclesMapper.datalistPage(page);
+    }
+}
--- a/src/main/java/com/zcloud/service/system/DictionariesService.java
+++ b/src/main/java/com/zcloud/service/system/DictionariesService.java
@ -155,4 +155,48 @@ public interface DictionariesService {
 	 * @throws Exception
 	 */
 	public List<PageData> getIdsByRecuByParentId(String parentId) throws Exception;
+
+	/**
+	 * 通过ID获取其子级列表
+	 * @param parentId
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Dictionaries> listVehicleColor(String parentId) throws Exception;
+
+	public List<Dictionaries> listTransportationEnterprise(String parentId) throws Exception;
+
+	List<Dictionaries> listNetworkStatus(String parentId) throws Exception;
+
+	List<Dictionaries> listDynamicSupervision(String parentId);
+
+	List<Dictionaries> listActiveSafety(String parentId);
+
+	List<Dictionaries> listLicenseStatus(String parentId);
+
+    List<Dictionaries> listgetTransportCategory(String parentId);
+
+	List<Dictionaries> listgetBelongingDepartment(String parentId);
+
+	List<Dictionaries> listgetFnGetFuelType(String parentId);
+
+	List<Dictionaries> listgetEmissionStandard(String parentId);
+
+    List<Dictionaries> listgetExpireStatus(String parentId);
+
+	List<Dictionaries> listgetRemindStatus(String parentId);
+
+	List<Dictionaries> listgetTransportEnterprises(String parentId);
+
+    List<Dictionaries> listgetTrailerVehicle(String parentId);
+
+    List<Dictionaries> listgetTaxesPeriod(String parentId);
+
+    List<Dictionaries> listgetAssignedType(String parentId);
+
+    List<Dictionaries> listgetAssignedWay(String parentId);
+
+	List<Dictionaries> listgetAssignedVehicleModel(String parentId);
+
+    List<Dictionaries> listgetAssignedVehicle(String parentId);
 }
--- a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java
+++ b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java
@ -398,8 +398,102 @@ public class DictionariesServiceImpl implements DictionariesService {
 		}
 	}

+	public List<Dictionaries> listVehicleColor(String parentId) throws Exception{
+		return dictionariesMapper.listVehicleColor(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listTransportationEnterprise(String parentId) throws Exception {
+		return dictionariesMapper.listTransportationEnterprise(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listNetworkStatus(String parentId) throws Exception {
+		return dictionariesMapper.listNetworkStatus(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listDynamicSupervision(String parentId) {
+		return dictionariesMapper.listDynamicSupervision(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listActiveSafety(String parentId) {
+		return dictionariesMapper.listActiveSafety(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listLicenseStatus(String parentId) {
+		return dictionariesMapper.listLicenseStatus(parentId);
+	}
+
+    @Override
+    public List<Dictionaries> listgetTransportCategory(String parentId) {
+        return dictionariesMapper.listTransportCategory(parentId);
+    }
+
+	@Override
+	public List<Dictionaries> listgetBelongingDepartment(String parentId) {
+		return dictionariesMapper.listgetBelongingDepartment(parentId);
+	}
+
 	public static void main(String[] args) {
 		String s = "110101001000";
 		System.out.println(s.substring(0,9));
 	}
+
+	@Override
+	public List<Dictionaries> listgetFnGetFuelType(String parentId) {
+		return dictionariesMapper.listgetFnGetFuelType(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listgetEmissionStandard(String parentId) {
+		return dictionariesMapper.listgetEmissionStandard(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listgetExpireStatus(String parentId) {
+		return dictionariesMapper.listgetExpireStatus(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listgetRemindStatus(String parentId) {
+		return dictionariesMapper.listgetRemindStatus(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listgetTransportEnterprises(String parentId) {
+		return dictionariesMapper.listgetTransportEnterprises(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listgetTrailerVehicle(String parentId) {
+		return dictionariesMapper.listgetTrailerVehicle(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listgetTaxesPeriod(String parentId) {
+		return dictionariesMapper.listgetTaxesPeriod(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listgetAssignedType(String parentId) {
+		return dictionariesMapper.listgetAssignedType(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listgetAssignedWay(String parentId) {
+		return dictionariesMapper.listgetAssignedWay(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listgetAssignedVehicleModel(String parentId) {
+		return dictionariesMapper.listgetAssignedVehicleModel(parentId);
+	}
+
+	@Override
+	public List<Dictionaries> listgetAssignedVehicle(String parentId) {
+		return dictionariesMapper.listgetAssignedVehicle(parentId);
+	}
 }
--- a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml
+++ b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml
@ -0,0 +1,491 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.operatingvehicles.OperatingVehiclesMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		BUS_TRAFFIC_OPERATINGVEHICLE
+	</sql>
+
+	<!--数据字典表名 -->
+	<sql id="dicTableName">
+		SYS_DICTIONARIES
+	</sql>
+
+	<!-- 字段 -->
+	<sql id="Field">
+		f.OPERATING_ID,
+		f.GOODSSELFNUMBER,
+		f.PLATE_NUMBER,
+		f.VEHICLE_COLOR,
+		f.FRAMES_NUMBER,
+		f.CONTACT,
+		f.CONTACT_NUMBER,
+		f.VEHICLE_TYPE,
+		f.FIRSTSHOW_DATE,
+		f.EXPIRE_DATE,
+		f.BELONGING_DEPARTMENT,
+		f.TRANSPORT_ENTERPRISES,
+		f.TRANSPORT_TYPE,
+		f.NETWORK_STATUS,
+		f.DYNAMIC_SUPERVISION,
+		f.ACTIVE_SAFETY,
+		f.DRIVINGPREMIT_STATUS,
+		f.ENGINE_NUMBER,
+		f.OPERATING_CERTIFICATE,
+		f.VEHICLEOWNER,
+		f.VEHICLEOWNER_NUMBER,
+		f.VEHICLEOWNER_ADDRESS,
+		f.HOME_ADDRESS,
+		f.PHYSICAL_ADDRESS,
+		f.CERTIFICATE_DATE,
+		f.GOVERNMENT_OVERSIGHT,
+		f.VEHICLE_BRAND,
+		f.VEHICLE_MODEL,
+		f.FUEL_TYPE,
+		f.EMISSION_STANDARD,
+		f.VOUCH_TOTALMASS,
+		f.VOUCH_NUMBERLOAD,
+		f.VOUCH_PAYLOAD,
+		f.RACTIONMASS_QUALITY,
+		f.REMARK,
+		f.HEADSTOCK_PHOTO,
+		f.DRIVINGLICENSE_PHOTO,
+		f.OPERATING_CERTIFICATE_PHOTO,
+		f.VEHICLE_MATERIAL,
+		f.FREIGHT_TYPE,
+		f.TRANSPORT_CATEGORY,
+		f.ISDELETE,
+		f.CREATOR,
+		f.CREATORNAME,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATORNAME,
+		f.OPERATTIME,
+		f.DELETOR,
+		f.DELETORNAME,
+		f.DELETTIME
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		OPERATING_ID,
+		GOODSSELFNUMBER,
+		PLATE_NUMBER,
+		VEHICLE_COLOR,
+		FRAMES_NUMBER,
+		CONTACT,
+		CONTACT_NUMBER,
+		VEHICLE_TYPE,
+		FIRSTSHOW_DATE,
+		EXPIRE_DATE,
+		BELONGING_DEPARTMENT,
+		TRANSPORT_ENTERPRISES,
+		TRANSPORT_TYPE,
+		NETWORK_STATUS,
+		DYNAMIC_SUPERVISION,
+		ACTIVE_SAFETY,
+		DRIVINGPREMIT_STATUS,
+		ENGINE_NUMBER,
+		OPERATING_CERTIFICATE,
+		VEHICLEOWNER,
+		VEHICLEOWNER_NUMBER,
+		VEHICLEOWNER_ADDRESS,
+		HOME_ADDRESS,
+		PHYSICAL_ADDRESS,
+		CERTIFICATE_DATE,
+		GOVERNMENT_OVERSIGHT,
+		VEHICLE_BRAND,
+		VEHICLE_MODEL,
+		FUEL_TYPE,
+		EMISSION_STANDARD,
+		VOUCH_TOTALMASS,
+		VOUCH_NUMBERLOAD,
+		VOUCH_PAYLOAD,
+		RACTIONMASS_QUALITY,
+		REMARK,
+		HEADSTOCK_PHOTO,
+		DRIVINGLICENSE_PHOTO,
+		OPERATING_CERTIFICATE_PHOTO,
+		VEHICLE_MATERIAL,
+		FREIGHT_TYPE,
+		TRANSPORT_CATEGORY,
+		ISDELETE,
+		CREATOR,
+		CREATORNAME,
+		CREATTIME,
+		OPERATOR,
+		OPERATORNAME,
+		OPERATTIME,
+		DELETOR,
+		DELETORNAME,
+		DELETTIME
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{OPERATING_ID},
+		#{GOODSSELFNUMBER},
+		#{PLATE_NUMBER},
+		#{VEHICLE_COLOR},
+		#{FRAMES_NUMBER},
+		#{CONTACT},
+		#{CONTACT_NUMBER},
+		#{VEHICLE_TYPE},
+		#{FIRSTSHOW_DATE},
+		#{EXPIRE_DATE},
+		#{BELONGING_DEPARTMENT},
+		#{TRANSPORT_ENTERPRISES},
+		#{TRANSPORT_TYPE},
+		#{NETWORK_STATUS},
+		#{DYNAMIC_SUPERVISION},
+		#{ACTIVE_SAFETY},
+		#{DRIVINGPREMIT_STATUS},
+		#{ENGINE_NUMBER},
+		#{OPERATING_CERTIFICATE},
+		#{VEHICLEOWNER},
+		#{VEHICLEOWNER_NUMBER},
+		#{VEHICLEOWNER_ADDRESS},
+		#{HOME_ADDRESS},
+		#{PHYSICAL_ADDRESS},
+		#{CERTIFICATE_DATE},
+		#{GOVERNMENT_OVERSIGHT},
+		#{VEHICLE_BRAND},
+		#{VEHICLE_MODEL},
+		#{FUEL_TYPE},
+		#{EMISSION_STANDARD},
+		#{VOUCH_TOTALMASS},
+		#{VOUCH_NUMBERLOAD},
+		#{VOUCH_PAYLOAD},
+		#{RACTIONMASS_QUALITY},
+		#{REMARK},
+		#{HEADSTOCK_PHOTO},
+		#{DRIVINGLICENSE_PHOTO},
+		#{OPERATING_CERTIFICATE_PHOTO},
+		#{VEHICLE_MATERIAL},
+		#{FREIGHT_TYPE},
+		#{TRANSPORT_CATEGORY},
+		#{ISDELETE},
+		#{CREATOR},
+		#{CREATORNAME},
+		#{CREATTIME},
+		#{OPERATOR},
+		#{OPERATORNAME},
+		#{OPERATTIME},
+		#{DELETOR},
+		#{DELETORNAME},
+		#{DELETTIME}
+	</sql>
+
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+	<include refid="tableName"></include>
+		(
+	<include refid="Field2"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+			OPERATING_ID = #{OPERATING_ID}
+	</delete>
+
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		OPERATING_ID = #{OPERATING_ID},
+		GOODSSELFNUMBER = #{GOODSSELFNUMBER},
+		PLATE_NUMBER = #{PLATE_NUMBER},
+		VEHICLE_COLOR = #{VEHICLE_COLOR},
+		FRAMES_NUMBER = #{FRAMES_NUMBER},
+		CONTACT = #{CONTACT},
+		CONTACT_NUMBER = #{CONTACT_NUMBER},
+		VEHICLE_TYPE = #{VEHICLE_TYPE},
+		FIRSTSHOW_DATE = #{FIRSTSHOW_DATE},
+		EXPIRE_DATE = #{EXPIRE_DATE},
+		BELONGING_DEPARTMENT = #{BELONGING_DEPARTMENT},
+		TRANSPORT_ENTERPRISES = #{TRANSPORT_ENTERPRISES},
+		TRANSPORT_TYPE = #{TRANSPORT_TYPE},
+		NETWORK_STATUS = #{NETWORK_STATUS},
+		DYNAMIC_SUPERVISION = #{DYNAMIC_SUPERVISION},
+		ACTIVE_SAFETY = #{ACTIVE_SAFETY},
+		DRIVINGPREMIT_STATUS = #{DRIVINGPREMIT_STATUS},
+		ENGINE_NUMBER = #{ENGINE_NUMBER},
+		OPERATING_CERTIFICATE = #{OPERATING_CERTIFICATE},
+		VEHICLEOWNER = #{VEHICLEOWNER},
+		VEHICLEOWNER_NUMBER = #{VEHICLEOWNER_NUMBER},
+		VEHICLEOWNER_ADDRESS = #{VEHICLEOWNER_ADDRESS},
+		HOME_ADDRESS = #{HOME_ADDRESS},
+		PHYSICAL_ADDRESS = #{PHYSICAL_ADDRESS},
+		CERTIFICATE_DATE = #{CERTIFICATE_DATE},
+		GOVERNMENT_OVERSIGHT = #{GOVERNMENT_OVERSIGHT},
+		VEHICLE_BRAND = #{VEHICLE_BRAND},
+		VEHICLE_MODEL = #{VEHICLE_MODEL},
+		FUEL_TYPE = #{FUEL_TYPE},
+		EMISSION_STANDARD = #{EMISSION_STANDARD},
+		VOUCH_TOTALMASS = #{VOUCH_TOTALMASS},
+		VOUCH_NUMBERLOAD = #{VOUCH_NUMBERLOAD},
+		VOUCH_PAYLOAD = #{VOUCH_PAYLOAD},
+		RACTIONMASS_QUALITY = #{RACTIONMASS_QUALITY},
+		REMARK = #{REMARK},
+		HEADSTOCK_PHOTO = #{HEADSTOCK_PHOTO},
+		DRIVINGLICENSE_PHOTO = #{DRIVINGLICENSE_PHOTO},
+		OPERATING_CERTIFICATE_PHOTO = #{OPERATING_CERTIFICATE_PHOTO},
+		VEHICLE_MATERIAL = #{VEHICLE_MATERIAL},
+		FREIGHT_TYPE = #{FREIGHT_TYPE},
+		TRANSPORT_CATEGORY = #{TRANSPORT_CATEGORY},
+		ISDELETE = #{ISDELETE},
+		CREATOR = #{CREATOR},
+		CREATORNAME = #{CREATORNAME},
+		CREATTIME = #{CREATTIME},
+		OPERATOR = #{OPERATOR},
+		OPERATORNAME = #{OPERATORNAME},
+		OPERATTIME = #{OPERATTIME},
+		DELETOR = #{DELETOR},
+		DELETORNAME = #{DELETORNAME},
+		DELETTIME = #{DELETTIME}
+		where
+			OPERATING_ID = #{OPERATING_ID}
+	</update>
+
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+		f.OPERATING_ID = #{OPERATING_ID}
+	</select>
+
+	<!-- 列表 -->
+	<!--<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		left join sys_user u on u.USER_ID = f.USER_ID
+		left join oa_department d on d.DEPARTMENT_ID = u.DEPARTMENT_ID
+		left join sys_post p on p.POST_ID = u.POST_ID
+		left join sys_user ru on ru.USER_ID = f.REVIEW_USER_ID
+		left join oa_department rd on rd.DEPARTMENT_ID = ru.DEPARTMENT_ID
+		where (f.ISDELETE = '0' or (f.ISDELETE = '1' and f.REVIEW_STATUS = '-1'))
+		and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">&lt;!&ndash; 关键词检索 &ndash;&gt;
+			and
+				(
+					u.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+				)
+		</if>
+		<if test="pd.REVIEW_STATUS != null and pd.REVIEW_STATUS != ''">&lt;!&ndash; 关键词检索 &ndash;&gt;
+			<choose>
+				<when test="pd.REVIEW_STATUS == 0">
+					and f.REVIEW_STATUS = '0'
+				</when>
+				<when test="pd.REVIEW_STATUS == 1">
+					and f.REVIEW_STATUS = '1'
+				</when>
+				<when test="pd.REVIEW_STATUS == 2">
+					and f.REVIEW_STATUS = '2'
+				</when>
+				<when test="pd.REVIEW_STATUS == -1">
+					and f.ISDELETE = '0' and f.REVIEW_STATUS = '-1'
+				</when>
+				<when test="pd.REVIEW_STATUS == 3">
+					and f.CREATOR = f.OPERATOR and f.ISDELETE = '1' and f.REVIEW_STATUS = '-1'
+				</when>
+				<when test="pd.REVIEW_STATUS == 4">
+					and f.CREATOR != f.OPERATOR and f.ISDELETE = '1' and f.REVIEW_STATUS = '-1'
+				</when>
+			</choose>
+		</if>
+		<if test="pd.REVIEW_USER_NAME != null and pd.REVIEW_USER_NAME != ''">&lt;!&ndash; 关键词检索 &ndash;&gt;
+			and ru.NAME LIKE CONCAT(CONCAT('%', #{pd.REVIEW_USER_NAME}),'%')
+		</if>
+		<if test="pd.DEPT_DOWN_ARR != null and pd.DEPT_DOWN_ARR.size() > 0">
+			AND d.DEPARTMENT_ID IN
+			<foreach item="item" collection="pd.DEPT_DOWN_ARR" open="(" separator="," close=")">
+				'${item}'
+			</foreach>
+		</if>
+&lt;!&ndash; 		<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">关键词检索
+			and d.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+		</if>
+		 &ndash;&gt;
+
+		<choose>
+			<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
+				<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+	                and
+					d.DEPARTMENT_ID in
+					<foreach item="item" index="index"
+						collection="pd.DEPT_IDS" open="(" separator="," close=")">
+						'${item}'
+					</foreach>
+	            </if>
+			</when>
+			<otherwise>
+				<choose>
+		            <when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
+						<choose>
+							<when test='pd.ISLEADER != null and pd.ISLEADER != "" and pd.ISLEADER == "1"'>
+								<choose>
+									<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+										and
+										d.DEPARTMENT_ID in
+										<foreach item="item" index="index"
+												 collection="pd.DEPT_IDS" open="(" separator="," close=")">
+											'${item}'
+										</foreach>
+									</when>
+									<otherwise>
+										and
+										((d.DEPARTMENT_ID in (
+										select
+										SUB_DEPARTMENT_ID
+										from
+										oa_supervision_department osd
+										where
+										osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+										and osd.ISDELETE = '0'
+										and osd.CORPINFO_ID  = #{pd.CORPINFO_ID}
+										)) or (
+										d.DEPARTMENT_ID in
+										<foreach item="item" index="index"
+												 collection="pd.DEPARTMENT_IDS" open="(" separator="," close=")">
+											'${item}'
+										</foreach>
+										))
+									</otherwise>
+								</choose>
+							</when>
+							<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+								or f.REVIEW_USER_ID = #{pd.USER_ID}
+								and
+								d.DEPARTMENT_ID in
+								<foreach item="item" index="index"
+										 collection="pd.DEPT_IDS" open="(" separator="," close=")">
+									'${item}'
+								</foreach>
+							</when>
+							<otherwise>
+
+								and
+								d.DEPARTMENT_ID in (
+								select
+								SUB_DEPARTMENT_ID
+								from
+								oa_supervision_department osd
+								where
+								osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+								and osd.ISDELETE = '0'
+								and osd.CORPINFO_ID  = #{pd.CORPINFO_ID})
+								or f.REVIEW_USER_ID = #{pd.USER_ID}
+							</otherwise>
+						</choose>
+					</when>
+					<when test='pd.ISLEADER != null and pd.ISLEADER != "" and pd.ISLEADER == "1"'>
+						<choose>
+							<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+								and
+								d.DEPARTMENT_ID in
+								<foreach item="item" index="index"
+										 collection="pd.DEPT_IDS" open="(" separator="," close=")">
+									'${item}'
+								</foreach>
+							</when>
+							<otherwise>
+								and
+								d.DEPARTMENT_ID in
+								<foreach item="item" index="index"
+										 collection="pd.DEPARTMENT_IDS" open="(" separator="," close=")">
+									'${item}'
+								</foreach>
+							</otherwise>
+						</choose>
+					</when>
+		            <when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
+		                and d.DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
+		                and f.REVIEW_USER_ID = #{pd.USER_ID}
+		            </when>
+		            <otherwise>
+		            </otherwise>
+		        </choose>
+			</otherwise>
+		</choose>
+		<choose>
+			<when test="pd.STARTTIME != null and pd.STARTTIME != '' and pd.ENDTIME != null and pd.ENDTIME != ''">
+				and DATE_FORMAT(#{pd.STARTTIME},'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(f.STARTTIME,'%Y-%m-%d %H:%i:%s')
+				and DATE_FORMAT(#{pd.ENDTIME},'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(f.ENDTIME,'%Y-%m-%d %H:%i:%s')
+			</when>
+			<otherwise>
+				<if test="pd.STARTTIME != null and pd.STARTTIME != ''">
+					and DATE_FORMAT(#{pd.STARTTIME},'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(f.ENDTIME,'%Y-%m-%d %H:%i:%s')
+				</if>
+				<if test="pd.ENDTIME != null and pd.ENDTIME != ''">
+					and DATE_FORMAT(#{pd.ENDTIME},'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(f.STARTTIME,'%Y-%m-%d %H:%i:%s')
+				</if>
+			</otherwise>
+		</choose>
+		order by f.OPERATTIME desc
+	</select>-->
+
+	<!-- 列表(全部) -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
+		<if test="pd.PLATE_NUMBER != null and pd.PLATE_NUMBER != ''"><!-- 关键词检索 -->
+			and f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%')
+		</if>
+		<if test="pd.VEHICLE_COLOR != null and pd.VEHICLE_COLOR != ''"><!-- 关键词检索 -->
+			and f.VEHICLE_COLOR = #{pd.VEHICLE_COLOR}
+		</if>
+		<if test="pd.FRAMES_NUMBER != null and pd.FRAMES_NUMBER != ''"><!-- 关键词检索 -->
+			and f.FRAMES_NUMBER LIKE CONCAT(CONCAT('%', #{pd.FRAMES_NUMBER}),'%')
+		</if>
+		<if test="pd.GOODSSELFNUMBER != null and pd.GOODSSELFNUMBER != ''"><!-- 关键词检索 -->
+			and f.GOODSSELFNUMBER LIKE CONCAT(CONCAT('%', #{pd.GOODSSELFNUMBER}),'%')
+		</if>
+		<if test="pd.BELONGING_DEPARTMENT != null and pd.BELONGING_DEPARTMENT != ''"><!-- 关键词检索 -->
+			and f.BELONGING_DEPARTMENT LIKE CONCAT(CONCAT('%', #{pd.BELONGING_DEPARTMENT}),'%')
+		</if>
+		<if test="pd.TRANSPORT_ENTERPRISES != null and pd.TRANSPORT_ENTERPRISES != ''"><!-- 关键词检索 -->
+			and f.TRANSPORT_ENTERPRISES = #{pd.TRANSPORT_ENTERPRISES}
+		</if>
+		<if test="pd.NETWORK_STATUS != null and pd.NETWORK_STATUS != ''"><!-- 关键词检索 -->
+			and f.NETWORK_STATUS = #{pd.NETWORK_STATUS}
+		</if>
+		<if test="pd.DYNAMIC_SUPERVISION != null and pd.DYNAMIC_SUPERVISION != ''"><!-- 关键词检索 -->
+			and f.DYNAMIC_SUPERVISION = #{pd.DYNAMIC_SUPERVISION}
+		</if>
+		<if test="pd.ACTIVE_SAFETY != null and pd.ACTIVE_SAFETY != ''"><!-- 关键词检索 -->
+			and f.ACTIVE_SAFETY = #{pd.ACTIVE_SAFETY}
+		</if>
+		<if test="pd.DRIVINGPREMIT_STATUS != null and pd.DRIVINGPREMIT_STATUS != ''"><!-- 关键词检索 -->
+			and f.DRIVINGPREMIT_STATUS = #{pd.DRIVINGPREMIT_STATUS}
+		</if>
+	</select>
+
+	<select id="listAll" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
+	</select>
+
+
+</mapper>
--- a/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/DictionariesMapper.xml
@ -265,4 +265,177 @@
 			ISDELETE = 0 and
 			PARENT_ID = #{PARENT_ID}
 	</select>
+
+	<select id="listVehicleColor" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetTaxesPeriod" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listTransportationEnterprise" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listDynamicSupervision" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listNetworkStatus" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listActiveSafety" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listLicenseStatus" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listTransportCategory" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetBelongingDepartment" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetFnGetFuelType" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetEmissionStandard" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetExpireStatus" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetRemindStatus" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetTransportEnterprises" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetTrailerVehicle" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetAssignedType" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetAssignedWay" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetAssignedVehicleModel" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+	<select id="listgetAssignedVehicle" parameterType="String" resultMap="dictResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include>
+		where
+		PARENT_ID = #{parentId} order by ORDER_BY
+	</select>
+
+
 </mapper>
Author	SHA1	Message	Date
xiepeng	983e857ba9	Merge remote-tracking branch 'origin/dev' into dev	2024-03-01 10:18:37 +08:00
xiepeng	93e9e8a30b	运营车辆	2024-03-01 10:01:48 +08:00