单车返利预提流程接口对接，测试文档问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -199,6 +199,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
+        if (baseInternalPurchaseVehicles.size() < 1) {
+            return rb.setMsg("请选择调车申请车辆");
+        }
         if (StringUtils.isBlank(dtoSid)) {//新增
             if (StringUtils.isBlank(dto.getShuntingTypeKey())) {
                 return rb.setMsg("调车类型不能为空");
@@ -315,9 +318,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         //若有网关，则赋值网关中判断的字段。
         variables.put("businessSid", businessSid);
         //=====================添加app所需参数
-        Map<String,Object> appMap = new HashMap<>();
-        appMap.put("sid",businessSid);
-        variables.put("app",appMap);
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -729,9 +732,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 Map<String, Object> map = new HashMap<>();
                 map.put("modelSid", modelSid);
                 map.put("configSid", configSid);
-                map.put("selectType",0);
+                map.put("selectType", 0);
                 appSubVersionVo.setJson(JSONObject.toJSONString(map));
-                BeanUtil.copyProperties(appSubVersionVo,appVehicleVersionVo);
+                BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
                 appCompanyShuntingListVo.setCarDetailPage(appVehicleVersionVo);
 
             });

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -151,9 +151,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         if (StringUtils.isNotBlank(query.getModelName())) {
             qw.like("modelName", query.getModelName());
         }
-        qw.eq("useOrgSid", query.getUseOrgSid());
+        //qw.eq("useOrgSid", query.getUseOrgSid());
         qw.eq("createBySid", query.getUserSid());
-//		qw.eq("createBySid",query.getUserSid());
         return qw;
     }
 
@@ -488,7 +487,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             updateFlowFiled(stringObjectMap);
             if ("Event_end".equals(taskDefKey)) {
                 BigDecimal deposit = booad.getDeposit();
-                if ("是".equals(booad.getIsBeforePayment())) {
+                if ("1".equals(booad.getIsBeforePayment())) {
                     ThreadUtil.execute(() -> sendFinPaymentrecord(bv, booad, ManPurOrderType.CostTitle.CK_COSTTITLE.getCode(), ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks()));
                 } else {
                     if (deposit != null) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -446,5 +446,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     IPage<BaseVehicleRebateVo> vehicleRebatePageList(IPage<BaseVehicleRebateVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
-
+    @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue} where vinNo = #{vinNo}")
+    void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("vinNo") String vinNo);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1000,21 +1000,13 @@
 
     <select id="vehiclePurchasePageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehiclePurchaseVo">
         SELECT bv.sid,
-        <!--品牌名称-->
         bvm.brandName,
-        <!--车型名称-->
         bvm.vehicleAlias,
-        <!--车型sid-->
         bvm.sid as modelSid,
-        <!--车架号-->
         bv.vinNo,
-        <!--颜色-->
         bmc.carColor color,
-        <!--存放地点-->
         bv.locationName location,
-        <!--存放地点sid-->
         bv.location locationSid,
-        <!--销售指导价-->
         bvc.guidedPrice,
         bmc.configName,
         bmc.sid as configSid,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1238,7 +1238,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      */
     public PagerVo<BaseVehiclePurchaseVo> vehiclePurchaseList(PagerQuery<BaseVehiclePurchaseQuery> pagerQuery) {
         IPage<BaseVehiclePurchaseVo> page = vehiclePurchasePageList(pagerQuery);
-        List<BaseVehiclePurchaseVo> records = page.getRecords();
+        /*List<BaseVehiclePurchaseVo> records = page.getRecords();
         for (BaseVehiclePurchaseVo record : records) {
             String configSid = record.getConfigSid();
             String modelSid = record.getModelSid();
@@ -1255,8 +1255,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             } else {
                 record.setGuidedPrice("");
             }
-
-        }
+        }*/
         PagerVo<BaseVehiclePurchaseVo> pv = new PagerVo<>();
         PagerVo<BaseVehiclePurchaseVo> pv1 = PagerUtil.pageToVo(page, pv);
         return pv1;
@@ -1953,7 +1952,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
 
         //调出分公司车辆台账更新库存状态
-        baseMapper.updateVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(),VehicleState.StockEnum.DC_STOCK.getRemarks(),baseVehicle.getVinNo(),baseVehicle.getUseOrgSid());
+        baseMapper.updateCallOutVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(),VehicleState.StockEnum.DC_STOCK.getRemarks(),baseVehicle.getVinNo());
 
         //新建调入分公司车辆台账，设置调入分公司sid
         BaseVehicle new_baseVehicle = new BaseVehicle();

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java

@@ -68,6 +68,11 @@ public interface ScmVehRebateFeign {
     @ResponseBody
     public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
 
+    @ApiOperation("单车返利核对申请选择单车返利信息")
+    @PostMapping("/checkApplyGetVehRebate")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
+
     @ApiOperation("新增")
     @PostMapping("/save")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java

@@ -59,6 +59,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean save(ScmVehRebateDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebate/save无法访问");

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java

@@ -57,7 +57,7 @@ public class ScmVehRebateVo implements Vo {
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime; // 创建日期
-    @ApiModelProperty("状态")
+    @ApiModelProperty("状态（0未提计，1已提计，2待核对，3已核对）")
     private String state; // 状态
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java

@@ -56,6 +56,8 @@ public class ScmVehRebateWithApply extends BaseEntity {
     private String brandName; // 品牌名称
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
+    @ApiModelProperty("预提返利合计")
+    private String withRebateTotal; // 预提返利合计
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
 	@ApiModelProperty("使用组织sid")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java

@@ -55,6 +55,8 @@ public class ScmVehRebateWithApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("申请人sid")
+    private String createBySid; // 申请人sid
     @ApiModelProperty("备注")
     private String remarks; // 备注
 	@ApiModelProperty("品牌sid")
@@ -63,6 +65,8 @@ public class ScmVehRebateWithApplyDetailsVo implements Vo {
     private String brandName; // 品牌名称
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
+    @ApiModelProperty("预提返利合计")
+    private String withRebateTotal; // 预提返利合计
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
 	@ApiModelProperty("使用组织sid")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java

@@ -62,6 +62,8 @@ public class ScmVehRebateWithApplyDto implements Dto {
     private String brandName; // 品牌名称
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
+    @ApiModelProperty("预提返利合计")
+    private String withRebateTotal; // 预提返利合计
     @ApiModelProperty("创建人sid")
     private String createBySid; // 创建人sid
 	@ApiModelProperty("创建人姓名")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java

@@ -63,6 +63,8 @@ public class ScmVehRebateWithApplyVo implements Vo {
     private String brandName; // 品牌名称
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
+    @ApiModelProperty("预提返利合计")
+    private String withRebateTotal; // 预提返利合计
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
 	@ApiModelProperty("使用组织sid")
@@ -75,4 +77,8 @@ public class ScmVehRebateWithApplyVo implements Vo {
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("流程状态")
     private String nodeState;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@@ -73,6 +73,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
 		return rb.success().setData(pv);
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmVehRebateVo> pv = scmVehRebateService.checkApplyGetVehRebate(pq);
+		return rb.success().setData(pv);
+	}
+
 	@Override
 	public ResultBean save(@RequestBody ScmVehRebateDto dto){
 		return scmVehRebateService.saveAll(dto);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -129,6 +129,40 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         return p;
     }
 
+    public PagerVo<ScmVehRebateVo> checkApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
+        ScmVehRebateQuery query = pq.getParams();
+        QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getBrandSid())) {
+            qw.eq("brandSid", query.getBrandSid());
+        }
+        if (StringUtils.isNotBlank(query.getVehModelName())) {
+            qw.like("vehModelName", query.getVehModelName());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
+            qw.eq("rebateTypeKey", query.getRebateTypeKey());
+        }
+        if (StringUtils.isNotBlank(query.getRebateName())) {
+            qw.like("rebateName", query.getRebateName());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.eq("createOrgSid",query.getCreateOrgSid());
+        qw.eq("state", 2);
+        if (query.getSidList().size() > 0) {
+            qw.notIn("sid", query.getSidList());
+        }
+        IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public void insertByDto(ScmVehRebateDto dto) {
         ScmVehRebate entity = new ScmVehRebate();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
@@ -167,5 +201,4 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         }
         return rb.success().setMsg("保存成功");
     }
-
 }