Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@@ -80,10 +80,16 @@ public class BaseOutsourcingApplication extends BaseEntity {
     private BigDecimal guidedPrice; // 销售指导价
 	@ApiModelProperty("厂家合同价")
     private BigDecimal manufactorSettlementPrice; // 厂家合同价
-    @ApiModelProperty("开户银行名称")
-    private String depositBankName; // 开户银行名称
-    @ApiModelProperty("银行账号")
-    private String bankAccount; // 银行账号
+    @ApiModelProperty("订金开户银行")
+    private String modelBankName; // 订金开户银行
+    @ApiModelProperty("订金银行账号")
+    private String modelBankAccount; // 订金银行账号
+    @ApiModelProperty("订金收款账户名称")
+    private String modelAccountName; // 订金收款账户名称
+    @ApiModelProperty("车款开户银行")
+    private String depositBankName; // 车款开户银行
+    @ApiModelProperty("车款银行账号")
+    private String bankAccount; // 车款银行账号
 	@ApiModelProperty("台数")
     private Integer num; // 台数
 	@ApiModelProperty("订金")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@@ -82,10 +82,16 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
     private String guidedPrice; // 销售指导价
 	@ApiModelProperty("厂家合同价")
     private String manufactorSettlementPrice; // 厂家合同价
-    @ApiModelProperty("开户银行名称")
-    private String depositBankName; // 开户银行名称
-    @ApiModelProperty("银行账号")
-    private String bankAccount; // 银行账号
+    @ApiModelProperty("订金开户银行")
+    private String modelBankName; // 订金开户银行
+    @ApiModelProperty("订金银行账号")
+    private String modelBankAccount; // 订金银行账号
+    @ApiModelProperty("订金收款账户名称")
+    private String modelAccountName; // 订金收款账户名称
+    @ApiModelProperty("车款开户银行")
+    private String depositBankName; // 车款开户银行
+    @ApiModelProperty("车款银行账号")
+    private String bankAccount; // 车款银行账号
 	@ApiModelProperty("台数")
     private Integer num; // 台数
 	@ApiModelProperty("订金")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@@ -90,10 +90,16 @@ public class BaseOutsourcingApplicationDto implements Dto {
     private BigDecimal guidedPrice; // 销售指导价
 	@ApiModelProperty("厂家合同价")
     private BigDecimal manufactorSettlementPrice; // 厂家合同价
-	@ApiModelProperty("开户银行名称")
-	private String depositBankName; // 开户银行名称
-	@ApiModelProperty("银行账号")
-	private String bankAccount; // 银行账号
+	@ApiModelProperty("订金开户银行")
+	private String modelBankName; // 订金开户银行
+	@ApiModelProperty("订金银行账号")
+	private String modelBankAccount; // 订金银行账号
+	@ApiModelProperty("订金收款账户名称")
+	private String modelAccountName; // 订金收款账户名称
+	@ApiModelProperty("车款开户银行")
+	private String depositBankName; // 车款开户银行
+	@ApiModelProperty("车款银行账号")
+	private String bankAccount; // 车款银行账号
 	@ApiModelProperty("台数")
     private Integer num; // 台数
 	@ApiModelProperty("订金")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java

@@ -212,5 +212,5 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
 
     int selectCount();
 
-    List<String> checkConfigNameBySid(@Param("sid") String sid,@Param("createOrgSid") String createOrgSid);
+    List<String> checkConfigNameBySid(@Param("sid") String sid, @Param("createOrgSid") String createOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -230,8 +230,8 @@
                bmc.multimedia,
                bv.guidedPrice
         FROM base_vehicle bv
-                     LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
-                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
     </select>
     <select id="selectAppConfigListByModelSid2"
@@ -266,16 +266,16 @@
                 FROM base_vehmodel_config bvc
                 WHERE bvc.configurationItemsSid = bmc.sid) AS priceValidity
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
-                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
     </select>
 
     <select id="selectVehicleQuantity" resultType="java.lang.String">
         SELECT count(*)
         FROM base_model_config bmc
-                     LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bmc.sid
-                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         WHERE bmc.sid = #{sid}
           AND bvm.sid = #{modelSid}
     </select>
@@ -304,8 +304,8 @@
                bmc.multimedia,
                bmc.otherConfig
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid
-                     LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
+                 LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid
+                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -482,8 +482,8 @@
                bmc.multimedia,
                bmc.otherConfig
         FROM bus_vehicle_apply_detail bvad
-                     LEFT JOIN base_model_config bmc ON bmc.sid = bvad.configSid
-                     LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvad.vehicleSid
+                 LEFT JOIN base_model_config bmc ON bmc.sid = bvad.configSid
+                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvad.vehicleSid
         WHERE bmc.sid = #{configSid}
           AND bvm.sid = #{modelSid}
     </select>
@@ -501,15 +501,15 @@
                bvm.driveFormValue,
                bvm.fuelTypeValue,
                bvm.gearboxTypeValue,
-               bvm.marketSegmentsValue as marketSegments,
-               bvm.departmentValue as department,
+               bvm.marketSegmentsValue                                            as marketSegments,
+               bvm.departmentValue                                                as department,
                bvm.emissionStandardValue,
                bvm.engineTypeValue,
                bvm.announcementModel,
                bvm.specifications,
                bvm.insideCode
         FROM base_vehicle_model bvm
-                     LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
+                 LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
         where bvm.sid = #{modelSid}
           and bvc.useOrgSid = #{useOrgSid}
     </select>
@@ -578,7 +578,7 @@
                (select SUM(distinct cast((cast(bo.platformNo as signed) -
                                           IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
                 from bus_vehicle_order bo
-                             LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
+                         LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
                 where bo.useOrgSid = bvc.useOrgSid
                   and bd.vehicleSid = #{modelSid}
                   and bd.configSid = #{configSid})  AS produceCarNum
@@ -616,8 +616,8 @@
 --                bv.salePrice as price,
                bmc.otherConfig
         FROM base_vehicle bv
-                     LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
-                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
           AND bmc.sid = #{configSid}
     </select>
@@ -643,7 +643,9 @@
         bmc.independentSources,
         bmc.fuelTank,
         bmc.multimedia,
-        bvc.guidedPrice as price,
+        if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)),
+        CONCAT(convert(MIN(bvc.guidedPrice) / 10000, decimal (10, 2)), '-',
+        convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)))) AS price,
         bvc.priceValidity,
         bvm.sid as modelSid,
         bvm.vehicleAlias as modelName,
@@ -654,6 +656,7 @@
         FROM base_vehicle bv
         WHERE bv.modelSid = bvc.modelSid
         AND bv.modelConfigSid = bvc.configurationItemsSid
+        AND (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入')
         AND bv.lockedState = #{state}
         and bv.useOrgSid = #{orgSid}) AS nowCarNum,
         (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
@@ -772,6 +775,7 @@
     <select id="checkByConfigName" resultType="java.lang.String">
         SELECT CONCAT(configName, otherConfig) configNameOther
         FROM base_model_config
-        WHERE isDelete = 0 AND createOrg = #{createOrgSid}
+        WHERE isDelete = 0
+          AND createOrg = #{createOrgSid}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@@ -859,7 +859,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         return baseMapper.selectCount();
     }
 
-    public List<String> checkConfigNameBySid(String sid,String createOrgSid) {
-        return baseMapper.checkConfigNameBySid(sid,createOrgSid);
+    public List<String> checkConfigNameBySid(String sid, String createOrgSid) {
+        return baseMapper.checkConfigNameBySid(sid, createOrgSid);
     }
 }

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

@@ -48,6 +48,7 @@ import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@@ -574,10 +575,14 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         finPaymentrecordDto.setCostTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());
         //款项类别
         finPaymentrecordDto.setCostTypeKey(ManPurOrderType.ManOrderType.WC_ORDER.getCode());
-        //收款单位名称
-        finPaymentrecordDto.setReceiveCompany(booad.getPurchasingUnitName());
-        //收款银行账号
-        finPaymentrecordDto.setReceiveBankAccount(booad.getBankAccount());
+        //收款银行账号和收款单位
+        if (costTitleKey.equals(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode())) {
+            finPaymentrecordDto.setReceiveBankAccount(booad.getBankAccount());
+            finPaymentrecordDto.setReceiveCompany(booad.getPurchasingUnitName());
+        } else if (costTitleKey.equals(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode())) {
+            finPaymentrecordDto.setReceiveBankAccount(booad.getModelBankAccount());
+            finPaymentrecordDto.setReceiveCompany(booad.getModelAccountName());
+        }
         //金额
         if (costTitleKey.equals(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode())) {
             finPaymentrecordDto.setCost(booad.getPurchasePrice().intValue());
@@ -756,7 +761,10 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
      */
     public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BaseOutsourcingApplication baseOutsourcingApplication) {
         //=====极光推送信息========================================参数组装
-        List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
+        String procId = baseOutsourcingApplication.getProcInstSid();
+        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
+        String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
+        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
         //根据用户的sid查询用户的id
         ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
         List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

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

@@ -630,7 +630,9 @@
         bvm.vehicleVersionValue AS versionValue,
         bvm.fuelTypeValue,
         bvm.gearboxTypeValue,
-        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
+        (SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)),
+        CONCAT(convert(MIN(bvc.guidedPrice) / 10000, decimal (10, 2)), '-',
+        convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2))))
         FROM base_vehmodel_config bvc
         WHERE bvc.modelSid = bvm.sid
         AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
@@ -642,7 +644,8 @@
         FROM base_vehicle bv
         WHERE bv.modelSid = bvm.sid
         AND bv.lockedState = #{state}
-        and bv.useOrgSid = #{useOrgSid}) AS nowCarNum
+        AND (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入')
+        AND bv.useOrgSid = #{useOrgSid}) AS nowCarNum
         FROM base_vehicle bv
         LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         left join base_vehmodel_config bvc on bvc.modelSid = bvm.sid
@@ -757,7 +760,8 @@
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
         bv.costPrice as priced,
         bv.insideCode,
-        (select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or bvv.vehicleStateValue = '调入')) as vehicleNum,
+        (select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or
+        bvv.vehicleStateValue = '调入')) as vehicleNum,
         (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum
 
         FROM base_vehicle bv
@@ -1029,6 +1033,7 @@
     <select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
         SELECT *
         FROM base_vehicle
-        WHERE vinNo = #{vinNo} AND useOrgSid = #{useOrgSid}
+        WHERE vinNo = #{vinNo}
+          AND useOrgSid = #{useOrgSid}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -22,6 +22,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@@ -284,7 +285,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
-        baseVehicleActualSales = fetchBySid(businessSid);
         //判断车辆的结算状态是否包含预买断的状态，如果是的话，返回提交失败
         boolean isTrue = isTrue(businessSid);
         if (isTrue) {
@@ -319,6 +319,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 baseVehicleService.updateVeh(baseVehicle);
             }
             //极光推送
+            baseVehicleActualSales = fetchBySid(businessSid);
             String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
             return voResultBean;
         }
@@ -384,6 +385,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             //极光推送
+            baseVehicleActualSales = fetchBySid(bv.getBusinessSid());
             String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
             return rb.success().setData(resultBean.getData());
         } else {
@@ -474,6 +476,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
                 //极光推送
+                baseVehicleActualSales = fetchBySid(query.getBusinessSid());
                 String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
                 return rb.success();
             }
@@ -567,7 +570,10 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
 
     public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BaseVehicleActualSales baseVehicleActualSales) {
         //=====极光推送信息========================================参数组装
-        List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
+        String procId = baseVehicleActualSales.getProcInstId();
+        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
+        String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
+        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
         //根据用户的sid查询用户的id
         ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
         List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@@ -351,7 +352,6 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         }
 
         String businessSid = resultBean.getData();
-        busVehicleApply = fetchBySid(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -377,6 +377,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
+            busVehicleApply = fetchBySid(businessSid);
             String msgSid = getMessage(ufVo, appMap, busVehicleApply);
             return voResultBean;
         }
@@ -510,6 +511,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordFeign.save(finPaymentrecordDto);
                 }
             } else {
+                busVehicleApply = fetchBySid(businessSid);
                 String msgSid = getMessage(ufVo, appMap, busVehicleApply);
             }
             return rb.success().setData(resultBean.getData());
@@ -606,6 +608,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 Map<String, Object> map = BeanUtil.beanToMap(ufVo);
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
+                busVehicleApply = fetchBySid(businessSid);
                 String msgSid = getMessage(ufVo, appMap, busVehicleApply);
                 return rb.success();
             }
@@ -725,7 +728,10 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
      */
     public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusVehicleApply busVehicleApply) {
         //=====极光推送信息========================================参数组装
-        List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
+        String procId = busVehicleApply.getProcInstId();
+        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
+        String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
+        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
         //根据用户的sid查询用户的id
         ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
         List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -1754,7 +1754,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
-        busMainDeposit = fetchBySid(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -1778,6 +1777,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
+            busMainDeposit = fetchBySid(businessSid);
             String msgSid = getMessage(ufVo, appMap, busMainDeposit);
             return voResultBean;
         }
@@ -1858,7 +1858,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
-        busMainDeposit = fetchBySid(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -1883,6 +1882,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
+            busMainDeposit = fetchBySid(businessSid);
             String msgSid = getMessage(ufVo, appMap, busMainDeposit);
             return voResultBean;
         }
@@ -1919,6 +1919,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             //极光推送
+            busMainDeposit = fetchBySid(bv.getBusinessSid());
             String msgSid = getMessage(ufVo, appMap, busMainDeposit);
             return rb.success().setData(resultBean.getData());
         } else {
@@ -2005,6 +2006,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
                 //极光推送
+                busMainDeposit = fetchBySid(query.getBusinessSid());
                 String msgSid = getMessage(ufVo, appMap, busMainDeposit);
                 return rb.success();
             }
@@ -2071,7 +2073,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      */
     public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusMainDeposit busMainDeposit) {
         //=====极光推送信息========================================参数组装
-        List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
+        String procId = busMainDeposit.getProcInsId();
+        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
+        String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
+        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
         //根据用户的sid查询用户的id
         ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
         List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -91,6 +91,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
@@ -909,6 +910,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
                 //极光推送
+                busSalesOrder = fetchBySid(query.getBusinessSid());
                 String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
                 return rb.success();
             }
@@ -2250,6 +2252,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
+            busSalesOrder = fetchBySid(businessSid);
             String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
             return voResultBean;
         }
@@ -2325,6 +2328,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             //极光推送
+            busSalesOrder = fetchBySid(bv.getBusinessSid());
             String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
             return rb.success().setData(resultBean.getData());
         } else {
@@ -2403,7 +2407,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusSalesOrder busSalesOrder) {
         //=====极光推送信息========================================参数组装
-        List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
+        String procId = busSalesOrder.getProcInstId();
+        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
+        String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
+        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
         //根据用户的sid查询用户的id
         ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
         List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDetailedsVo.java

@@ -79,4 +79,10 @@ public class AppScmVehicleStayInventoryDetailedsVo implements Vo {
     @ApiModelProperty("见证材料")
     private List<String> images;
 
+    @ApiModelProperty("定位")
+    private String address;
+
+    @ApiModelProperty("定位经纬度")
+    private String addressCode;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageQuery.java

@@ -11,7 +11,7 @@ public class AppScmVehicleStayPatrolinspectionPageQuery implements Query {
     private String userSid;
 
     @ApiModelProperty("优先匹配车架号 存放地点 巡检人员")
-    private String name;
+    private String names;
 
     @ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
     private String warehouseSid;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@@ -628,7 +629,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
-        scmVehicleGression = fetchBySid(businessSid);
         String state = "2";
         baseMapper.updateStateBySid(businessSid, state);
         //创建BusinessVariables实体对象
@@ -656,6 +656,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
+            scmVehicleGression = fetchBySid(businessSid);
             String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
             return voResultBean;
         }
@@ -746,6 +747,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             //极光推送
+            scmVehicleGression = fetchBySid(bv.getBusinessSid());
             String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
             return rb.success().setData(resultBean.getData());
         } else {
@@ -829,6 +831,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
+                scmVehicleGression = fetchBySid(query.getBusinessSid());
                 String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
                 return rb.success();
             }
@@ -1024,7 +1027,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      */
     public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, ScmVehicleGression scmVehicleGression) {
         //=====极光推送信息========================================参数组装
-        List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
+        String procId = scmVehicleGression.getProcInstId();
+        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
+        String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
+        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
         //根据用户的sid查询用户的id
         ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
         List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml

@@ -58,6 +58,8 @@
                location          AS warehouse,
                inventoryName     AS `name`,
                InventoryStateKey AS state,
+               address,
+               addressCode,
                remarks
         FROM scm_vehicle_inventory
         where sid = #{recordSid}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.java

@@ -76,7 +76,7 @@ public interface ScmVehicleStayPatrolinspectionMapper extends BaseMapper<ScmVehi
      * @param name
      * @return
      */
-    IPage<AppScmVehicleStayPatrolinspectionPageVo> getInventoryList(IPage<AppScmVehicleStayPatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw, @Param("name") String name);
+    IPage<AppScmVehicleStayPatrolinspectionPageVo> getInventoryList(IPage<AppScmVehicleStayPatrolinspectionPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw, @Param("names") String names);
 
 
     void updateByStaySid(@Param("patrolInspectionSid") String patrolInspectionSid, @Param("newTime") String newTime, @Param("userName") String userName);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml

@@ -51,8 +51,8 @@
         scm_vehicle_stay_patrolinspection svsp
         <where>
             ${ew.sqlSegment}
-            <if test="name != '' and name != null ">
-                and concat(svsp.mainSid,svsp.patrolInspectionName) LIKE concat('%', #{name}, '%')
+            <if test="names != '' and names != null ">
+                and concat(svsp.mainSid) LIKE concat('%', #{names}, '%')
             </if>
         </where>
         ORDER BY id DESC

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java

@@ -169,10 +169,10 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
         QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = appQueryWrapper(pagerQuery.getParams());
         AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
-        IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getName());
+        IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
         List<AppScmVehicleStayPatrolinspectionPageVo> records = iPage.getRecords();
         for (AppScmVehicleStayPatrolinspectionPageVo record : records) {
-            List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(),useOrgSid);
+            List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), useOrgSid);
 
             if (scmVehicleStayPatrolinspectionVos.size() <= 0) {
                 record.setInspectionDate("无");
@@ -220,7 +220,7 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService<Sc
     }
 
     public void updateByState(String patrolInspectionSid, int i) {
-        baseMapper.updateByState(patrolInspectionSid,i);
+        baseMapper.updateByState(patrolInspectionSid, i);
     }
 
     public void updateState(String stayInspSid) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageQuery.java

@@ -11,7 +11,7 @@ public class StayPatrolinspectionPageQuery implements Query {
     private String userSid;
 
     @ApiModelProperty("优先匹配车架号 存放地点 巡检人员")
-    private String name;
+    private String names;
 
     @ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录")
     private String warehouseSid;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java

@@ -27,8 +27,8 @@ public class VehicleApplyVo implements Vo {
     @JsonProperty("applyName")
     private String createByName;
 
-    @ApiModelProperty(value = "排产类型")
-    @JsonProperty("scheduleType")
+    @ApiModelProperty(value = "采购原因")
+    @JsonProperty("reason")
     private String schedulingType;
 
     @ApiModelProperty(value = "订金合计")