Merge remote-tracking branch 'origin/master'

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempDTO.java

@@ -25,7 +25,16 @@ public class AppUserPositionTempDTO {
     private String name;
 
 
-    @ApiModelProperty(value = "职位id")
+    @ApiModelProperty(value = "身份id")
     private Integer positionId;
 
+    @ApiModelProperty(value = "员工职位id")
+    private Integer jobId;
+
+    @ApiModelProperty(value = "分公司id")
+    private Integer companyId;
+
+    @ApiModelProperty(value = "分公司")
+    private String companyName;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempFindDTO.java

@@ -14,4 +14,5 @@ public class AppUserPositionTempFindDTO extends PageParam {
      private String phone;
      private String name;
      private Integer status;
+     private Integer companyId;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserJobLevel.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+
+/**
+ * 用户职位表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+@Data
+@Table(name = "app_user_job_level")
+public class AppUserJobLevel implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键id
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+	    /**
+     *  角色名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "角色名称")
+    private String name;
+	
+	    /**
+     *  等级
+     */
+    @Column(name = "level")
+	@ApiModelProperty(value = "等级")
+    private Integer level;
+	
+
+    /**
+     *  状态：0-正常；1-禁用
+     */
+    @Column(name = "status")
+	@ApiModelProperty(value = "状态：0-正常；1-禁用")
+    private Integer status;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  是否删除：0-正常；1-删除
+     */
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除：0-正常；1-删除")
+    private Integer isDel;
+	
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionTemp.java

@@ -43,6 +43,19 @@ public class AppUserPositionTemp implements Serializable {
 	@ApiModelProperty(value = "职位id")
     private Integer positionId;
 
+    @Column(name = "job_id")
+    @ApiModelProperty(value = "员工职位id")
+    private Integer jobId;
+
+
+    @Column(name = "company_id")
+    @ApiModelProperty(value = "分公司id")
+    private Integer companyId;
+
+    @Column(name = "company_name")
+    @ApiModelProperty(value = "分公司名称")
+    private String companyName;
+
 	@Column(name = "name")
 	@ApiModelProperty(value = "姓名")
 	private String name;
@@ -51,6 +64,11 @@ public class AppUserPositionTemp implements Serializable {
     @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
     private Long crtTime;
+
+
+    @Column(name = "upd_time")
+    @ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
 	
 
     @Column(name = "is_del")

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserPositionTempVo.java

@@ -37,4 +37,18 @@ public class AppUserPositionTempVo {
 
     @ApiModelProperty(value = "创建时间", hidden = true )
     private Long crtTime;
+
+    @ApiModelProperty(value = "员工职位id")
+    private Integer jobId;
+
+    @ApiModelProperty(value = "员工职位名称")
+    private String jobName;
+
+
+    @ApiModelProperty(value = "分公司id")
+    private Integer companyId;
+
+
+    @ApiModelProperty(value = "分公司名称")
+    private String companyName;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserJobLevelBiz.java

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserJobLevel;
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
+import com.github.wxiaoqi.security.admin.mapper.AppUserJobLevelMapper;
+import com.github.wxiaoqi.security.admin.mapper.AppUserPositionMapper;
+import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 用户身份职位表
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+@Transactional
+@Service
+public class AppUserJobLevelBiz extends BaseBiz<AppUserJobLevelMapper, AppUserJobLevel> {
+
+
+    public Map<Integer, AppUserJobLevel> findJobIdAndJobMapByIds(List<Integer> jobIds) {
+        Map<Integer,AppUserJobLevel> postionMap = new HashMap<>();
+        List<AppUserJobLevel> data= mapper.selectByIdList(jobIds);
+        if(CollectionUtils.isEmpty(data)){
+            return postionMap;
+        }
+        postionMap = data.stream().collect(Collectors.toMap(AppUserJobLevel::getId, Function.identity()));
+        return postionMap;
+    }
+
+    public Map<Integer, String> findJobIdAndNameMap() {
+        List<AppUserJobLevel> postions = selectListAll();
+        return postions.stream().collect(Collectors.toMap(AppUserJobLevel::getId,AppUserJobLevel::getName));
+    }
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionBiz.java

@@ -3,15 +3,12 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
 import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
 import org.apache.commons.collections.CollectionUtils;
-import org.jsoup.select.Collector;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-
 import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import com.github.wxiaoqi.security.admin.mapper.AppUserPositionMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserJobLevel;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
@@ -13,6 +14,8 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -51,12 +54,28 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
 
     private Map<Integer, String> postionIdAndNameMap;
 
+    @Autowired
+    private VehicleFeign vehicleFeign;
+
+    @Autowired
+    AppUserJobLevelBiz jobLevelBiz;
+
 
     public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO) {
         if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
                 || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0) {
             return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
         }
+        Integer companyId=appUserPositionTempDTO.getCompanyId();
+        String companyName=appUserPositionTempDTO.getCompanyName();
+       if (!(companyId!=null&&companyId>0&&StringUtils.isNotBlank(companyName)))
+           return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        BranchCompany branchCompany=vehicleFeign.companyId(companyName);
+        if (branchCompany==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        }
+        companyId=branchCompany.getId();
+        companyName=branchCompany.getName();
         String phone = appUserPositionTempDTO.getPhone();
         Integer id = appUserPositionTempDTO.getId() == null ? 0 : appUserPositionTempDTO.getId();
         Example example = new Example(AppUserPositionTemp.class);
@@ -73,6 +92,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();
         BeanUtils.copyProperties(appUserPositionTempDTO, userPositionTemp);
         userPositionTemp.setUserId(userId);
+        userPositionTemp.setCompanyId(companyId);
+        userPositionTemp.setCompanyName(companyName);
         //编辑
         if (id == null || id == 0) {
             insertSelective(userPositionTemp);
@@ -103,14 +124,18 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getPhone())) {
             criteria.andEqualTo("phone", appUserPositionTempFindDTO.getPhone());
         }
+        if (Objects.nonNull(appUserPositionTempFindDTO.getCompanyId())) {
+            criteria.andEqualTo("companyId", appUserPositionTempFindDTO.getCompanyId());
+        }
         if(Objects.nonNull(appUserPositionTempFindDTO.getStatus())) {
             if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) {
-                criteria.andIsNotNull("userId");
+                criteria.andNotEqualTo("userId",0);
             }
             if (DataStatus.NO_USERED.code == appUserPositionTempFindDTO.getStatus()) {
-                criteria.andIsNull("userId");
+                criteria.andEqualTo("userId",0);
             }
         }
+        example.setOrderByClause("upd_time desc");
         PageDataVO<AppUserPositionTemp> pageDataVO = PageDataVO.pageInfo(appUserPositionTempFindDTO.getPage(), appUserPositionTempFindDTO.getLimit(), () -> mapper.selectByExample(example));
         List<AppUserPositionTemp> data = pageDataVO.getData();
         if (CollectionUtils.isEmpty(data)) {
@@ -122,14 +147,17 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
 
         List<Integer> postionIds = data.stream().map(AppUserPositionTemp::getPositionId).collect(Collectors.toList());
         Map<Integer, AppUserPosition> postionMap = appUserPositionBiz.findPostionIdAndPostionMapByIds(postionIds);
-
+        List<Integer> jobIds = data.stream().map(AppUserPositionTemp::getJobId).collect(Collectors.toList());
+        Map<Integer, AppUserJobLevel> jobMap = jobLevelBiz.findJobIdAndJobMapByIds(jobIds);
         List<AppUserPositionTempVo> appUserPositionTempVos = new ArrayList<>();
         AppUserPositionTempVo appUserPositionTempVo;
         for (AppUserPositionTemp appUserPositionTemp : data) {
             appUserPositionTempVo = new AppUserPositionTempVo();
             BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempVo);
             String postionName = postionMap == null ? "" : postionMap.get(appUserPositionTemp.getPositionId())==null?"":postionMap.get(appUserPositionTemp.getPositionId()).getName();
+            String jobName = jobMap == null ? "" : jobMap.get(appUserPositionTemp.getJobId())==null?"":jobMap.get(appUserPositionTemp.getJobId()).getName();
             appUserPositionTempVo.setPositionName(postionName);
+            appUserPositionTempVo.setJobName(jobName);
             appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : appUserPositionTemp.getUserId()==0?DataStatus.NO_USERED.code:DataStatus.USERED.code);
             appUserPositionTempVos.add(appUserPositionTempVo);
         }
@@ -165,26 +193,67 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 if (StringUtils.isEmpty(postionName)){
                     throw new BaseException("身份为空");
                 }
-                //根据手机号查询userId
-                AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
+                if (StringUtils.isNotBlank(name)){
+                    name.replaceAll(" ","");
+                }
+                Example example = new Example(AppUserPositionTemp.class);
+                example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0);
+                List<AppUserPositionTemp> list = selectByExample(example);
+                Integer id=0;
+                Integer userId=0;
+                if (list.size()>0){
+                    AppUserPositionTemp appUserPositionTemp1= list.get(0);
+                    id=appUserPositionTemp1.getId();
+                    userId=appUserPositionTemp1.getUserId();
+                }
+                if (userId==null||userId==0){
+                    //根据手机号查询userId
+                    AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
+                    if (Objects.nonNull(userLogin)) {
+                        userId=userLogin.getId();
+                    }
+                }
                 for (Map.Entry<Integer, String> integerStringEntry : entrySet) {
                     if (integerStringEntry.getValue().contains(postionName)) {
                         postionId = integerStringEntry.getKey();
                         break;
                     }
                 }
+                String companyName=data[3];
+                Integer companyId=0;
+                if (StringUtils.isNotBlank(companyName)){
+                    BranchCompany branchCompany=vehicleFeign.companyId(companyName);
+                    if (branchCompany!=null){
+                        companyId=branchCompany.getId();
+                        companyName=branchCompany.getName();
+                    }else {
+                        companyName=null;
+                    }
+                }
+                String jobName=data[4];
+                Integer jobId=2;
+                if (StringUtils.isNotBlank(jobName)&&jobName.contains("销售")){
+                    jobId=1;
+                }
                 appUserPositionTemp = new AppUserPositionTemp();
-                appUserPositionTemp.setCrtTime(Instant.now().toEpochMilli());
                 appUserPositionTemp.setName(name);
                 appUserPositionTemp.setPositionId(postionId);
                 appUserPositionTemp.setPhone(phone);
-                appUserPositionTemp.setUserId(0);
-                if (Objects.nonNull(userLogin)) {
+                appUserPositionTemp.setCompanyId(companyId);
+                appUserPositionTemp.setCompanyName(companyName);
+                appUserPositionTemp.setJobId(jobId);
+                if (userId!=null&&userId>0) {
                     //更新用户身份信息
-                    detailBiz.updateUserPositionByUserId(userLogin.getId(), postionId);
-                    appUserPositionTemp.setUserId(userLogin.getId());
+                    detailBiz.updateUserPositionByUserId(userId, postionId);
+                    appUserPositionTemp.setUserId(userId);
+                }
+                if (id!=null&&id>0){
+                    appUserPositionTemp.setId(id);
+                    updateSelectiveById(appUserPositionTemp);
+                }else {
+                    insertSelective(appUserPositionTemp);
                 }
-                mapper.insertWithIgnoreRepeat(appUserPositionTemp);
+
             } catch (BaseException ex) {
                 errorResultMap = new HashMap<>(1);
                 errorResultMap.put("num", i);
@@ -229,4 +298,5 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         postionIdAndNameMap = appUserPositionBiz.findPostionIdAndNameMap() == null ? Collections.EMPTY_MAP : appUserPositionBiz.findPostionIdAndNameMap();
     }
 
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserJobLevelMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.entity.AppUserJobLevel;
+import tk.mybatis.mapper.additional.idlist.IdListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 用户身份职位表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+public interface AppUserJobLevelMapper extends Mapper<AppUserJobLevel>, IdListMapper<AppUserJobLevel,Integer> {
+
+
+
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

 package com.github.wxiaoqi.security.admin.rest.admin;
 
+import com.github.wxiaoqi.security.admin.biz.AppUserJobLevelBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserPositionBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserPositionTempBiz;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
@@ -30,9 +31,17 @@ public class AppUserPositionController {
     @Autowired
     private AppUserPositionBiz appUserPositionBiz;
 
+    @Autowired
+    private AppUserJobLevelBiz jobLevelBiz;
+
     @Autowired
     private AppUserPositionTempBiz appUserPositionTempBiz;
 
+    @GetMapping("/jobs")
+    public ObjectRestResponse  findAllJobs() {
+        return ObjectRestResponse.succ(jobLevelBiz.selectListAll());
+    }
+
     @GetMapping("/postions")
     public ObjectRestResponse<List<WalletPostionVo>> findAllPostions() {
         List<WalletPostionVo> walletPostionVos = appUserPositionBiz.findAllPostions();
@@ -50,10 +59,19 @@ public class AppUserPositionController {
      * 新增或编辑身份信息
      * @return
      */
-    @PostMapping("/add")
+    @PostMapping("/addUserPostion")
     public ObjectRestResponse<Void> addUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO){
-         appUserPositionTempBiz.add(appUserPositionTempDTO);
-        return ObjectRestResponse.succ();
+        return appUserPositionTempBiz.add(appUserPositionTempDTO);
+    }
+
+    /**
+     * 新增或编辑身份信息
+     * @return
+     */
+    @PostMapping("/updUserPostion")
+    public ObjectRestResponse<Void> updUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO){
+
+        return appUserPositionTempBiz.add(appUserPositionTempDTO);
     }
 
     /**

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -134,6 +134,7 @@ public class VehicleModel implements Serializable {
 	private Integer hotSign;
 
 	@ApiModelProperty(value = "是否删除")
+	@Column(name = "isdel")
 	private  Integer isdel;
 	@Column(name = "rent_discount_status")
 	@ApiModelProperty(value = "租车优惠状态 0--没有优惠;1--会员折扣;2--固定值")

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -30,7 +30,7 @@ public interface VehicleFeign {
     public ObjectRestResponse<Vehicle> get(@PathVariable(value = "id") String id);
 
     @RequestMapping(value = "/vehicleInfo/findById", method = RequestMethod.GET)
-    public RestResponse<Vehicle> findById(@RequestParam(value = "id")String id);
+    public RestResponse<Vehicle> findById(@RequestParam(value = "id") String id);
 
     @RequestMapping(value = "/vehicleInfo/getByIds", method = RequestMethod.GET)
     public RestResponse< List<Vehicle>> getByIds(@RequestParam(value = "ids") List<String> id);
@@ -44,11 +44,11 @@ public interface VehicleFeign {
     public RestResponse arrivalBySmall(@RequestBody VehicleArrivalVo arrivalVo);
 
     @GetMapping(value = "/vehicleModel/app/unauth/findRandomVehicle")
-    public ObjectRestResponse findRandomVehicle(@RequestParam(value="number")Integer number);
+    public ObjectRestResponse findRandomVehicle(@RequestParam(value = "number") Integer number);
 
     //修改评分
     @RequestMapping(value = "/vehicleModel/app/addScore", method = RequestMethod.GET)
-    public RestResponse addScore(@RequestParam(value="id")Integer  id, @RequestParam(value="score")Integer  score);
+    public RestResponse addScore(@RequestParam(value = "id") Integer id, @RequestParam(value = "score") Integer score);
 
     @RequestMapping(value = "/vehicleInfo/rent/book/vehicle", method = RequestMethod.POST)
     public ObjectRestResponse<VehicleBookRecord> rentApplyVehicle(@RequestBody RentVehicleBookDTO rentVehicleBookDTO);
@@ -71,25 +71,29 @@ public interface VehicleFeign {
     //获取分公司列表
     @GetMapping("/branchCompany/all")
     public  List<BranchCompany>  companyAll(
-            @RequestParam(value = "dataAll")Integer dataAll,
-            @RequestParam(value = "dataCompany")String dataCompany,
-            @RequestParam(value = "dataZone")String dataZone);
+            @RequestParam(value = "dataAll") Integer dataAll,
+            @RequestParam(value = "dataCompany") String dataCompany,
+            @RequestParam(value = "dataZone") String dataZone);
+
+    //获取分公司列表
+    @GetMapping("/company/base/app/unauth/companyId")
+    public  BranchCompany  companyId(@RequestParam(value = "name") String name);
 
     @GetMapping("/branchCompany/entityList")
     public ObjectRestResponse<List<BranchCompany>> branchCompanyEntityList(@RequestParam("entity") Map<String, Object> entity);
 
     @RequestMapping(value = "/user/license/one", method = RequestMethod.GET)
-    public RestResponse<VehicleUserLicense> one(@RequestParam(value="id",defaultValue="0")Integer  id) throws Exception;
+    public RestResponse<VehicleUserLicense> one(@RequestParam(value = "id", defaultValue = "0") Integer id) throws Exception;
 
     @RequestMapping(value = "/user/license/company/getOne", method = RequestMethod.GET)
     public RestResponse<VehicleUserLicense> getOne(
-            @RequestParam(value="id",defaultValue="0")Integer  id) throws Exception ;
+            @RequestParam(value = "id", defaultValue = "0") Integer id) throws Exception ;
 
     @RequestMapping(value = "/user/license/multi", method = RequestMethod.GET)
     public ObjectRestResponse<List<VehicleUserLicense>> multi(@RequestBody QueryMultiDTO dto) throws Exception;
 
     @GetMapping("/user/license/getVehicleLicenseList")
-    public ObjectRestResponse<List<VehicleUserLicense>> getVehicleLicenseList(@RequestParam(value="ids") String ids);
+    public ObjectRestResponse<List<VehicleUserLicense>> getVehicleLicenseList(@RequestParam(value = "ids") String ids);
 
     /**
      * 获取优质车型接口
@@ -122,8 +126,8 @@ public interface VehicleFeign {
      * @return
      */
     @GetMapping("/city/corporationCity")
-    ObjectRestResponse<Set<Integer>> corporationCity( @RequestParam(value = "zoneList") String zoneList,
-                                                       @RequestParam(value = "companyList") String companyList);
+    ObjectRestResponse<Set<Integer>> corporationCity(@RequestParam(value = "zoneList") String zoneList,
+                                                     @RequestParam(value = "companyList") String companyList);
 
 
     @GetMapping("/accompanyingItem/app/unauth/items")
@@ -163,7 +167,7 @@ public interface VehicleFeign {
     PageDataVO<BranchCompanyListVO> findBranchCompanyWithPage(@RequestBody BranchCompanyFindDTO branchCompanyFindDTO);
 
     @GetMapping("/vehicleInfo/findVehicleIds")
-    List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber") String plateNumber,@RequestParam(value = "vehicleCode") String vehicleCode);
+    List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber") String plateNumber, @RequestParam(value = "vehicleCode") String vehicleCode);
 
     @RequestMapping(value = "/vehicleInfo/bookRecord/update", method = RequestMethod.POST)
     public ObjectRestResponse update(@RequestBody BookRecordUpdateLog bookRecordUpdateLog);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java

@@ -59,4 +59,6 @@ public class VehicleBookRecordQueryVo extends PageParam {
     private List<Integer> companyIds;
     private String upkeepIds;
     private Integer userCompany;
+
+    private Integer zoneId;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java

@@ -49,6 +49,11 @@ public class VehiclePageQueryVo {
      * 用途类型：租赁房车（1）、展车等，对应关系见车辆常量表
      */
     private Integer useType;
+
+    /**
+     * 托管人
+     */
+    private String belongToName;
     /**
      * 预定目标日期(开始)
      */

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/BranchCompanyListDTO.java

@@ -20,6 +20,7 @@ public class BranchCompanyListDTO {
      */
     @ApiModelProperty("分公司名称")
     private String name;
+    private String companyName;
     /**
      * 公司封面
      */

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/BranchCompanyListVO.java

@@ -20,6 +20,7 @@ public class BranchCompanyListVO {
      */
     @ApiModelProperty("分公司名称")
     private String name;
+    private String companyName;
     /**
      * 公司封面
      */

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java

@@ -198,6 +198,35 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         return  ObjectRestResponse.succ();
     }
 
+    //临时数据同步6
+    public ObjectRestResponse synchro6(){
+        List<CompanyBase> list= mapper.getBaseList();
+        if (list.size()>0){
+            int num=0;
+            for (CompanyBase companyBase:list){
+                        String name=companyBase.getName();
+                        BranchCompany branchCompany=new BranchCompany();
+                        branchCompany.setCompanyBaseId(companyBase.getId());
+                        name= name.substring(name.indexOf("（")+1,name.indexOf("）"));
+                        name+="分公司";
+                        log.info("----name=="+name);
+                        branchCompany.setName(name);
+                        branchCompany.setAddrProvince(companyBase.getAddrProvince());
+                        branchCompany.setProvinceName(companyBase.getProvinceName());
+                        branchCompany.setAddrCity(companyBase.getAddrCity());
+                        branchCompany.setCityName(companyBase.getCityName());
+                        branchCompany.setAddrTown(companyBase.getAddrTown());
+                        branchCompany.setTownName(companyBase.getTownName());
+                        branchCompany.setZoneId(companyBase.getZoneId());
+                        branchCompany.setStatus(1);
+                        branchCompanyBiz.insertSelective(branchCompany);
+                        num++;
+                        log.info("----成功---num=="+num+"---companyBaseId==="+companyBase.getId());
+                    }
+                }
+        return  ObjectRestResponse.succ();
+    }
+
     //临时数据同步3
     public ObjectRestResponse synchro3(){
         List<BranchCompanyStockInfo> list= stockInfoMapper.selectAll();
@@ -434,4 +463,8 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         return companyBaseVo;
     }
 
+    public  BranchCompany getCompanyId(String name){
+        return  mapper.getCompanyId(name);
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1491,6 +1491,29 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return count > 0;
     }
 
+    public Boolean checkVinExist(String vin, String id) {
+        Example example = new Example(Vehicle.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("vin", vin);
+        criteria.andEqualTo("isDel",0);
+        if (StringUtils.isNotEmpty(id)) {
+            criteria.andNotEqualTo("id", id);
+        }
+        int count = mapper.selectCountByExample(example);
+        return count > 0;
+    }
+
+    public Boolean checkEngineNumExist(String engineNum, String id) {
+        Example example = new Example(Vehicle.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("engineNum", engineNum);
+        criteria.andEqualTo("isDel",0);
+        if (StringUtils.isNotEmpty(id)) {
+            criteria.andNotEqualTo("id", id);
+        }
+        int count = mapper.selectCountByExample(example);
+        return count > 0;
+    }
 
     public List<String> findbyPlateNumberAndVehicleCod(String plateNumber,String vehicleCode) {
         List<String> vehicleIds = Lists.newArrayList();

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -29,7 +29,6 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -195,51 +194,6 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 3) { //待出行
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query = new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus3(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 5) { //出行中
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query = new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus5(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 7) { //已完成
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query =  new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus7(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
         Query query =  new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         getupKeeps(pageDataVO.getData());
@@ -259,47 +213,6 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
     }
-
-    //筛选未出车的记录
-    public void removeStatus3(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(3);
-            }
-        }
-    }
-
-    //筛选已出车未还车记录
-    public void removeStatus5(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() ==1)) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(5);
-            }
-        }
-    }
-    //筛选已完成记录
-    public void removeStatus7(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() !=1)) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(5);
-            }
-        }
-    }
     /**
      * 获取随身物品
      */

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleDepartureService.java

@@ -34,17 +34,17 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     @Autowired
     VehicleMapper vehicleMapper;
 
-    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code,Integer zoneId,Integer departureId, String time, Integer page, Integer limit) {
+    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code,Integer zoneId,Integer departureId, String startTime,String endTime, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(mapper.selectVoAll(numberPlate,code,zoneId,departureId,time));
+        return new PageInfo<>(mapper.selectVoAll(numberPlate,code,zoneId,departureId,startTime, endTime));
     }
 
-    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate,Integer code,Integer zoneId,Integer departureId, String time, Integer page, Integer limit, List<Integer> companyList) {
+    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate,Integer code,Integer zoneId,Integer departureId, String startTime,String endTime,  Integer page, Integer limit, List<Integer> companyList) {
         PageHelper.startPage(page, limit);
         if (companyList == null || companyList.size() == 0) {
             companyList = Arrays.asList(-1);
         }
-        return new PageInfo<>(mapper.selectVoAllNotAllData(numberPlate,code,zoneId,departureId,time, companyList));
+        return new PageInfo<>(mapper.selectVoAllNotAllData(numberPlate,code,zoneId,departureId,startTime, endTime, companyList));
     }
 
     public PageInfo<VehicleDepartureLogVo> findByVehicle(String vehicleId, Integer page, Integer limit) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/CompanyBaseMapper.java

 package com.xxfc.platform.vehicle.mapper;
 
 
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.CompanyBase;
 import com.xxfc.platform.vehicle.pojo.dto.CompanyBaseDetailDTO;
 import com.xxfc.platform.vehicle.pojo.vo.CompanyVo;
@@ -25,4 +26,8 @@ public interface CompanyBaseMapper extends Mapper<CompanyBase> {
     CompanyBaseDetailDTO findCompanyBaseById(@Param("id") Integer id);
 
     List<CompanyBase> getList(CompanyVo companyVo);
+
+    List<CompanyBase> getBaseList();
+
+    BranchCompany getCompanyId(@Param("name") String name);
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleDepartureLogMapper.java

@@ -20,13 +20,16 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
                                             @Param("code") Integer code,
                                             @Param("zoneId") Integer zoneId,
                                             @Param("departureId") Integer departureId,
-                                            @Param("time") String time);
+                                            @Param("startTime") String startTime,
+                                            @Param("endTime") String endTime
+                                            );
 
     List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate,
                                                       @Param("code") Integer code,
                                                       @Param("zoneId") Integer zoneId,
                                                       @Param("departureId") Integer departureId,
-                                                      @Param("time") String time,
+                                                      @Param("startTime") String startTime,
+                                                      @Param("endTime") String endTime,
                                                       @Param("companyList") List<Integer> companyList);
 
     Integer selectMileageByVehicleId(String vehicleId);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -412,7 +412,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
                     companyList.clear();
                     companyList.add(vehiclePlanDto.getParkBranchCompanyId());
                 } else {
-                    return ObjectRestResponse.succ();
+                    return ObjectRestResponse.succ(Maps.newHashMap());
                 }
             }
         }
@@ -422,7 +422,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
                     companyList.clear();
                     companyList.add(vehiclePlanDto.getSubordinateBranch());
                 } else {
-                    return ObjectRestResponse.succ();
+                    return ObjectRestResponse.succ(Maps.newHashMap());
                 }
             }
         }
@@ -437,7 +437,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
          Map<String, Object> map = Maps.newHashMap();
          map.put("vehicleWarningMsgs",vehicleWarningMsgs);
          map.put("vehicleAndModelInfoVo",pageDataVO);
-        map.put("vehicleCountVos",vehicleCountVos);
+         map.put("vehicleCountVos",vehicleCountVos);
         return ObjectRestResponse.succ(map);
     }
 
@@ -561,6 +561,17 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return ObjectRestResponse.succ(exist);
     }
 
+    @GetMapping("/exist_vin/{vin}")
+    public ObjectRestResponse<Boolean> checkVinExist(@PathVariable(value = "vin") String vin,@RequestParam(value = "id") String id){
+        Boolean exist = vehicleBiz.checkVinExist(vin,id);
+        return ObjectRestResponse.succ(exist);
+    }
+
+    @GetMapping("/exist_engineNum/{engineNum}")
+    public ObjectRestResponse<Boolean> checkEngineNumExist(@PathVariable(value = "engineNum") String engineNum,@RequestParam(value = "id") String id){
+        Boolean exist = vehicleBiz.checkEngineNumExist(engineNum,id);
+        return ObjectRestResponse.succ(exist);
+    }
 
     @GetMapping("/findVehicleIds")
    public List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber",required = false) String plateNumber,@RequestParam(value = "vehicleCode",required = false) String vehicleCode){

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleDepartureController.java

@@ -36,7 +36,7 @@ public class VehicleDepartureController {
     /**
      * @param numberPlate 车牌
      * @param code        车辆编码
-     * @param time
+     * @param
      * @param departureId 出发分公司id
      * @param page
      * @param limit
@@ -45,7 +45,7 @@ public class VehicleDepartureController {
      */
     @GetMapping("page")
     public RestResponse page(String numberPlate,
-                             @RequestParam(value = "code", required = false) Integer code, String time,
+                             @RequestParam(value = "code", required = false) Integer code, String startTime, String endTime,
                              @RequestParam(value = "zoneId",required = false) Integer zoneId,
                              @RequestParam(value = "departureId", required = false) Integer departureId,
                              Integer page, Integer limit, HttpServletRequest request) {
@@ -57,15 +57,15 @@ public class VehicleDepartureController {
         if (userDTO != null) {
             if (userDTO.getDataAll() == 2) {
                 List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, zoneId,departureId, time, page, limit, companyList));
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, zoneId,departureId, startTime, endTime, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, zoneId,departureId, time, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, zoneId,departureId, startTime, endTime, page, limit));
     }
 
     @GetMapping("small/page")
     @IgnoreUserToken
-    public RestResponse pageBySmall(String numberPlate, @RequestParam(value = "code", required = false) Integer code, String time, Integer page, Integer limit, Integer uid, HttpServletRequest request) {
+    public RestResponse pageBySmall(String numberPlate, @RequestParam(value = "code", required = false) Integer code, String startTime, String endTime,Integer page, Integer limit, Integer uid, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -74,10 +74,10 @@ public class VehicleDepartureController {
         if (userDTO != null) {
             if (userDTO.getDataAll() == 2) {
                 List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, null,null, time, page, limit, companyList));
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, null,null, startTime,endTime, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, null,null, time, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, null,null, startTime,endTime, page, limit));
     }
 
     /**

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CompanyController.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.CompanyBaseBiz;
 import com.xxfc.platform.vehicle.common.BaseController;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.pojo.vo.CompanyVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -34,7 +35,7 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
     @ApiOperation("同步股权3")
     @PostMapping("synchro3")
     public ObjectRestResponse synchro3() {
-        return baseBiz.synchro5();
+        return baseBiz.synchro6();
     }
 
 
@@ -91,6 +92,12 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
         return baseBiz.importExcel(multipartfile,request);
     }
 
+    @ApiOperation("获取分公司")
+    @GetMapping("app/unauth/companyId")
+    public BranchCompany companyId(@RequestParam(value = "name") String name) {
+        return baseBiz.getCompanyId(name);
+    }
+
 
 
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -73,6 +73,7 @@
         cb.town_name AS `townName`,
         bc.addr_detail AS `address`,
         bc.NAME AS `name`,
+        cb.name AS `companyName`,
         cb.cover,
         bc.leader,
         bc.leader_contact_info AS `leaderContactInfo`,

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/CompanyBaseMapper.xml

@@ -55,4 +55,17 @@
         </where>
        order by b.upd_time desc
   </select>
+
+    <select id="getBaseList" resultType="com.xxfc.platform.vehicle.entity.CompanyBase">
+        SELECT b.id,b.`name`,b.addr_province as addrProvince,b.province_name as provinceName,b.addr_city as addrCity,b.city_name as cityName,b.zone_id as zoneId FROM company_base b LEFT JOIN branch_company c ON b.id=c.company_base_id
+     WHERE c.id IS NULL
+    </select>
+
+    <select id="getCompanyId" resultType="com.xxfc.platform.vehicle.entity.BranchCompany">
+
+       SELECT b.id,b.`name`  FROM branch_company b LEFT JOIN company_base c ON b.company_base_id=c.id
+        WHERE c.`name` LIKE  concat('%',#{name},'%') or b.`name` LIKE  concat('%',#{name},'%')
+        LIMIT 1
+    </select>
+
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -472,7 +472,7 @@
                 CONCAT(#{selectedMonth}, "%"))
             </if>
             <if test="numberPlate != null">
-                and v3.number_plate = #{numberPlate}
+                and v3.number_plate like concat('%', #{numberPlate}, '%')
             </if>
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
@@ -490,9 +490,18 @@
                     #{id}
                 </foreach>)
             </if>
-            <if test="status != null and status != 0 and status != -1 and status != -2">
+            <if test="status != null and status != 0 and status != -1 and status != -2 and status != 3 and status != 5 and status != 7">
                 and v1.status = #{status}
             </if>
+            <if test="status != null and status == 3 ">
+                and v4.id is null and v1.status = 2
+            </if>
+            <if test="status != null and status == 5 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 0
+            </if>
+            <if test="status != null and status == 7 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 1
+            </if>
             <if test="status != null and status == 0 ">
                 and v4.state = 0
             </if>

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml

@@ -100,18 +100,12 @@
             <if test="numberPlate != null and numberPlate != ''">
                 and vehicle.number_plate = #{numberPlate}
             </if>
-            <if test="time != null and time != ''">
-                and  (vehicle_departure_log.arrival_time >=  str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
-                or vehicle_departure_log.arrival_time is null
-                )
+            <if test="startTime != null and startTime != ''">
                 and
-                (
-                vehicle_departure_log.departure_time &lt;= str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
-                or vehicle_departure_log.departure_time is null
-                )
-
+                vehicle_departure_log.departure_time &gt;= str_to_date(#{startTime}, '%Y-%m-%d %H')
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and  vehicle_departure_log.arrival_time &gt;=  str_to_date(#{endTime}, '%Y-%m-%d %H')
             </if>
             <if test="code!=null">
                and  vehicle.code=#{code}
@@ -158,17 +152,17 @@
                 )
                 )
             </if>
-            <if test="time != null and time != ''">
-                and  (vehicle_departure_log.arrival_time >=  str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
-                or vehicle_departure_log.arrival_time is null
-                )
+            <if test="startTime != null and startTime != ''">
                 and
-                (
-                vehicle_departure_log.departure_time  &lt;= str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
+                vehicle_departure_log.departure_time &lt;= str_to_date(#{startTime}, '%Y-%m-%d %H')
+                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{startTime}, '%Y-%m-%d %H'))
                 or vehicle_departure_log.departure_time is null
-                )
+
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and  vehicle_departure_log.arrival_time >=  str_to_date(#{endTime}, '%Y-%m-%d %H')
+                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{endTime}, '%Y-%m-%d %H'))
+                or vehicle_departure_log.arrival_time is null
             </if>
             <if test="code!=null">
                 and  vehicle.code=#{code}

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -41,11 +41,10 @@
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
-        v.`status`,
+        (CASE WHEN #{status} is not null THEN #{status}
+        ELSE v.status END) status ,
         v.number_plate,
         v.brand,
-        -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
-        -- IFNULL(bc.name,bc1.name) AS subBranchName,
         v.park_branch_company_id,
         bc.name as parkBranchCompanyName,
         v.expect_destination_branch_company_id,
@@ -80,14 +79,14 @@
             left join
             vehicle_book_info vbi on v.`id` = vbi.vehicle
         </if>
-        -- LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
-        -- LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         -- 停车分公司
         LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
         -- 目的地分公司
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         -- 所属分公司
         LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
+        LEFT JOIN vehicle_book_record v2 on v2.id = (select id from vehicle_book_record where vehicle_id = v.id order by update_time DESC LIMIT 1)
+        LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         where
         v.is_del=0
         <if test="mRangeDateEnd !=null">
@@ -114,18 +113,27 @@
         <if test="insuranceCompany !=null">
             and v.insurance_company = #{insuranceCompany}
         </if>
+        <if test="belongToName !=null and belongToName != ''">
+            and v.belong_to_name  like concat('%',#{belongToName},'%')
+        </if>
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
         </if>
-<!--        <if test="subordinateBranch !=null">-->
-<!--            and v.subordinate_branch = #{subordinateBranch}-->
-<!--        </if>-->
+        <!--        <if test="subordinateBranch !=null">-->
+        <!--            and v.subordinate_branch = #{subordinateBranch}-->
+        <!--        </if>-->
         <if test="code !=null">
             and v.code = #{code}
         </if>
-        <if test="status !=null">
+        <if test="status !=null and status != 6 and status != 7">
             and v.status = #{status}
         </if>
+        <if test="status !=null and status == 6">
+            and  v3.id is not NULL and v2.book_type = 3 and v3.state = 0
+        </if>
+        <if test="status !=null and status == 7">
+            and  v3.id is not NULL and v2.book_type = 6 and v3.state = 0
+        </if>
         <if test="numberPlate !=null and numberPlate != ''">
             and v.number_plate like concat('%',#{numberPlate},'%')
         </if>
@@ -153,17 +161,16 @@
             and ( v.park_branch_company_id = #{subordinateBranch})
         </if>
         <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
-                <if test="addrProvince !=null">
-                    and bc.addr_province=#{addrProvince}
-                </if>
-                <if test="addrCity !=null">
-                   and  bc.addr_city=#{addrCity}
-                </if>
-                <if test="zoneId !=null">
-                   and  bc.zone_id=#{zoneId}
-                </if>
+            <if test="addrProvince !=null">
+                and bc.addr_province=#{addrProvince}
+            </if>
+            <if test="addrCity !=null">
+                and  bc.addr_city=#{addrCity}
+            </if>
+            <if test="zoneId !=null">
+                and  bc.zone_id=#{zoneId}
+            </if>
         </if>
-        order by v.code
         ) r ORDER BY r.parkBranchCompanyName
     </select>
 
@@ -172,7 +179,8 @@
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
-        v.`status`,
+        (CASE WHEN #{status} is not null THEN #{status}
+        ELSE v.status END) status ,
         v.number_plate,
         v.brand,
         -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
@@ -217,29 +225,31 @@
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         -- 所属分公司
         LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
+        LEFT JOIN vehicle_book_record v2 on v2.id = (select id from vehicle_book_record where vehicle_id = v.id order by update_time DESC LIMIT 1)
+        LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         where
         v.is_del=0
         <if test="companyList != null">
             and ( v.park_branch_company_id in (
-                <trim suffixOverrides=",">
-                    <foreach collection="companyList" item="companyId">
-                        #{companyId},
-                    </foreach>
-                </trim>
-                )
-                <!--or v.expect_destination_branch_company_id in (
-                <trim suffixOverrides=",">
-                    <foreach collection="companyList" item="companyId">
-                        #{companyId},
-                    </foreach>
-                </trim>
-                )-->
-    <!--            or v.subordinate_branch in (-->
-    <!--            <trim suffixOverrides=",">-->
-    <!--                <foreach collection="companyList" item="companyId">-->
-    <!--                    #{companyId},-->
-    <!--                </foreach>-->
-    <!--            </trim>-->
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
+                    #{companyId},
+                </foreach>
+            </trim>
+            )
+            <!--or v.expect_destination_branch_company_id in (
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
+                    #{companyId},
+                </foreach>
+            </trim>
+            )-->
+            <!--            or v.subordinate_branch in (-->
+            <!--            <trim suffixOverrides=",">-->
+            <!--                <foreach collection="companyList" item="companyId">-->
+            <!--                    #{companyId},-->
+            <!--                </foreach>-->
+            <!--            </trim>-->
             )
         </if>
         <if test="mRangeDateEnd !=null">
@@ -266,18 +276,27 @@
         <if test="insuranceCompany !=null">
             and v.insurance_company = #{insuranceCompany}
         </if>
+        <if test="belongToName !=null and belongToName != ''">
+            and v.belong_to_name like concat('%',#{belongToName},'%')
+        </if>
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
         </if>
-<!--        <if test="subordinateBranch !=null">-->
-<!--            and v.subordinate_branch = #{subordinateBranch}-->
-<!--        </if>-->
+        <!--        <if test="subordinateBranch !=null">-->
+        <!--            and v.subordinate_branch = #{subordinateBranch}-->
+        <!--        </if>-->
         <if test="code !=null">
             and v.code = #{code}
         </if>
-        <if test="status !=null">
+        <if test="status !=null and status != 6 and status != 7">
             and v.status = #{status}
         </if>
+        <if test="status !=null and status == 6">
+            and  v3.id is not NULL and v2.book_type = 3 and v3.state = 0
+        </if>
+        <if test="status !=null and status == 7">
+            and  v3.id is not NULL and v2.book_type = 6 and v3.state = 0
+        </if>
         <if test="numberPlate !=null and numberPlate != ''">
             and v.number_plate like concat('%',#{numberPlate},'%')
         </if>
@@ -315,7 +334,6 @@
                 and  bc.zone_id=#{zoneId}
             </if>
         </if>
-        order by v.code
         ) r ORDER BY r.parkBranchCompanyName
     </select>