rms12.22

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

@@ -39,14 +39,14 @@ public class RmsCarDriverController extends BaseRESTfulController {
 
     /**
      *增加司机
-     * @param rmsCarDriver
+     * @param
      * @return
      */
     @ApiOperation(value="创建", notes="根据RmsCarDriver对象创建")
     @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
     @PostMapping(value = "/insertCarDriver")
-    public RESTfulResult insertCarDriver(@RequestBody(required = false) RmsCarDriver rmsCarDriver){
-        int result = rmsCarDriverService.insertCarDriver(rmsCarDriver);
+    public RESTfulResult insertCarDriver(@RequestBody(required = false) Map<String,Object> mapValue){
+        int result = rmsCarDriverService.insertCarDriver(mapValue);
         if (result==-1){
             return failed();
         }
@@ -152,4 +152,16 @@ public class RmsCarDriverController extends BaseRESTfulController {
         return success(rmsCarDriverService.getTransportTypeId());
     }
 
+  /*
+  *边写边搜索承运商
+  * */
+  @ApiOperation(value="根据用户输入输出承运商", notes="模糊查询")
+  @ApiImplicitParams({
+          @ApiImplicitParam(name = "con",value = "用户输入的承运商名", required = false, dataType = "String")
+  })
+  @PostMapping("/getCarrierName")
+  public RESTfulResult getCarrierName(@RequestParam(value ="state") String state){
+      List<Map<String, Object>> carrierName = rmsCarDriverService.getCarrierName(state);
+      return success(carrierName);
+  }
 }

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

@@ -29,4 +29,6 @@ public interface RmsCarDriverMapper extends IBaseMapper<RmsCarDriver,BigDecimal>
     List<Map<String,Object>> getCarDriverById(BigDecimal id);
     //运输类型下拉框
     List<Map<String, Object>> getTransportTypeId();
+
+    List<Map<String, Object>> getCarrierName(String state);
 }

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

@@ -21,10 +21,12 @@ public interface IRmsCarDriverService  {
 
     int updateCarDriver(RmsCarDriver rmsCarDriver);
 
-    int insertCarDriver(RmsCarDriver rmsCarDriver);
+    int insertCarDriver(Map<String,Object> mapValue);
 
     List<Map<String,Object>> getCarDriverById(BigDecimal id);
 
 
     List<Map<String,Object>> getTransportTypeId();
+
+    List<Map<String, Object>> getCarrierName(String state);
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.mapper.RmsCarDriverMapper;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -59,7 +60,15 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
  * 增加司机
  * */
     @Override
-    public int insertCarDriver(RmsCarDriver rmsCarDriver) {
+    public int insertCarDriver(Map<String,Object> mapValue) {
+        BigDecimal carrierId=DataChange.dataToBigDecimal(mapValue.get("carrierIds"));
+        String driverName=(String)mapValue.get("driverName");
+        String driverSex=(String) mapValue.get("driverSex");
+        BigDecimal driverAge=new BigDecimal((String) mapValue.get("driverAge"));
+        String driverIdentityCardId=(String) mapValue.get("driverIdentityCard");
+        String driverPhone=(String)  mapValue.get("driverPhone");
+        BigDecimal transportTypeId=DataChange.dataToBigDecimal(mapValue.get("transportTypeId"));
+        RmsCarDriver rmsCarDriver=new RmsCarDriver();
         int i=0;
         String driverIdentityCard=rmsCarDriver.getDriverIdentityCard();
         Map<String, Object> map=new HashMap<>();
@@ -69,6 +78,13 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
         if (rmsCarDrivers.size()!=0){
             RmsCarDriver rmsCarDriver1=rmsCarDrivers.get(0);
             if (rmsCarDriver1.getDeleted().equals(new BigDecimal(1))){
+                rmsCarDriver.setDriverName(driverName);
+                rmsCarDriver.setDriverSex(driverSex);
+                rmsCarDriver.setDriverAge(driverAge);
+                rmsCarDriver.setDriverIdentityCard(driverIdentityCardId);
+                rmsCarDriver.setDriverPhone(driverPhone);
+                rmsCarDriver.setTransportTypeId(transportTypeId);
+                rmsCarDriver.setCarrierId(carrierId);
                 rmsCarDriver.setInsertUsername("admin");
                 rmsCarDriver.setInsertTime(new Date());
                 rmsCarDriver.setDeleted(new BigDecimal(0));
@@ -79,6 +95,13 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
             }
         }
         else {
+            rmsCarDriver.setDriverName(driverName);
+            rmsCarDriver.setDriverSex(driverSex);
+            rmsCarDriver.setDriverAge(driverAge);
+            rmsCarDriver.setDriverIdentityCard(driverIdentityCardId);
+            rmsCarDriver.setDriverPhone(driverPhone);
+            rmsCarDriver.setTransportTypeId(transportTypeId);
+            rmsCarDriver.setCarrierId(carrierId);
             rmsCarDriver.setInsertUsername("admin");
             rmsCarDriver.setInsertTime(new Date());
             rmsCarDriver.setDeleted(new BigDecimal(0));
@@ -106,6 +129,15 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
         return rmsCarDriverMapper.getTransportTypeId();
     }
 
+    /*
+    * 边输入边查承运商
+    * */
+    @Override
+    public List<Map<String, Object>> getCarrierName(String state) {
+        state = "%"+state+"%";
+        return rmsCarDriverMapper.getCarrierName(state);
+    }
+
 
 }