修改问题及切换机构

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java

@@ -88,4 +88,6 @@ public class BaseDiscountpackageDto implements Dto {
 
     @ApiModelProperty("销售车辆列表")
     private List<BaseDiscountpackageVehDto> baseDiscountpackageVehs;
+
+    private String orgPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageQuery.java

@@ -46,4 +46,7 @@ public class BaseDiscountpackageQuery implements Query {
 
     @ApiModelProperty("结束有效期")
     private String getEffectiveEndDate;
+
+    @ApiModelProperty("组织机构全路径sid")
+    private String orgPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufUpdateDto.java

@@ -14,4 +14,6 @@ public class BaseManufUpdateDto implements Dto {
     private static final long serialVersionUID = -2909465832730619504L;
     @ApiModelProperty(value = "厂家认款sid")
     private String sid;
+    @ApiModelProperty("打款状态（0未打款，1已打款，2无需打款）")
+    private String state;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleListQuery.java

@@ -14,4 +14,6 @@ public class BaseMiddleListQuery implements Query {
     private static final long serialVersionUID = 235157485806433620L;
     @ApiModelProperty("销售专员sid")
     private String staffSid;
+    @ApiModelProperty("组织机构sid全路径")
+    private String orgPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java

@@ -70,4 +70,7 @@ public class BaseModelModpriceDto implements Dto {
 
 	@ApiModelProperty("调价申请车型列表")
 	private List<BaseModelModpriceModelDto> baseModelModpriceModels; // 调价申请车型列表
+
+	@ApiModelProperty("组织机构全路径sid")
+	private String orgPath;
 }

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

@@ -480,4 +480,9 @@ public interface BaseVehicleFeign {
     @GetMapping("/getSystem")
     @ResponseBody
     ResultBean<BasePurchSystemVo> getSystem(@RequestParam("sid")String sid);
+
+    @ApiOperation("根据车辆sid获取采购系统信息：采购系统取自车辆表中")
+    @GetMapping("/getSystemVehicle")
+    @ResponseBody
+    ResultBean<BasePurchSystemVo> getSystemVehicle(@RequestParam("sid")String sid);
 }

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

@@ -387,6 +387,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BasePurchSystemVo> getSystemVehicle(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid,List<String> list) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java

@@ -128,4 +128,9 @@ public interface BusVehicleOrderFeign {
     @ResponseBody
     ResultBean<BasePurchSystemVo> getDetails(@RequestParam("sid")String sid);
 
+    @ApiOperation("查询采购系统（部门）sid、采购系统（部门）名称字段:采购系统sid取自表中")
+    @GetMapping("/getDetailsOrder")
+    @ResponseBody
+    ResultBean<BasePurchSystemVo> getDetailsOrder(@RequestParam("sid")String sid);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java

@@ -123,5 +123,10 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BasePurchSystemVo> getDetailsOrder(String sid) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -130,6 +130,10 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             qw.apply(StringUtils.isNotEmpty(effectiveStartDate), "date_format (effectiveDate,'%Y-%m-%d') >= date_format('" + effectiveStartDate + "','%Y-%m-%d')").
                     apply(StringUtils.isNotEmpty(effectiveEndDate), "date_format (effectiveDate,'%Y-%m-%d') <= date_format('" + effectiveEndDate + "','%Y-%m-%d')"
                     );
+            if(StringUtils.isNotBlank(pagerQuery.getOrgPath())){
+                String orgSid = sysStaffOrgFeign.getOrgSidByPath(pagerQuery.getOrgPath()).getData();
+                qw.eq("useOrg",orgSid);
+            }
 
         }
         return qw;
@@ -143,75 +147,61 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
      */
     public ResultBean saveOrUpdateDto(BaseDiscountpackageDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid());
-        if (!orgByStaffSid.getSuccess()) {
-            return rb.setMsg(orgByStaffSid.getMsg());
+        String orgPath = dto.getOrgPath();
+        String orgSid = "";//分公司sid
+        String orgSidPath = "";//申请人组织机构全路径sid
+        if(StringUtils.isNotBlank(orgPath)){
+            orgSidPath = orgPath;
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        }else{
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid());
+            if (!orgByStaffSid.getSuccess()) {
+                return rb.setMsg(orgByStaffSid.getMsg());
+            }
+            //用户的组织全路径
+            orgSidPath = orgByStaffSid.getData().getOrgSidPath();
+            ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getStaffSid());
+            if (stringResultBean.getSuccess()) {
+                orgSid = stringResultBean.getData();
+            }
         }
-        //用户的组织全路径
-        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
         BaseDiscountpackage entity = new BaseDiscountpackage();
-        String orgSid = "";
-        ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getStaffSid());
-        if (stringResultBean.getSuccess()) {
-            orgSid = stringResultBean.getData();
-        }
-        dto.setSid(UUID.randomUUID().toString());
-        BeanUtil.copyProperties(dto, entity);
+        BeanUtil.copyProperties(dto, entity,"sid");
         entity.setUseOrg(orgSid);
         entity.setNodeState("待提交");
         entity.setOrgSidPath(orgSidPath);
-        save(entity);
+        baseMapper.insert(entity);
         List<BaseDiscountpackageVehDto> baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs();
         for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
             BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh();
-            String sid = baseDiscountpackageVeh.getSid();
-            BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh);
-            baseDiscountpackageVeh.setSid(sid);
+            BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh,"sid");
             baseDiscountpackageVeh.setMainSid(entity.getSid());
             baseDiscountpackageVehService.save(baseDiscountpackageVeh);
         }
         return rb.success().setData(entity.getSid());
     }
 
-    /**
-     * 修改欠款提车信息
-     *
-     * @param dto
-     * @param sid
-     * @return
-     */
     @Transactional(rollbackFor = Exception.class)
     public ResultBean updateByDiscountSid(BaseDiscountpackageDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid());
-        if (!orgByStaffSid.getSuccess()) {
-            return rb.setMsg(orgByStaffSid.getMsg());
+        BaseDiscountpackage baseDiscountpackage = fetchBySid(sid);
+        if(baseDiscountpackage == null){
+            return rb.setMsg("该申请不存在");
         }
-        //用户的组织全路径
-        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
-        dto.setOrgSidPath(orgSidPath);
-        this.updateBySid(dto.toMap(), sid);
+        BeanUtil.copyProperties(dto,baseDiscountpackage, "sid","orgSidPath");
+        baseMapper.updateById(baseDiscountpackage);
         baseDiscountpackageVehService.deleteByMainSid(sid);
         List<BaseDiscountpackageVehDto> baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs();
         for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
             BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh();
-            String sid1 = baseDiscountpackageVeh.getSid();
-            BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh);
-            baseDiscountpackageVeh.setSid(sid1);
+            BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh,"sid");
             baseDiscountpackageVeh.setMainSid(sid);
             baseDiscountpackageVehService.save(baseDiscountpackageVeh);
         }
         return rb.success();
     }
 
-    /**
-     * 根据sid批量删除欠款提车单
-     *
-     * @param sids
-     * @return
-     */
     @Transactional(rollbackFor = Exception.class)
     public ResultBean deleteBySids(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
@@ -442,7 +432,10 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
 
     public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
         ResultBean rb = ResultBean.fireFail();
-
+        String orgSidPath = "";
+        if(StringUtils.isNotBlank(dto.getOrgPath())){
+            orgSidPath = dto.getOrgPath();
+        }
         BaseDiscountpackage baseDiscountpackage = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, baseDiscountpackage);
         if (r == 3) {
@@ -453,6 +446,8 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         }
         String businessSid = "";
         //新增修改保存
+        dto.setOrgSidPath(orgSidPath);
+        dto.setOrgPath(orgSidPath);
         if (StringUtils.isBlank(dto.getSid())) {
             ResultBean<String> resultBean = saveOrUpdateDto(dto);
             if (!resultBean.getSuccess()) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.java

@@ -72,5 +72,5 @@ public interface BaseManufactorSubscriptionMapper extends BaseMapper<BaseManufac
     @Update("update base_manufactor_subscription set witMatUrl = #{filePath} where sid = #{sid}")
     int updateWitMatUrl(@Param("filePath") String filePath, @Param("sid") String sid);
 
-    int updatePaymentState(String sid);
+    int updatePaymentState(@Param("sid") String sid,@Param("state") String state);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml

@@ -35,7 +35,7 @@
 
     <update id="updatePaymentState">
         update base_manufactor_subscription
-        set paymentState = 1
+        set paymentState = #{state}
         where sid = #{sid}
     </update>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -321,7 +321,8 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
     public ResultBean updatePaymentState(BaseManufUpdateDto dto) {
         ResultBean resultBean = ResultBean.fireFail();
         String sid = dto.getSid();
-        int i = baseMapper.updatePaymentState(sid);
+        String state = dto.getState();
+        int i = baseMapper.updatePaymentState(sid,state);
         return resultBean.success();
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.java

@@ -73,5 +73,5 @@ public interface BaseMiddlemanMapper extends BaseMapper<BaseMiddleman> {
      */
     IPage<BaseMiddleVo> getMiddleList(IPage<BaseMiddleman> page, @Param(Constants.WRAPPER) QueryWrapper<BaseMiddleman> qw, @Param("name") String name);
 
-    List<BaseMiddleListVo> selectMiddleList(String staffSid);
+    List<BaseMiddleListVo> selectMiddleList(@Param("userSid") String userSid,@Param("orgSid")String orgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml

@@ -74,6 +74,9 @@
     <select id="selectMiddleList" resultType="com.yxt.anrui.base.api.basemiddleman.BaseMiddleListVo">
         select name as middleName, sid as middleSid,middleCode, company
         from base_middleman
-        where createBySid = #{staffSid}
+        where createBySid = #{userSid}
+        <if test="orgSid != null and orgSid != ''">
+            and useOrgSid = #{orgSid}
+        </if>
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@@ -154,8 +154,12 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
         List<BaseMiddleListVo> list = new ArrayList<>();
         //查询用户sid
         ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.selectByStaffsid(staffSid);
+        String orgSid = "";
+        if(StringUtils.isNotBlank(query.getOrgPath())){
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+        }
         if (sysUserVoResultBean.getSuccess()) {
-            list = baseMapper.selectMiddleList(sysUserVoResultBean.getData().getSid());
+            list = baseMapper.selectMiddleList(sysUserVoResultBean.getData().getSid(),orgSid);
             for (BaseMiddleListVo baseMiddleListVo : list) {
                 baseMiddleListVo.setMiddleNameAndCompany(baseMiddleListVo.getMiddleName().concat("-").concat(baseMiddleListVo.getCompany()));
             }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -126,24 +126,31 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
     public ResultBean<String> saveOrUpdateAll(BaseModelModpriceDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
-        //根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
-        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
-        }
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!orgByStaffSid.getSuccess()) {
-            return rb.setMsg(orgByStaffSid.getMsg());
+        String orgPath = dto.getOrgPath();
+        String orgSid = "";
+        String orgSidPath = "";
+        if(StringUtils.isNotBlank(orgPath)){
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            orgSidPath = orgPath;
+        }else{
+            //根据用户sid获取staffSid
+            ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+            if (!userVoResultBean.getSuccess()) {
+                return rb.setMsg(userVoResultBean.getMsg());
+            }
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+            if (!orgByStaffSid.getSuccess()) {
+                return rb.setMsg(orgByStaffSid.getMsg());
+            }
+            //用户的组织全路径
+            orgSidPath = orgByStaffSid.getData().getOrgSidPath();
         }
-        //用户的组织全路径
-        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
+
         List<BaseModelModpriceModelDto> baseModelModpriceModels = dto.getBaseModelModpriceModels();
         if (StringUtils.isBlank(sid)) {//新增
             BaseModelModprice baseModelModprice = new BaseModelModprice();
-            String sid1 = baseModelModprice.getSid();
-            BeanUtil.copyProperties(dto, baseModelModprice);
-            baseModelModprice.setSid(sid1);
+            BeanUtil.copyProperties(dto, baseModelModprice,"sid");
             baseModelModprice.setCreateBySid(dto.getCreateBySid());
             baseModelModprice.setNodeState("待提交");
             baseModelModprice.setOrgSidPath(orgSidPath);
@@ -151,7 +158,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
             for (BaseModelModpriceModelDto modelModpriceModel : baseModelModpriceModels) {
                 BaseModelModpriceModel baseModelModpriceModel = new BaseModelModpriceModel();
                 BeanUtil.copyProperties(modelModpriceModel, baseModelModpriceModel);
-                baseModelModpriceModel.setMainSid(sid1);
+                baseModelModpriceModel.setMainSid(baseModelModprice.getSid());
                 baseModelModpriceModelService.save(baseModelModpriceModel);
             }
             return rb.success().setMsg("保存成功").setData(baseModelModprice.getSid());
@@ -160,8 +167,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
         if (baseModelModprice == null) {
             return rb.setMsg("该车型调价单不存在");
         }
-        dto.setOrgSidPath(orgSidPath);
-        updateBySid(dto.toMap(), sid);
+        BeanUtil.copyProperties(dto, baseModelModprice,"sid","orgSidPath");
+        baseMapper.updateById(baseModelModprice);
         baseModelModpriceModelService.delByMainSid(sid);
         for (BaseModelModpriceModelDto modelModpriceModel : baseModelModpriceModels) {
             BaseModelModpriceModel baseModelModpriceModel = new BaseModelModpriceModel();
@@ -216,6 +223,11 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
 
     public ResultBean submitBaseModelModPrice(SubmitBaseModelModPriceDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        String orgPath = dto.getOrgPath();
+        String orgSidPath = "";
+        if(StringUtils.isNotBlank(orgPath)){
+            orgSidPath = orgPath;
+        }
         BaseModelModprice baseModelModprice = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, baseModelModprice);
         if (r == 3) {
@@ -225,6 +237,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
             return rb.setMsg("操作失败!提交的数据不一致");
         }
         //新增修改保存
+        dto.setOrgSidPath(orgSidPath);
         ResultBean<String> resultBean = saveOrUpdateAll(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());

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

@@ -1318,6 +1318,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.getSystem(sid);
     }
 
+    @Override
+    public ResultBean<BasePurchSystemVo> getSystemVehicle(String sid) {
+        return baseVehicleService.getSystemVehicle(sid);
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid, List<String> list) {
         return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list);

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

@@ -3571,4 +3571,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         BasePurchSystemVo basePurchSystemVo = baseMapper.getSystem(baseVehicle.getUseOrgSid(), baseVehicle.getPurchaseSystemSid());
         return rb.success().setData(basePurchSystemVo);
     }
+
+    public ResultBean<BasePurchSystemVo> getSystemVehicle(String sid) {
+        ResultBean<BasePurchSystemVo> rb = ResultBean.fireFail();
+        BaseVehicle baseVehicle = fetchBySid(sid);
+        BasePurchSystemVo basePurchSystemVo = new BasePurchSystemVo();
+        basePurchSystemVo.setSid(baseVehicle.getPurchaseSystemSid());
+        basePurchSystemVo.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
+        return rb.success().setData(basePurchSystemVo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@@ -227,4 +227,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
         return busVehicleOrderService.getDetails(sid);
     }
 
+    @Override
+    public ResultBean<BasePurchSystemVo> getDetailsOrder(String sid) {
+        return busVehicleOrderService.getDetailsOrder(sid);
+    }
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -550,4 +550,13 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         BasePurchSystemVo vo = baseMapper.getDetails(busVehicleApply.getCreateOrgSid(),busVehicleApply.getOrgDeptSid());
         return rb.success().setData(vo);
     }
+
+    public ResultBean<BasePurchSystemVo> getDetailsOrder(String sid) {
+        ResultBean<BasePurchSystemVo> rb = ResultBean.fireFail();
+        BusVehicleApply busVehicleApply = baseMapper.selectApply(sid);
+        BasePurchSystemVo vo = new BasePurchSystemVo();
+        vo.setSid(busVehicleApply.getOrgDeptSid());
+        vo.setPurchaseSystemName(busVehicleApply.getOrgDeptName());
+        return rb.success().setData(vo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
 import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerFileDDto;
@@ -160,6 +161,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     @Autowired
     private BaseVehicleService baseVehicleService;
 
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+
     private QueryWrapper<CommonContract> createQueryWrapper(CommonContractQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -1663,7 +1667,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //身份证号
         String idNo = crmCustomerTempVo.getIDNumber();
         if (StringUtils.isBlank(idNo)) {
-            return rb.setMsg("请先在客户洽谈的基础信息中补全客户的身份证号");
+            return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
+//            return rb.setMsg("请先在客户洽谈的基础信息中补全客户的身份证号");
         }
         //查询销售订单的车型信息
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
@@ -1751,7 +1756,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             if (invoicingDetailsVoResultBean.getData() != null) {
                 map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
             } else {
-                return rb.setMsg("请先完善公司开票信息");
+                return rb.setMsg("请与出纳人员联系完善开票信息");
             }
         }
         map.put("customerName", customerName);
@@ -1784,7 +1789,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             });*/
             PrintConfirmVo printConfirmVo = null;
             String urlAll = "";
-            /*Future<String> future2 = pool.submit(() -> {
+           /* Future<String> future2 = pool.submit(() -> {
                 return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
             });
             Future<String> future2_2 = pool.submit(() -> {
@@ -2028,8 +2033,18 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
 
                     }
                     //添加推送至款项确认的应收未收明细中
-                    /* if ("现车".equals(appOrderDetailsVo.getOrderType())) {*/
                     List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
+                    //更新销售订单的临时号
+                    if("2".equals(appOrderDetailsVo.getPayTypeKey())){//贷款
+                        for(int i = 0; i < vinList.size(); i++){
+                            //销售订单中车辆表的sid
+                            String salesOrderVinSid = vinList.get(i).getSid();
+                            String temporaryNum = String.format("%02d", i + 1);
+                            String temporaryNo = commonContract.getContractNo()+temporaryNum;
+                            //更新临时号
+                            ResultBean busSalesOrderResultBean = busSalesOrderVehicleFeign.updateTemporaryNo(salesOrderVinSid,temporaryNo);
+                        }
+                    }
                     //查询是否是结转金额，如果是，则订金金额为补交金额/台数。若为现金则为单台订金
                     String key = depositInfo.getDepositTypeKey();
                     BigDecimal bigDecimalKeyAll = new BigDecimal("0");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -124,7 +124,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (nowCarList.size() > 0) {
             String linkSid = nowCarList.get(0).getLinkSid();
             //根据车辆sid查询采购系统sid和采购系统名称
-            ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(linkSid);
+            ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystemVehicle(linkSid);
             if (vehicleSelectVoResultBean.getData() != null) {
                 BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
                 //采购系统sid

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -131,7 +131,7 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
         if (readyCarList.size() > 0) {
             String linkSid = readyCarList.get(0).getLinkSid();
             //根据采购订单查询采购系统的sid和采购系统的名称
-            ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetails(linkSid);
+            ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetailsOrder(linkSid);
             if(getDetails.getData() != null){
                 BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData();
                 //采购系统sid

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.crm.api.crmcustomertemp;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -14,4 +15,6 @@ public class CrmCustomerTempListQuery implements Query {
 
     private String userSid;
     private String staffSid;
+    @ApiModelProperty("组织机构全路径sid")
+    private String orgPath;
 }

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

@@ -177,19 +177,24 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         CrmCustomerTempQuery query = pq.getParams();
         QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>();
         String userSid = query.getUserSid();
-        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
-        String sid = "";
-        if (sysOrganizationVo != null) {
-            sid = sysOrganizationVo.getSid();
-        }
+        //根据用户的组织机构查询分公司
         String orgSidPath = query.getOrgSidPath();
+        String orgSid = "";//分公司sid
+        if(StringUtils.isNotBlank(orgSidPath)){
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData();
+        }else{
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+            if (sysOrganizationVo != null) {
+                orgSid = sysOrganizationVo.getSid();
+            }
+        }
         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("cct.createOrgSid", sid);
+            qw.eq("cct.createOrgSid", orgSid);
         }
         if (StringUtils.isNotBlank(query.getCustomerTypeKey())) {
             qw.eq("cct.customerTypeKey", query.getCustomerTypeKey());
@@ -1139,7 +1144,13 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         ResultBean<List<CrmCustomerTempListVo>> rb = ResultBean.fireFail();
         String staffSid = query.getStaffSid();
         //根据用户sid查询分公司sid
-        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+//        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+        String orgSid = "";
+        if(StringUtils.isNotBlank(query.getOrgPath())){
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+        }else{
+            orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+        }
         List<CrmCustomerTempListVo> list = baseMapper.selectCustomerList(orgSid, staffSid);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankQuery.java

@@ -57,4 +57,7 @@ public class FinManufacturerBankQuery implements Query {
     @ApiModelProperty("用户sid")
     private String userSid;
 
+    @ApiModelProperty("组织机构全路径sid")
+    private String orgPath;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@@ -31,11 +31,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery;
-import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo;
 import com.yxt.anrui.fin.api.finmanufacturerbank.*;
-import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt;
-import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.anrui.fin.biz.kingdee.cnbankcnt.CNBankcntService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -50,7 +47,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -84,11 +80,17 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
         QueryWrapper<FinManufacturerBank> qw = new QueryWrapper<>();
         FinManufacturerBankQuery params = pq.getParams();
         if (params != null) {
-            String userSid = params.getUserSid();
-            if (StringUtils.isNotBlank(userSid)) {
-                ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
-                qw.eq("useOrgSid", resultBean.getData());
+            if(StringUtils.isNotBlank(params.getOrgPath())){
+                String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
+                qw.eq("useOrgSid", orgSid);
+            }else{
+                String userSid = params.getUserSid();
+                if (StringUtils.isNotBlank(userSid)) {
+                    ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+                    qw.eq("useOrgSid", resultBean.getData());
+                }
             }
+
             if (StringUtils.isNotBlank(params.getDueBankKey())) {
                 qw.eq("dueBankKey", params.getDueBankKey());
             }

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

@@ -56,7 +56,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -227,6 +226,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 //更新厂家认款状态
                 BaseManufUpdateDto baseManufUpdateDto = new BaseManufUpdateDto();
                 baseManufUpdateDto.setSid(finPaymentrecord.getBusSid());
+                baseManufUpdateDto.setState("1");
                 ResultBean resultBean = baseManufactorSubscriptionFeign.updatePaymentState(baseManufUpdateDto);
             }
 
@@ -659,6 +659,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 //更新厂家认款状态
                 BaseManufUpdateDto baseManufUpdateDto = new BaseManufUpdateDto();
                 baseManufUpdateDto.setSid(finPaymentrecord.getBusSid());
+                baseManufUpdateDto.setState("2");
                 ResultBean resultBean = baseManufactorSubscriptionFeign.updatePaymentState(baseManufUpdateDto);
             }
         }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListQuery.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.portal.api.sysorganization;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,4 +14,6 @@ public class SysOrganizationListQuery implements Query {
     private static final long serialVersionUID = 8657016527420117948L;
 
     private String userSid;
+    @ApiModelProperty("当前组织机构全路径sid")
+    private String orgPath;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -552,8 +552,16 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
         ResultBean<List<SysOrganizationListVo>> rb = ResultBean.fireFail();
         //根据用户sid查询分公司sid
-        String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
-        String orgSid = getOrgSid(orgDeptSid);
+        /*String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
+        String orgSid = getOrgSid(orgDeptSid);*/
+        String orgSid = "";
+        String orgDeptSid = "";
+        if(StringUtils.isNotBlank(query.getOrgPath())){
+            orgSid = sysStaffOrgService.getOrgSidByPath(query.getOrgPath()).getData();
+        }else{
+            orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
+            orgSid = getOrgSid(orgDeptSid);
+        }
         //根据分公司名称查询销售部门的部门
         List<SysOrganizationListVo> sysOrganizationListVos = baseMapper.selectOrgList(orgSid);
         sysOrganizationListVos.removeAll(Collections.singleton(null));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -44,7 +44,6 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
@@ -193,7 +192,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
         IPage<ScmVehicleEnterlibraryPageQuery> page = PagerUtil.queryToPage(pq);
         ScmVehicleEnterlibraryPageQuery params = pq.getParams();
         if(StringUtils.isNotBlank(params.getOrgPath())){
-            String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(pq.getParams().getUserSid()).getData();
+            String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
             params.setUseOrgSid(useOrgSid);
         }else{
             String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java

@@ -32,6 +32,7 @@ public class NowCarVo implements Vo {
     private String topSid;
 
     @ApiModelProperty("采购系统sid")
+    @JsonProperty("paySystemId")
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     @JsonProperty("paySystem")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java

@@ -38,6 +38,7 @@ public class ReadyCarVo implements Vo {
     private String topSid;
 
     @ApiModelProperty("采购系统sid")
+    @JsonProperty("paySystemId")
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     @JsonProperty("paySystem")