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

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/AppUserPositionTemp.java

@@ -64,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/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -112,6 +112,9 @@ 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");
@@ -120,6 +123,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 criteria.andIsNull("userId");
             }
         }
+        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)) {
@@ -177,8 +181,26 @@ 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();
@@ -202,20 +224,24 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                     jobId=1;
                 }
                 appUserPositionTemp = new AppUserPositionTemp();
-                appUserPositionTemp.setCrtTime(Instant.now().toEpochMilli());
                 appUserPositionTemp.setName(name);
                 appUserPositionTemp.setPositionId(postionId);
                 appUserPositionTemp.setPhone(phone);
-                appUserPositionTemp.setUserId(0);
                 appUserPositionTemp.setCompanyId(companyId);
                 appUserPositionTemp.setCompanyName(companyName);
                 appUserPositionTemp.setJobId(jobId);
-                if (Objects.nonNull(userLogin)) {
+                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);
                 }
-                insertSelective(appUserPositionTemp);
+
             } catch (BaseException ex) {
                 errorResultMap = new HashMap<>(1);
                 errorResultMap.put("num", i);
@@ -260,4 +286,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/rest/admin/AppUserPositionController.java

@@ -59,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-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java

@@ -75,7 +75,7 @@ public class OrderRentVehicleController extends CommonBaseController {
                 bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
                 bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
                 //设置-1表示查询所有的车
-                bo.setUseType(-1);
+                //bo.setUseType(-1);
                 orderRentVehicleService.createOrder(bo);
                 return ObjectRestResponse.succ(bo.getOrder());
         }

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

@@ -142,7 +142,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         }
         //设置显示是否有车
         dto.setYearNo4Where(Boolean.TRUE);
-        dto.setUseType(null);
+        //dto.setUseType(null);
         return ObjectRestResponse.succ(vehicleBiz.searchUsableModelBackStage(dto));
     }