rms12.25

.gitignore

@@ -0,0 +1,8 @@
+target/
+*.iml
+.idea/
+rebel.xml
+.rebel.xml.bak
+out/artifacts/
+dil-api.iml
+src/test

.idea/workspace.xml

@@ -12,27 +12,14 @@
   <component name="ChangeListManager">
     <list default="true" id="63a9508b-a79b-4e42-90a6-b7f9eba63c9f" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsConsigneeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsConsigneeController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCarDriverMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsCarDriverMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsConsigneeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsConsigneeMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCapacityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCapacityService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCapacityController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCapacityController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsConsigneeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsConsigneeController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -72,7 +59,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$USER_HOME$/Desktop/新建文件夹 (2)/DAL-DAZHOU-CD-API" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -121,7 +108,7 @@
       <workItem from="1640172635152" duration="309000" />
       <workItem from="1640222259574" duration="36095000" />
       <workItem from="1640308588528" duration="620000" />
-      <workItem from="1640309362007" duration="9949000" />
+      <workItem from="1640309362007" duration="19821000" />
     </task>
     <servers />
   </component>
@@ -141,11 +128,11 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="535" y="56" key="#com.intellij.ide.util.MemberChooser" timestamp="1640232070241">
+    <state x="535" y="56" key="#com.intellij.ide.util.MemberChooser" timestamp="1640336576660">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser/0.0.1280.680@0.0.1280.680" timestamp="1639985896075" />
-    <state x="535" y="56" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1640232070241" />
+    <state x="535" y="56" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1640336576660" />
     <state x="544" y="279" width="448" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1640315914802">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -154,71 +141,71 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="444" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1639818003519" />
-    <state x="549" y="166" key="FileChooserDialogImpl" timestamp="1640272173598">
+    <state x="549" y="166" key="FileChooserDialogImpl" timestamp="1640328813126">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="458" y="137" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1639965013078" />
-    <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1640272173598" />
-    <state width="1493" height="136" key="GridCell.Tab.0.bottom" timestamp="1640319438696">
+    <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1640328813126" />
+    <state width="1493" height="239" key="GridCell.Tab.0.bottom" timestamp="1640374057399">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
-    <state width="1493" height="136" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1493" height="136" key="GridCell.Tab.0.center" timestamp="1640319438696">
+    <state width="1493" height="239" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640374057399" />
+    <state width="1493" height="239" key="GridCell.Tab.0.center" timestamp="1640374057398">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
-    <state width="1493" height="136" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1493" height="136" key="GridCell.Tab.0.left" timestamp="1640319438695">
+    <state width="1493" height="239" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1640374057398" />
+    <state width="1493" height="239" key="GridCell.Tab.0.left" timestamp="1640374057397">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1639989735385" />
-    <state width="1493" height="136" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438695" />
-    <state width="1493" height="136" key="GridCell.Tab.0.right" timestamp="1640319438696">
+    <state width="1493" height="239" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1640374057397" />
+    <state width="1493" height="239" key="GridCell.Tab.0.right" timestamp="1640374057399">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
-    <state width="1493" height="136" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1493" height="136" key="GridCell.Tab.1.bottom" timestamp="1640319438696">
+    <state width="1493" height="239" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1640374057399" />
+    <state width="1493" height="239" key="GridCell.Tab.1.bottom" timestamp="1640374057399">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
-    <state width="1493" height="136" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1493" height="136" key="GridCell.Tab.1.center" timestamp="1640319438696">
+    <state width="1493" height="239" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640374057399" />
+    <state width="1493" height="239" key="GridCell.Tab.1.center" timestamp="1640374057399">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
-    <state width="1493" height="136" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1493" height="136" key="GridCell.Tab.1.left" timestamp="1640319438696">
+    <state width="1493" height="239" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1640374057399" />
+    <state width="1493" height="239" key="GridCell.Tab.1.left" timestamp="1640374057399">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
-    <state width="1493" height="136" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1493" height="136" key="GridCell.Tab.1.right" timestamp="1640319438696">
+    <state width="1493" height="239" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1640374057399" />
+    <state width="1493" height="239" key="GridCell.Tab.1.right" timestamp="1640374057399">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="305" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
-    <state width="1493" height="136" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438696" />
-    <state width="1493" height="136" key="GridCell.Tab.2.bottom" timestamp="1640319438697">
+    <state width="1493" height="239" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1640374057399" />
+    <state width="1493" height="239" key="GridCell.Tab.2.bottom" timestamp="1640374057400">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="242" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
-    <state width="1493" height="136" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
-    <state width="1493" height="136" key="GridCell.Tab.2.center" timestamp="1640319438697">
+    <state width="1493" height="239" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1640374057400" />
+    <state width="1493" height="239" key="GridCell.Tab.2.center" timestamp="1640374057400">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="242" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
-    <state width="1493" height="136" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
-    <state width="1493" height="136" key="GridCell.Tab.2.left" timestamp="1640319438697">
+    <state width="1493" height="239" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1640374057400" />
+    <state width="1493" height="239" key="GridCell.Tab.2.left" timestamp="1640374057400">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="242" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
-    <state width="1493" height="136" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
-    <state width="1493" height="136" key="GridCell.Tab.2.right" timestamp="1640319438697">
+    <state width="1493" height="239" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1640374057400" />
+    <state width="1493" height="239" key="GridCell.Tab.2.right" timestamp="1640374057400">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1237" height="242" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
-    <state width="1493" height="136" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1640319438697" />
+    <state width="1493" height="239" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1640374057400" />
     <state x="225" y="0" key="SettingsEditor" timestamp="1639963719060">
       <screen x="0" y="0" width="1280" height="680" />
     </state>

src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java

@@ -174,12 +174,13 @@ public class RmsCarDriverController extends BaseRESTfulController {
   *
    */
     @PostMapping("/upload")
-    public String upLoadPhoto(@RequestParam("file") MultipartFile file)  {
-
-       IdGenerator idGenerator=new IdGenerator(1023,1023);
-       String upLoad="C:\\stworkspace\\image\\";
-       String imgPath=file.getOriginalFilename();
-        return UploadUtils.uploadFile(file,idGenerator,upLoad,imgPath);
+    public RESTfulResult upLoadPhoto(@RequestParam("file") MultipartFile file)  {
+        String str="行驶证";
+        int result=rmsCarDriverService.uploadPhoto(file,str);
+        if (result==-1){
+            return failed();
+        }
+        return success(result);
     }
 
 

src/main/java/com/steerinfo/dil/mapper/RmsCarDriverMapper.java

@@ -33,4 +33,6 @@ public interface RmsCarDriverMapper extends IBaseMapper<RmsCarDriver,BigDecimal>
     List<Map<String, Object>> getCarrierName(String state);
 
     int selectByIdentityCard(String driverIdentityCardId);
+    //查询最大的司机id
+    BigDecimal getMaxDriveId();
 }

src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.RmsCarDriver;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -29,4 +30,6 @@ public interface IRmsCarDriverService  {
     List<Map<String,Object>> getTransportTypeId();
 
     List<Map<String, Object>> getCarrierName(String state);
+
+    int uploadPhoto(MultipartFile file, String str);
 }

src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java

@@ -5,8 +5,11 @@ import com.steerinfo.dil.model.RmsCarDriver;
 import com.steerinfo.dil.model.RmsCarrier;
 import com.steerinfo.dil.service.IRmsCarDriverService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.utils.misc.IdGenerator;
+import com.steerinfo.framework.utils.upload.UploadUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -116,6 +119,50 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
         state = "%"+state+"%";
         return rmsCarDriverMapper.getCarrierName(state);
     }
+    //
+    @Override
+    public int uploadPhoto(MultipartFile file, String str) {
+        int result = 0;
+//        根据str判断当前照片类型f
+        String name = file.getName();
+        Long workId = 0L;
+        Long datacenterId = 0L;
+        byte[] fileNames=null;
+//        id自动生成器
+        IdGenerator idGenerator = new IdGenerator(workId, datacenterId);
+//        图片存储的地址
+        String uploadPath = "C:/workspaces/stworkspace/image/";
+//        图片名称默认为空
+        String imagePath = str;
+//        创建一个map用来存储四张照片的地址
+        Map<String, Object> map=new HashMap<>();
+        String FileNames = UploadUtils.uploadFile(file, idGenerator, uploadPath, imagePath);
+        System.out.println(FileNames);
+        //         判断照片是否能上传成功
+        if (FileNames!=null){
+            fileNames = UploadUtils.imageToByte(FileNames);
+            map.put(str,fileNames);
+//             将照片的二进制插入到数据库
+            RmsCarDriver rmsCarDriver=new RmsCarDriver();
+            rmsCarDriver.setDriverId(rmsCarDriverMapper.getMaxDriveId());
+            if (map.get("行驶证")!=null){
+                rmsCarDriver.setDriverPermitPhoto((byte[]) map.get("行驶证"));
+            }
+            if (map.get("驾驶证")!=null){
+                rmsCarDriver.setDriverLisencePhoto((byte[])map.get("驾驶证"));
+            }
+            if (map.get("运输证")!=null){
+                rmsCarDriver.setDriverLisencePhoto((byte[])map.get("运输证"));
+            }
+            if(map.get("从业资格证")!=null){
+                rmsCarDriver.setDriverLisencePhoto((byte[])map.get("从业资格证"));
+            }
+            result+=rmsCarDriverMapper.insertSelective(rmsCarDriver);
+        }else{
+            result=-1;
+        }
+        return result;
+    }
 
 
 }

src/main/resources/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml

@@ -1093,5 +1093,9 @@
     where RCD.DRIVER_IDENTITY_CARD=#{driverIdentityCardId}
     and RCD.DELETED!=1
   </select>
+
+  <select id="getMaxDriveId" resultType="DECIMAL">
+    select max(RCD.DRIVER_ID+1) from RMS_CAR_DRIVER RCD
+  </select>
 </mapper>
 

src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml

@@ -449,10 +449,7 @@
     RW.WAREHOUSE_ID AS "warehouseId",
     RW.WAREHOUSE_NAME AS "warehouseName",
     RS.SHIPPER_NAME AS "shipperName",
-    RS.SHIPPER_ABBREVIATION AS "shipperAbbreviation",
-    RS.SHIPPER_COMPANY_BRANCH AS "shipperCompanyBranch",
-    RS.SHIPPER_BRANCH_FACTORY AS "shipperBranchFactory",
-    RS.SHIPPER_FACTORY_AREA AS "shipperFactoryArea"
+    RS.SHIPPER_ABBREVIATION AS "shipperAbbreviation"
     FROM RMS_WAREHOUSE RW
     LEFT JOIN RMS_SHIPPER RS
     ON RW.SHIPPER_ID=RS.SHIPPER_ID
@@ -484,24 +481,6 @@
           "shipperAbbreviation" in #{item}
         </foreach>
       </if>
-      <if test="shipperCompanyBranch!= null">
-        and
-        <foreach collection="shipperCompanyBranch" item="item" open="(" separator="," close=")">
-          "shipperCompanyBranch" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperBranchFactory!= null">
-        and
-        <foreach collection="shipperBranchFactory" item="item" open="(" separator="," close=")">
-          "shipperBranchFactory" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperFactoryArea!= null">
-        and
-        <foreach collection="shipperFactoryArea" item="item" open="(" separator="," close=")">
-          "shipperFactoryArea" in #{item}
-        </foreach>
-      </if>
     </where>
     <include refid="orderBy"></include>
   </select>

target/classes/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml

@@ -1093,5 +1093,9 @@
     where RCD.DRIVER_IDENTITY_CARD=#{driverIdentityCardId}
     and RCD.DELETED!=1
   </select>
+
+  <select id="getMaxDriveId" resultType="DECIMAL">
+    select max(RCD.DRIVER_ID+1) from RMS_CAR_DRIVER RCD
+  </select>
 </mapper>
 

target/classes/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml

@@ -449,10 +449,7 @@
     RW.WAREHOUSE_ID AS "warehouseId",
     RW.WAREHOUSE_NAME AS "warehouseName",
     RS.SHIPPER_NAME AS "shipperName",
-    RS.SHIPPER_ABBREVIATION AS "shipperAbbreviation",
-    RS.SHIPPER_COMPANY_BRANCH AS "shipperCompanyBranch",
-    RS.SHIPPER_BRANCH_FACTORY AS "shipperBranchFactory",
-    RS.SHIPPER_FACTORY_AREA AS "shipperFactoryArea"
+    RS.SHIPPER_ABBREVIATION AS "shipperAbbreviation"
     FROM RMS_WAREHOUSE RW
     LEFT JOIN RMS_SHIPPER RS
     ON RW.SHIPPER_ID=RS.SHIPPER_ID
@@ -484,24 +481,6 @@
           "shipperAbbreviation" in #{item}
         </foreach>
       </if>
-      <if test="shipperCompanyBranch!= null">
-        and
-        <foreach collection="shipperCompanyBranch" item="item" open="(" separator="," close=")">
-          "shipperCompanyBranch" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperBranchFactory!= null">
-        and
-        <foreach collection="shipperBranchFactory" item="item" open="(" separator="," close=")">
-          "shipperBranchFactory" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperFactoryArea!= null">
-        and
-        <foreach collection="shipperFactoryArea" item="item" open="(" separator="," close=")">
-          "shipperFactoryArea" in #{item}
-        </foreach>
-      </if>
     </where>
     <include refid="orderBy"></include>
   </select>