问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleCrmQuery.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/22 8:49
+ * @Description
+ */
+@Data
+public class BaseVehicleCrmQuery implements Query {
+
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
+    @ApiModelProperty(value = "组织全路径")
+    private String orgSidPath;
+    @ApiModelProperty(value = "库存状态key")
+    private String vehicleState;
+    @ApiModelProperty(value = "车型")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "配置")
+    private String configName;
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("车身颜色key")
+    private String carColorKey;
+    @ApiModelProperty("存放地点名称")
+    private String location; // 存放地点名称
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleCrmVo.java

@@ -0,0 +1,38 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/22 8:49
+ * @Description
+ */
+@Data
+public class BaseVehicleCrmVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty(value = "库存状态key")
+    private String vehicleState;
+    @ApiModelProperty(value = "库存状态value")
+    private String vehicleStateValue;
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrand;
+    @ApiModelProperty(value = "品牌名称")
+    private String brandName;
+    @ApiModelProperty(value = "车型")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
+    @ApiModelProperty("车身颜色key")
+    private String carColorKey;
+    @ApiModelProperty("车身颜色value")
+    private String carColor;
+    @ApiModelProperty("存放地点名称")
+    private String location; // 存放地点名称
+    @ApiModelProperty("存放地点sid")
+    private String locationSid ;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -271,6 +271,10 @@ public interface BaseVehicleFeign {
     @PostMapping("/vehicleReturnList")
     ResultBean<PagerVo<BaseVehicleReturnVo>> vehicleReturnList(@RequestBody PagerQuery<BaseVehicleReturnQuery> pagerQuery);
 
+    @ApiOperation("客户查询选择车辆分页列表")
+    @PostMapping("/vehicleCrmList")
+    ResultBean<PagerVo<BaseVehicleCrmVo>> vehicleCrmList(@RequestBody PagerQuery<BaseVehicleCrmQuery> pagerQuery);
+
     @ApiOperation("采购退库更新状态")
     @PostMapping("/updateByVinNo")
     ResultBean updateByVinNo(@RequestBody BaseVehicleUpdateQuery baseVehicleUpdateQuery);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -156,6 +156,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehicleCrmVo>> vehicleCrmList(PagerQuery<BaseVehicleCrmQuery> pagerQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean updateByVinNo(BaseVehicleUpdateQuery baseVehicleUpdateQuery) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutQuery.java

@@ -36,6 +36,8 @@ public class BaseVehicleOutQuery implements Query {
 
     @ApiModelProperty("销售专员")
     private String staffSid;
+    @ApiModelProperty("内部编码")
+    private String insideCode;
     @ApiModelProperty(value = "组织全路径")
     private String orgSidPath;
 }

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

@@ -472,4 +472,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     @Update("update base_vehicle set contractPrice = #{witPinMoney},costPrice = #{witPinMoney} where vinNo = #{vinNo} and useOrgSid = #{callInOrgSid}")
     void updateConAndCostPrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callInOrgSid") String callInOrgSid);
+
+    IPage<BaseVehicleCrmVo> vehicleCrmPageList(IPage<BaseVehicleCrmVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

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

@@ -1291,4 +1291,22 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="vehicleCrmPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleCrmVo">
+        SELECT bv.sid,
+        bv.vehicleStateValue,
+        <!--品牌名称-->
+        bv.carBrandName as brandName,
+        <!--车型名称-->
+        bv.modelName as vehicleAlias,
+        <!--车架号-->
+        bv.vinNo,
+        <!--颜色-->
+        bmc.carColor,
+        <!--存放地点-->
+        bv.locationName as location
+        FROM base_vehicle bv
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

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

@@ -758,6 +758,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehicleCrmVo>> vehicleCrmList(PagerQuery<BaseVehicleCrmQuery> pagerQuery) {
+        ResultBean<PagerVo<BaseVehicleCrmVo>> rb = ResultBean.fireFail();
+        PagerVo<BaseVehicleCrmVo> pv = baseVehicleService.vehicleCrmList(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean updateByVinNo(BaseVehicleUpdateQuery baseVehicleUpdateQuery) {
         return baseVehicleService.updateByVinNo(baseVehicleUpdateQuery);

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

@@ -1435,6 +1435,49 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return pv1;
     }
 
+    public PagerVo<BaseVehicleCrmVo> vehicleCrmList(PagerQuery<BaseVehicleCrmQuery> pagerQuery) {
+        IPage<BaseVehicleCrmVo> page = vehicleCrmPageList(pagerQuery);
+        PagerVo<BaseVehicleCrmVo> pv = new PagerVo<>();
+        PagerVo<BaseVehicleCrmVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return pv1;
+    }
+
+    private IPage<BaseVehicleCrmVo> vehicleCrmPageList(PagerQuery<BaseVehicleCrmQuery> pagerQuery) {
+        IPage<BaseVehicleCrmVo> page = PagerUtil.queryToPage(pagerQuery);
+        BaseVehicleCrmQuery params = pagerQuery.getParams();
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        String orgSidPath = params.getOrgSidPath();
+        SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
+        String orgLevelKey = data.getOrgLevelKey();
+        if ("2".equals(orgLevelKey)) {
+            orgSidPath = orgSidPath.substring(0, 73);
+            qw.like("so.orgSidPath", orgSidPath);
+        } else if ("3".equals(orgLevelKey)) {
+            qw.eq("bv.createOrgSid", params.getCreateOrgSid());
+        }
+        qw.eq("bv.isDelete", "0");
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState",VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState",VehicleState.StockEnum.DR_STOCK.getCode()));
+        if (StringUtils.isNotBlank(params.getVehicleState())){
+            qw.eq("bv.vehicleState",params.getVehicleState());
+        }
+        if (StringUtils.isNotBlank(params.getVehicleAlias())){
+            qw.like("bv.modelName",params.getVehicleAlias());
+        }
+        if (StringUtils.isNotBlank(params.getConfigName())){
+            qw.like("bv.configName",params.getConfigName());
+        }
+        if (StringUtils.isNotBlank(params.getVinNo())){
+            qw.like("bv.vinNo",params.getVinNo());
+        }
+        if (StringUtils.isNotBlank(params.getCarColorKey())){
+            qw.eq("bmc.carColorKey",params.getCarColorKey());
+        }
+        if (StringUtils.isNotBlank(params.getLocation())){
+            qw.like("bv.locationName",params.getLocation());
+        }
+        return baseMapper.vehicleCrmPageList(page, qw);
+    }
+
     private IPage<BaseVehicleReturnVo> vehicleReturnPageList(PagerQuery<BaseVehicleReturnQuery> pagerQuery) {
         IPage<BaseVehicleReturnVo> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BaseVehicle> qw = vehicleReturnWrapper(pagerQuery.getParams());
@@ -3134,4 +3177,5 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public void updateConAndCostPrice(String witPinMoney, String vinNo, String callInOrgSid) {
         baseMapper.updateConAndCostPrice(witPinMoney, vinNo, callInOrgSid);
     }
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -336,11 +336,17 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             if (StringUtils.isNotBlank(params.getStaffSid())) {
                 qw.eq("bvo.staffSid", params.getStaffSid());
             }
+            //内部编码
+            if (StringUtils.isNotBlank(params.getInsideCode())){
+                qw.like("bv.insideCode",params.getInsideCode());
+            }
+            qw.orderByDesc("bvo.saleDate");
         }
         IPage<BaseVehicleOutVo> pagging = baseMapper.selectPageVo(page, qw);
         for (BaseVehicleOutVo record : pagging.getRecords()) {
             String createOrgSid = record.getCreateOrgSid();
             String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
+            record.setVinNo(record.getVinNo().substring(record.getVinNo().length() - 8));
             record.setCreateOrgName(createorgName);
         }
         PagerVo<BaseVehicleOutVo> p = PagerUtil.pageToVo(pagging, null);

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -55,10 +55,14 @@ public interface CrmCustomerTempFeign {
     @PostMapping("/listPageByOrgPathSid")
     public ResultBean<PagerVo<CrmCustomerTempVo>> listPageByOrgPathSid(@RequestBody PagerQuery<CrmCustomerTempQuery> pq);
 
-    @ApiOperation("推送财务客户")
+    @ApiOperation("推送财务客户-否")
     @PostMapping("/sendFinCustomer")
     public ResultBean sendFinCustomer(@RequestBody String[] customerSids);
 
+    @ApiOperation("推送财务客户-是")
+    @PostMapping("/sendFinCustomerTrue")
+    public ResultBean sendFinCustomerTrue(@RequestBody List<CrmCustomerTempToFin> crmCustomerTempToFins);
+
     @ApiOperation("根据条件查询所有数据列表")
     @PostMapping("/listAll")
     public ResultBean<List<CrmCustomerTempVo>> listAll(@RequestBody CrmCustomerTempQuery query);

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -41,6 +41,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean sendFinCustomerTrue(List<CrmCustomerTempToFin> crmCustomerTempToFins) {
+		return null;
+	}
+
 	@Override
     public ResultBean<List<CrmCustomerTempVo>> listAll(CrmCustomerTempQuery query){
 		ResultBean rb = ResultBean.fireFail();

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempToFin.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-crm(客户管理) <br/>
+ * File: CrmCustomerTempVo.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo <br/>
+ * Description: 潜在客户信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-01-12 11:21:16 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class CrmCustomerTempToFin implements Vo {
+
+    @ApiModelProperty("潜在客户sid")
+    private String sid;
+	@ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -78,6 +78,11 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerTempService.sendFinCustomer(customerSids);
     }
 
+    @Override
+    public ResultBean sendFinCustomerTrue(List<CrmCustomerTempToFin> crmCustomerTempToFins) {
+        return crmCustomerTempService.sendFinCustomerTrue(crmCustomerTempToFins);
+    }
+
     @Override
     public ResultBean<List<CrmCustomerTempVo>> listAll(@RequestBody CrmCustomerTempQuery query) {
         ResultBean rb = ResultBean.fireFail();

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -1145,4 +1145,22 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         finKingDeeFeign.draftBdCustomers(bdCustomers);
         return rb.success();
     }
+
+    public ResultBean sendFinCustomerTrue(List<CrmCustomerTempToFin> crmCustomerTempToFins) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BdCustomer> bdCustomers = new ArrayList<>();
+        String sid = crmCustomerTempToFins.get(0).getSid();
+        CrmCustomerTemp crmCustomerTemp = fetchBySid(sid);
+        String createOrgSid = crmCustomerTemp.getCreateOrgSid();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+        for (CrmCustomerTempToFin crmCustomerTempToFin : crmCustomerTempToFins) {
+            BdCustomer bdCustomer = new BdCustomer();
+            bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+            bdCustomer.setFName(crmCustomerTemp.getName() + crmCustomerTempToFin.getVinNo().substring(crmCustomerTempToFin.getVinNo().length()-8));
+            bdCustomer.setFNumber(HanZiConverterPinYin.getPinYinFirst(crmCustomerTemp.getName()) + crmCustomerTempToFin.getVinNo().substring(crmCustomerTempToFin.getVinNo().length()-8));
+            bdCustomers.add(bdCustomer);
+        }
+        finKingDeeFeign.draftBdCustomers(bdCustomers);
+        return rb.success();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -356,7 +356,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         //获取审批编号
         BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(finPaymentrecord.getApplySid()).getData();
         BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(finPaymentrecord.getApplySid()).getData();
-        if (baseOutsourcingApplicationDetailsVo != null) {
+        if (StringUtils.isNotBlank(baseOutsourcingApplicationDetailsVo.getApplicationCode())) {
             dataMap.put("applyCode", baseOutsourcingApplicationDetailsVo.getApplicationCode());
             //获取审批记录
             FlowRecordVo flowRecordVo = flowableFeign.flowRecord(baseOutsourcingApplicationDetailsVo.getProcInstSid(), null).getData();
@@ -375,7 +375,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             if (contract != null) {
                 dataMap.put("fileName", contract.getFileName());
             }
-        } else if (busVehicleApplyDetailsVo != null) {
+        } else if (StringUtils.isNotBlank(busVehicleApplyDetailsVo.getSid())) {
             dataMap.put("applyCode", busVehicleApplyDetailsVo.getApplicationCode());
             //获取审批记录
             FlowRecordVo flowRecordVo = flowableFeign.flowRecord(busVehicleApplyDetailsVo.getProcInstId(), null).getData();

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.biz.scmvehrebate;
 
 import com.yxt.anrui.scm.api.scmvehrebate.*;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -95,8 +96,10 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
 	@Override
 	public ResultBean update(ScmVehRebateVehDto dto) {
 		ResultBean rb = ResultBean.fireFail();
-		if (dto.getState().equals("1")){
+		if (StringUtils.isNotBlank(dto.getState())){
-			dto.setState("3");
+			if (dto.getState().equals("1")){
+				dto.setState("3");
+			}
 		}
 		scmVehRebateService.updateBySid(dto,dto.getSid());
 		return rb.success().setMsg("修改成功");