Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageApplyDto.java

@@ -78,6 +78,8 @@ public class AppDiscountpackageApplyDto implements Dto {
     private String model; // 车型名称
 	@ApiModelProperty("台数")
     private String number; // 台数
+    @ApiModelProperty("台数")
+    private String carNumber; // 台数
 	@ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
 	@ApiModelProperty("环节定义的sid")
@@ -92,16 +94,11 @@ public class AppDiscountpackageApplyDto implements Dto {
     private String orgSidPath; // 申请人组织路径
     @ApiModelProperty("备注")
     private String remarks; // 备注
-//    @ApiModelProperty("合同sid")
-//    private String contractSid;
-//    @ApiModelProperty("车型sid")
-//    private String modelSid;
-//    @ApiModelProperty("配置sid")
-//    private String configSid;
-//    @ApiModelProperty("销售订单sid")
-//    private String saleOrderSid;
-//    @ApiModelProperty("成交价")
-//    private String price;
     @ApiModelProperty("优惠包列表")
     private List<AppDiscountpackagelistDto> discountPackageList; // 优惠包列表
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgPath; // 申请人组织路径
+    private String procInsId;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDetailsVo.java

@@ -102,6 +102,12 @@ public class BaseDiscountpackageApplyDetailsVo implements Vo {
 //    private String saleOrderSid;
     @ApiModelProperty("优惠包列表")
     private List<BaseDiscountpackagelistDto> discountPackageList;
+    @ApiModelProperty("申请人组织路径")
+    private String orgPath; // 申请人组织路径
+    @ApiModelProperty("流程实例的sid")
+    private String procInsId; // 流程实例的sid
+    @ApiModelProperty("台数")
+    private String carNumber; // 台数
 //    @ApiModelProperty("成交价")
 //    private String price;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java

@@ -69,7 +69,7 @@ public interface BaseDiscountpackageApplyFeign {
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     @ResponseBody
-    public ResultBean<PagerVo<BaseDiscountpackageApplyVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackageApplyQuery> pq);
+    public ResultBean<PagerVo<BaseDiscountpackageApplyVo>>  listPage(@RequestBody PagerQuery<BaseDiscountpackageApplyQuery> pq);
 
     @ApiOperation("新增或修改")
     @PostMapping("/save")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/flow/BaseDiscountpackageApplyCompleteDto.java

@@ -29,7 +29,6 @@ public class BaseDiscountpackageApplyCompleteDto implements Dto {
     @NotBlank(message = "参数错误：taskId")
     private String taskId;
     @ApiModelProperty(value = "流程id")
-    @NotBlank(message = "参数错误：instanceId")
     private String instanceId;
     @ApiModelProperty(value = "意见")
     @NotBlank(message = "参数错误：comment")
@@ -39,6 +38,10 @@ public class BaseDiscountpackageApplyCompleteDto implements Dto {
     private String businessSid;
     @ApiModelProperty(value = "分支字段及业务字段")
     private Map<String, Object> formVariables;
+    @ApiModelProperty(value = "用户全路径sid")
+    private String orgPath;
+    @ApiModelProperty(value = "流程id")
+    private String procInsId;
 //    @ApiModelProperty("调账车辆列表")
 //    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/AppDiscountpackagelistDto.java

@@ -50,19 +50,19 @@ public class AppDiscountpackagelistDto implements Dto {
 
     private String sid; // sid
 
-	@ApiModelProperty("价值")
+    @ApiModelProperty("价值")
     private String price; // 价值
-	@ApiModelProperty("数量")
+    @ApiModelProperty("数量")
     private String number; // 数量
-	@ApiModelProperty("说明")
+    @ApiModelProperty("说明")
     private String packageExplain; // 说明
-	@ApiModelProperty("优惠表申请sid")
+    @ApiModelProperty("优惠表申请sid")
     private String discountSid; // 优惠表申请sid
-	@ApiModelProperty("总价值")
+    @ApiModelProperty("总价值")
     private String totalPrice; // 总价值
-	@ApiModelProperty("优惠包名称")
+    @ApiModelProperty("优惠包名称")
     private String discountName; // 优惠包名称
-
+    @ApiModelProperty("说明")
-
+    private String explain; // 说明
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractListVo.java

@@ -18,6 +18,8 @@ public class AppCommonContractListVo implements Vo {
 
     @ApiModelProperty("合同sid")
     private String contractSid;
+    @ApiModelProperty("订单sid")
+    private String saleOrderSid;
     @ApiModelProperty("合同编号")
     private String contractId;
     @ApiModelProperty("客户名称")
@@ -28,8 +30,13 @@ public class AppCommonContractListVo implements Vo {
     private String modelSid;
     @ApiModelProperty("配置sid")
     private String configSid;
+    @ApiModelProperty("车型对应组织路径")
+    private String modelOrgPath;
     @ApiModelProperty("车辆台数")
-    private String carNum;
+    private String carNumber;
-    @ApiModelProperty("成交价")
+    @ApiModelProperty("总价值")
-    private String price;
+    private String discountAllPrice;
+    @ApiModelProperty("合同审核日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date approvedDate;
 }

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

@@ -100,5 +100,6 @@
         WHERE useOrg = #{userOrg}
           AND curdate() <= effectiveDate
           AND nodeState = '已办结'
+          and salesPolicyKey = '0002'
     </select>
 </mapper>

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

@@ -419,6 +419,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         }
         qw.eq("salesPolicyKey", "0002");
         qw.eq("nodeState", "已办结");
+        qw.apply("effectiveDate > now()");
         List<AppBaseDiscountpackageVo> voList = baseMapper.getAppPackage(qw);
         if (voList.isEmpty()) {
             voList = new ArrayList<>();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyRest.java

@@ -38,6 +38,7 @@ import com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistSer
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.base.utils.PagerUtil;
+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;
@@ -144,11 +145,23 @@ public class BaseDiscountpackageApplyRest implements BaseDiscountpackageApplyFei
 
     @Override
     public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
+        if (StringUtils.isNotBlank(dto.getProcInsId())) {
+            dto.setInstanceId(dto.getProcInsId());
+        }
+        if (StringUtils.isNotBlank(dto.getTaskId())) {
+            dto.setTaskId(dto.getTaskId());
+        }
         return baseDiscountpackageApplyService.submitRecordApplication(dto);
     }
 
     @Override
     public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
+        if (StringUtils.isNotBlank(dto.getOrgPath())) {
+            dto.setOrgSidPath(dto.getOrgPath());
+        }
+        if (StringUtils.isNotBlank(dto.getProcInsId())) {
+            dto.setInstanceId(dto.getProcInsId());
+        }
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(dto, bv);
         bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java

@@ -54,6 +54,10 @@ import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDetailsVo;
+import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
@@ -107,6 +111,10 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
     private SysUserFeign userFeign;
     @Autowired
     private BusDiscountpackageHandoverFeign busDiscountpackageHandoverFeign;
+    @Autowired
+    private SysStaffinfoFeign sysStaffinfoFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     private QueryWrapper<BaseDiscountpackageApply> createQueryWrapper(BaseDiscountpackageApplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -131,10 +139,10 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         }
         if (StringUtils.isNotBlank(query.getType())) {
             if ("2".equals(query.getType())) {
-                qw.and(wrapper -> wrapper.ne("nodeState", "待提交").ne("nodeState", "销售专员申请"));
+                qw.and(wrapper -> wrapper.ne("nodeState", "待提交").ne("nodeState", "发起申请"));
             }
             if ("1".equals(query.getType())) {
-                qw.and(wrapper -> wrapper.eq("nodeState", "待提交").or().eq("nodeState", "销售专员申请"));
+                qw.and(wrapper -> wrapper.eq("nodeState", "待提交").or().eq("nodeState", "发起申请"));
             }
         }
         qw.apply(StringUtils.isNotEmpty(query.getDate()), "date_format (applyDate,'%Y-%m-%d') = date_format('" + query.getDate() + "','%Y-%m-%d')");
@@ -152,7 +160,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
             for (BaseDiscountpackageApplyVo applyVo : records) {
                 applyVo.setShowHandleBtn(true);
                 if (StringUtils.isNotBlank(applyVo.getNodeState())) {
-                    if (!("待提交".equals(applyVo.getNodeState()) || "销售专员申请".equals(applyVo.getNodeState()))) {
+                    if (!("待提交".equals(applyVo.getNodeState()))) {
                         applyVo.setShowHandleBtn(false);
                     }
                 }
@@ -204,6 +212,9 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         if (StringUtils.isNotBlank(entity.getCreateBySid())) {
             vo.setUserSid(entity.getCreateBySid());
         }
+        vo.setCarNumber(entity.getNumber());
+        vo.setOrgPath(entity.getOrgSidPath());
+        vo.setProcInsId(entity.getProcInstId());
         //根据优惠包申请sid查询对应优惠包列表
         List<BaseDiscountpackagelistDto> dtoList = baseDiscountpackagelistService.fetchDetailsByDiscountSid(sid);
         vo.setDiscountPackageList(dtoList);
@@ -231,17 +242,44 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
 
     public ResultBean<String> saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isNotBlank(dto.getCarNumber())) {
+            dto.setNumber(dto.getCarNumber());
+        }
         //根据用户sid获取staffSid
-          ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
         if (!userVoResultBean.getSuccess()) {
             return rb.setMsg(userVoResultBean.getMsg());
         }
+        if (StringUtils.isBlank(dto.getApplyName())) {
+            String staffSid = userVoResultBean.getData().getStaffSid();
+            ResultBean<SysStaffinfoDetailsVo> staffinfoDetailsVoResultBean = sysStaffinfoFeign.fetchBySid(staffSid);
+            if (staffinfoDetailsVoResultBean.getSuccess()) {
+                SysStaffinfoDetailsVo data = staffinfoDetailsVoResultBean.getData();
+                if (null != data) {
+                    dto.setApplyName(data.getName());
+                }
+            }
+        }
         //根据staffSid获取用户的组织全路径
         ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
         if (!staffOrgResultBean.getSuccess()) {
             return rb.setMsg(staffOrgResultBean.getMsg());
         }
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        if (StringUtils.isBlank(dto.getCreateOrgSid()) && StringUtils.isBlank(dto.getUseOrgSid()) && StringUtils.isBlank(dto.getCreateOrgName()) && StringUtils.isBlank(dto.getUseOrgName())) {
+            ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgSidPath);
+            if (orgSidByPath.getSuccess()) {
+                String userOrgPath = orgSidByPath.getData();
+                ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(userOrgPath);
+                if (resultBean.getSuccess()) {
+                    SysOrganizationVo organizationVo = resultBean.getData();
+                    dto.setCreateOrgName(organizationVo.getName());
+                    dto.setUseOrgName(organizationVo.getName());
+                    dto.setCreateOrgSid(userOrgPath);
+                    dto.setUseOrgSid(userOrgPath);
+                }
+            }
+        }
         String dtoSid = dto.getSid();
         List<AppDiscountpackagelistDto> appDiscountpackagelists = dto.getDiscountPackageList();
         if (StringUtils.isBlank(dtoSid)) {
@@ -252,6 +290,9 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
             String sid = this.insertByDto(baseDiscountpackageApplyDto);
             if (null != appDiscountpackagelists && appDiscountpackagelists.size() > 0) {
                 for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
+                    if (StringUtils.isNotBlank(appDiscountpackagelist.getExplain())) {
+                        appDiscountpackagelist.setPackageExplain(appDiscountpackagelist.getExplain());
+                    }
                     BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
                     BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
                     baseDiscountpackagelist.setDiscountSid(sid);
@@ -268,7 +309,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         // baseDiscountpackagelistService.delByDiscountSid(dtoSid);
         BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
         BeanUtil.copyProperties(dto, baseDiscountpackageApplyDto);
-        baseDiscountpackageApplyDto.setOrgSidPath(dto.getOrgSidPath());
+        baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
         this.updateByDto(baseDiscountpackageApplyDto);
         if (null != appDiscountpackagelists && appDiscountpackagelists.size() > 0) {
             for (AppDiscountpackagelistDto packageList : appDiscountpackagelists) {
@@ -321,8 +362,8 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         Map<String, Object> appMap = new HashMap<>();
         //若有网关，则赋值网关中判断的字段。
         variables.put("businessSid", businessSid);
-        appMap.put("businessSid", businessSid);
+        appMap.put("sid", businessSid);
-        variables.put("appMap", appMap);
+        variables.put("app", appMap);
         BaseDiscountpackageApply baseDiscountpackageApply1 = fetchBySid(businessSid);
         //用户的部门全路径sid
         bv.setOrgSidPath(baseDiscountpackageApply1.getOrgSidPath());

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

@@ -187,18 +187,18 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     String orgLevelKey = defaultIdReltBean.getData();
                     if ("1".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i1);
-                        qw.like("bo.orgSidPath", orgSidPath);
+                        qw.like("bva.orgSidPath", orgSidPath);
                     } else if ("2".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i2);
-                        qw.like("bo.orgSidPath", orgSidPath);
+                        qw.like("bva.orgSidPath", orgSidPath);
                     } else if ("3".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i3);
-                        qw.like("bo.orgSidPath", orgSidPath);
+                        qw.like("bva.orgSidPath", orgSidPath);
                     } else if ("4".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i4);
-                        qw.like("bo.orgSidPath", orgSidPath);
+                        qw.like("bva.orgSidPath", orgSidPath);
                     } else if("5".equals(orgLevelKey)){
-                        qw.eq("bo.createBySid",query.getUserSid());
+                        qw.eq("bva.createBySid",query.getUserSid());
                     }else{
                         PagerVo<BusVehicleApplyVo> p = new PagerVo<>();
                         return p;

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

@@ -184,13 +184,14 @@
 
     <select id="getAppContractList" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractListVo">
         SELECT contractNo AS contractId,
+        createDate as approvedDate,
         sid AS contractSid,
         partyB AS customer,
         modelName AS model,
+        busSid AS saleOrderSid,
         modelSid,
         configSid,
-        num AS carNum,
+        num AS carNumber
-        price
         FROM common_contract
         <where>
             ${ew.sqlSegment}

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

@@ -11,6 +11,7 @@ import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.commoncontract.*;
@@ -34,6 +35,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 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.bussalesorderdiscount.BusSalesOrderDiscountFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
@@ -127,6 +130,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     @Autowired
     private DocPdfComponent docPdfComponent;
 
+    @Autowired
+    private BusSalesOrderDiscountFeign busSalesOrderDiscountFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
     @Autowired
@@ -175,7 +180,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
     @Autowired
     private BaseVehicleService baseVehicleService;
-
     @Autowired
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
     @Autowired
@@ -2521,6 +2525,27 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         }
         IPage<CommonContract> page = PagerUtil.queryToPage(query);
         IPage<AppCommonContractListVo> pagging = baseMapper.getAppContractList(page, qw);
+        List<AppCommonContractListVo> records = pagging.getRecords();
+        records.removeAll(Collections.singleton(null));
+        if (!records.isEmpty()) {
+            for (AppCommonContractListVo record : records) {
+                if (StringUtils.isNotBlank(record.getModelSid())) {
+                    BaseVehicleModel vehicleModel = baseVehicleModelService.fetchBySid(record.getModelSid());
+                    if (null != vehicleModel) {
+                        record.setModelOrgPath(vehicleModel.getCreateOrg());
+                    }
+                }
+                if (StringUtils.isNotBlank(record.getSaleOrderSid())) {
+                    List<AppBusSalesOrderDiscountListVo> discountListVos = busSalesOrderDiscountFeign.getDiscountList(record.getSaleOrderSid()).getData();
+                    discountListVos.removeAll(Collections.singleton(null));
+                    if (!discountListVos.isEmpty()) {
+                        int sum = discountListVos.stream().map(AppBusSalesOrderDiscountListVo::getTotalPrice).collect(Collectors.toList()).stream().mapToInt(Integer::parseInt).sum();
+                        record.setDiscountAllPrice(String.valueOf(sum));
+                    }
+                }
+            }
+
+        }
         PagerVo<AppCommonContractListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -2676,7 +2701,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             createDate = DateUtil.formatDate(dateTime);
             record.setCreateDate(createDate);
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData();
-            if (!"已办结".equals(busSalesOrder.getNodeState()) || !"2".equals(busSalesOrder.getFinancePlan())){
+            if (!"已办结".equals(busSalesOrder.getNodeState()) || !"2".equals(busSalesOrder.getFinancePlan())) {
                 continue;
             }
             record.setSaleTypeKey(busSalesOrder.getPayTypeKey());

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -98,7 +98,7 @@ public interface BusSalesOrderFeign {
     @PostMapping("/updateOneBillMoneyByOrderSid")
     ResultBean<Integer> updateOneBillMoneyByOrderSid(@RequestParam("orderSid") String orderSid, @RequestParam("oneBillMoney") String oneBillMoney);
 
-    @ApiOperation("提交")
+   /* @ApiOperation("提交")
     @PostMapping("/submit")
     @ResponseBody
     ResultBean submit(@RequestBody SubmitAllOrderDto dto);
@@ -107,7 +107,7 @@ public interface BusSalesOrderFeign {
     @PostMapping("/pcIsSubmit")
     @ResponseBody
     ResultBean pcIsSubmit(@RequestBody SubmitAllOrderDto dto);
-
+*/
     @ApiOperation(value = "办理（同意）")
     @PutMapping("/complete")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -91,7 +91,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return null;
     }
 
-    @Override
+  /*  @Override
     public ResultBean submit(SubmitAllOrderDto dto) {
         return null;
     }
@@ -99,7 +99,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     @Override
     public ResultBean pcIsSubmit(SubmitAllOrderDto dto) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean complete(BusSalesOrderFlowQuery busSalesOrderFlowQuery) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -106,9 +106,6 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
-import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit;
-import com.yxt.anrui.scm.api.scmfile.ScmFile;
-import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -274,18 +271,18 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     String orgLevelKey = defaultIdReltBean.getData();
                     if ("1".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i1);
-                        qw.like("bo.orgSidPath", orgSidPath);
+                        qw.like("bd.orgSidPath", orgSidPath);
                     } else if ("2".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i2);
-                        qw.like("bo.orgSidPath", orgSidPath);
+                        qw.like("bd.orgSidPath", orgSidPath);
                     } else if ("3".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i3);
-                        qw.like("bo.orgSidPath", orgSidPath);
+                        qw.like("bd.orgSidPath", orgSidPath);
                     } else if ("4".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i4);
-                        qw.like("bo.orgSidPath", orgSidPath);
+                        qw.like("bd.orgSidPath", orgSidPath);
                     } else if("5".equals(orgLevelKey)){
-                        qw.eq("bo.createBySid",query.getApplySid());
+                        qw.eq("bd.createBySid",query.getApplySid());
                     }else{
                         PagerVo<BusDeliveredApplyVo> p = new PagerVo<>();
                         return p;
@@ -1539,18 +1536,18 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 String orgLevelKey = defaultIdReltBean.getData();
                 if ("1".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i1);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("bd.orgSidPath", orgSidPath);
                 } else if ("2".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i2);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("bd.orgSidPath", orgSidPath);
                 } else if ("3".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i3);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("bd.orgSidPath", orgSidPath);
                 } else if ("4".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i4);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("bd.orgSidPath", orgSidPath);
                 } else if("5".equals(orgLevelKey)){
-                    qw.eq("bo.createBySid",query.getUserSid());
+                    qw.eq("bd.createBySid",query.getUserSid());
                 }else{
                     PagerVo<AppDeliveredApplyPageVo> p = new PagerVo<>();
                     return p;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -1739,7 +1739,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         String urlPrefix = docPdfComponent.getPrefixTemplateUrl();
         if (records.size() > 0) {
             for (AppDeliveryListVo record : records) {
-                if (record.getNodeState().equals("待提交") || record.getNodeState().equals("销售专员提交申请")) {
+                if (record.getNodeState().equals("待提交")) {
                     record.setShowUpdate(true);
                 } else {
                     record.setShowUpdate(false);

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

@@ -138,7 +138,7 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return rb.success().setMsg("操作成功");
     }
 
-    @Override
+   /* @Override
     public ResultBean submit(SubmitAllOrderDto dto) {
         return busSalesOrderService.submit(dto);
     }
@@ -147,7 +147,7 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean pcIsSubmit(SubmitAllOrderDto dto) {
         return busSalesOrderService.pcIsSubmit(dto);
     }
-
+*/
     @Override
     public ResultBean complete(BusSalesOrderFlowQuery query) {
         BusinessVariables bv = new BusinessVariables();

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue

@@ -173,13 +173,13 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
+          <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">
               <upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
             </el-col>
           </el-row>
-          <div class="title"><span class="icon">*</span>客户开票申请书</div>
+          <div class="title">客户开票申请书</div>
           <el-row>
             <el-col :span="24">
               <upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapply.vue

@@ -223,7 +223,8 @@ export default {
           openTickUnitName: '',
           saleTypeKey: '',
           useOrgSid: '',
-          menuUrl: ''
+          menuUrl: '',
+          orgPath: ''
         }
       }
     }
@@ -323,6 +324,7 @@ export default {
       this.listLoading = true
       this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
       this.listQuery.params.menuUrl = this.$route.path
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       listPage(this.listQuery).then(response => {
         this.listLoading = false
         if (response.success) {
@@ -357,7 +359,8 @@ export default {
           openTickUnitName: '',
           saleTypeKey: '',
           useOrgSid: '',
-          menuUrl: ''
+          menuUrl: '',
+          orgPath: ''
         }
       }
       this.init()

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue

@@ -160,13 +160,13 @@
               </el-table-column>
             </el-table>
           </div>
-          <div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
+          <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">
               <upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
             </el-col>
           </el-row>
-          <div class="title"><span class="icon">*</span>客户开票申请书</div>
+          <div class="title">客户开票申请书</div>
           <el-row>
             <el-col :span="24">
               <upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue

@@ -159,13 +159,13 @@
               </el-table-column>
             </el-table>
           </div>
-          <div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
+          <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">
               <upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
             </el-col>
           </el-row>
-          <div class="title"><span class="icon">*</span>客户开票申请书</div>
+          <div class="title">客户开票申请书</div>
           <el-row>
             <el-col :span="24">
               <upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue

@@ -170,13 +170,13 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
+          <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">
               <upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
             </el-col>
           </el-row>
-          <div class="title"><span class="icon">*</span>客户开票申请书</div>
+          <div class="title">客户开票申请书</div>
           <el-row>
             <el-col :span="24">
               <upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -46,11 +46,11 @@ public enum ProcDefEnum {
     SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
-    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_ncifet6k:3:1412548"),
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_ncifet6k:4:1747504"),
     BUSSALESORDERRETURNVEHAPPLY("销售订单退车申请", "process_tzjjs03y:1:1012504"),
     BASETRAILEROUTAPPLY("挂车出库申请", "process_tkw6vhfw:1:1705004"),
 
-    BUSHANDOVER("交车确认", "process_e8feloik:4:1712504"),
+    BUSHANDOVER("交车确认", "process_e8feloik:5:1747508"),
 
     /******************************测试流程id*********************************************/
 

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

@@ -266,18 +266,18 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 String orgLevelKey = defaultIdReltBean.getData();
                 if ("1".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i1);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("svg.orgSidPath", orgSidPath);
                 } else if ("2".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i2);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("svg.orgSidPath", orgSidPath);
                 } else if ("3".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i3);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("svg.orgSidPath", orgSidPath);
                 } else if ("4".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i4);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("svg.orgSidPath", orgSidPath);
                 } else if("5".equals(orgLevelKey)){
-                    qw.eq("bo.createBySid",query.getUserSid());
+                    qw.eq("svg.createBySid",query.getUserSid());
                 }else{
                     PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>();
                     return p;
@@ -441,18 +441,18 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 String orgLevelKey = defaultIdReltBean.getData();
                 if ("1".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i1);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("svg.orgSidPath", orgSidPath);
                 } else if ("2".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i2);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("svg.orgSidPath", orgSidPath);
                 } else if ("3".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i3);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("svg.orgSidPath", orgSidPath);
                 } else if ("4".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i4);
-                    qw.like("bo.orgSidPath", orgSidPath);
+                    qw.like("svg.orgSidPath", orgSidPath);
                 } else if("5".equals(orgLevelKey)){
-                    qw.eq("bo.createBySid",query.getUserSid());
+                    qw.eq("svg.createBySid",query.getUserSid());
                 }else{
                     PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>();
                     return p;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDetailsVo.java

@@ -75,8 +75,10 @@ public class AppDiscountpackageApplyDetailsVo implements Vo {
     private String model; // 车型名称
     @ApiModelProperty("台数")
     private String number; // 台数
+
     @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
+
     @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
     @ApiModelProperty("流程实例的sid")
@@ -91,4 +93,10 @@ public class AppDiscountpackageApplyDetailsVo implements Vo {
     private String remarks; // 备注
     @ApiModelProperty("优惠包列表")
     private List<AppBaseDiscountpackagelistDto> discountPackageList;
+    @ApiModelProperty("申请人组织路径")
+    private String orgPath; // 申请人组织路径
+    @ApiModelProperty("流程实例的sid")
+    private String procInsId; // 流程实例的sid
+    @ApiModelProperty("台数")
+    private String carNumber; // 台数
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDto.java

@@ -76,6 +76,8 @@ public class AppDiscountpackageApplyDto implements Dto {
     private String model; // 车型名称
     @ApiModelProperty("台数")
     private String number; // 台数
+    @ApiModelProperty("台数")
+    private String carNumber; // 台数
     @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
     @ApiModelProperty("环节定义的sid")
@@ -84,12 +86,16 @@ public class AppDiscountpackageApplyDto implements Dto {
     private String procInstId; // 流程实例的sid
     @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-    @ApiModelProperty("taskId")
-    private String taskId; // taskId
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
     @ApiModelProperty("备注")
     private String remarks; // 备注
     @ApiModelProperty("优惠包列表")
     private List<AppDiscountpackagelistDto> discountPackageList; // 优惠包列表
+    @ApiModelProperty("申请人组织路径")
+    private String orgPath; // 申请人组织路径
+    private String procInsId;
+    @ApiModelProperty("taskId")
+    private String taskId; // taskId
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplysCompleteDto.java

@@ -20,7 +20,6 @@ public class BaseDiscountpackageApplysCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
@@ -29,7 +28,6 @@ public class BaseDiscountpackageApplysCompleteDto implements Dto {
     @NotBlank(message = "参数错误：taskId")
     private String taskId;
     @ApiModelProperty(value = "流程id")
-    @NotBlank(message = "参数错误：instanceId")
     private String instanceId;
     @ApiModelProperty(value = "意见")
     @NotBlank(message = "参数错误：comment")
@@ -39,6 +37,10 @@ public class BaseDiscountpackageApplysCompleteDto implements Dto {
     private String businessSid;
     @ApiModelProperty(value = "分支字段及业务字段")
     private Map<String, Object> formVariables;
+    @ApiModelProperty(value = "用户全路径sid")
+    private String orgPath;
+    @ApiModelProperty(value = "流程id")
+    private String procInsId;
 //    @ApiModelProperty("调账车辆列表")
 //    private List<BaseInternalPurchasesVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/contract/AppCommonContractListVo.java

@@ -14,6 +14,8 @@ public class AppCommonContractListVo implements Vo {
 
     @ApiModelProperty("合同sid")
     private String contractSid;
+    @ApiModelProperty("订单sid")
+    private String saleOrderSid;
     @ApiModelProperty("合同编号")
     private String contractId;
     @ApiModelProperty("客户名称")
@@ -24,8 +26,12 @@ public class AppCommonContractListVo implements Vo {
     private String modelSid;
     @ApiModelProperty("配置sid")
     private String configSid;
+    @ApiModelProperty("车型对应组织路径")
+    private String modelOrgPath;
     @ApiModelProperty("车辆台数")
-    private String carNum;
+    private String carNumber;
-    @ApiModelProperty("成交价")
+    @ApiModelProperty("总价值")
-    private String price;
+    private String discountAllPrice;
+    @ApiModelProperty("合同审核日期")
+    private String approvedDate;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@@ -109,16 +109,18 @@ public class AppService {
                 flowableQuery.setTaskDefKey(appFlowableRecordVo.getTaskDefKey());
                 flowableQuery.setMap(map);
                 ResultBean<List<Map<String,Object>>> resultBean = flowTaskFeign.yuyanTest(flowableQuery);
-                if(!resultBean.getData().isEmpty()){
+                if(resultBean.getData() != null){
-                    List<Map<String,Object>> mapList = resultBean.getData();
+                    if(!resultBean.getData().isEmpty()){
-                    mapList.forEach(f->{
+                        List<Map<String,Object>> mapList = resultBean.getData();
-                        AppFlowableRecordAndCommentVo a = new AppFlowableRecordAndCommentVo();
+                        mapList.forEach(f->{
-                        AppFlowableRecordVo app = new AppFlowableRecordVo();
+                            AppFlowableRecordAndCommentVo a = new AppFlowableRecordAndCommentVo();
-                        app.setTaskName(f.get("nodeName").toString());
+                            AppFlowableRecordVo app = new AppFlowableRecordVo();
-                        a.setFlowableRecordVo(app);
+                            app.setTaskName(f.get("nodeName").toString());
-                        a.setState(3 + "");
+                            a.setFlowableRecordVo(app);
-                        list.add(a);
+                            a.setState(3 + "");
-                    });
+                            list.add(a);
+                        });
+                    }
                 }
             }
         }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java

@@ -78,7 +78,10 @@ public class AppDiscountPackageApplyService {
         com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto submitBaseDiscountpackageApplyDto = new com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto();
         BeanUtil.copyProperties(dto, submitBaseDiscountpackageApplyDto);
         ResultBean resultBean = baseDiscountpackageApplyFeign.submitRecordApplication(submitBaseDiscountpackageApplyDto);
-        return rb.success().setData(resultBean.getData());
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
     }
 
     public ResultBean complete(BaseDiscountpackageApplysCompleteDto dto) {