diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java index 684b978b8f..65849b54ec 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java @@ -396,12 +396,38 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService resultBean = saveDiscountPackageApplyInfo(dto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } String businessSid = resultBean.getData(); + BaseDiscountpackageApply discountpackageApply = fetchBySid(businessSid); + String orgSidPath = ""; + if (org.apache.commons.lang3.StringUtils.isNotBlank(discountpackageApply.getOrgSidPath())) { + orgSidPath = discountpackageApply.getOrgSidPath(); + } else { + SysUserVo data = sysUserFeign.fetchBySid(discountpackageApply.getCreateBySid()).getData(); + if (null != data) { + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(data.getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } + } + List orgPathList = Arrays.asList(orgSidPath.split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + if (sysOrganization == null) { + return rb.setMsg("当前所在的组织机构不存在"); + } + if (org.apache.commons.lang3.StringUtils.isBlank(sysOrganization.getManagerSid())) { +// return rb.setMsg("当前所在的组织机构未设置主管人员"); + sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId()); + } //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); //流程中的参数赋值 @@ -419,6 +445,8 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService${ew.sqlSegment} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java index 2e34dba244..52dd6b3f29 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java @@ -572,7 +572,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService 0) { for (AppBusDiscountpackageHandoverVo record : records) { if (null != record) { + if (StringUtils.isBlank(record.getVins())) { + record.setVins("-"); + } if (StringUtils.isNotBlank(record.getContractId())) { CommonContract data = commonContractFeign.selectByNo(record.getContractId()).getData(); if (null != data) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java index a0f1d0c09e..0c8b7f6ad7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java @@ -1813,6 +1813,9 @@ public class BusHandoverService extends MybatisBaseService deliveryConfirmInfo = busHandoverItemsService.getDeliveryConfirmInfo(record.getSid()); deliveryConfirmInfo.removeAll(Collections.singleton(null)); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java index 56a1b2c2dc..10bba16212 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java @@ -196,9 +196,11 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService 0) { str.append("驾驶员卡、"); } - if (busVehicleInformation.getGasCertificate() > 0) { - if (busVehicleInformation.getIsFuelVehicle() == 0) { - str.append("气瓶检测合格证、"); + if (null != busVehicleInformation.getGasCertificate()) { + if (busVehicleInformation.getGasCertificate() > 0) { + if (busVehicleInformation.getIsFuelVehicle() == 0) { + str.append("气瓶检测合格证、"); + } } } str.delete(str.length() - 1, str.length()); @@ -233,11 +235,13 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService + + + Administrator + FAN + 2023-04-17T03:01:26Z + 2023-07-18T05:34:44Z + 41760 + 1 + 0 + 0 + 0 + 0 + 0 + 14 + + + 2052-11.1.0.14309 + F03432184FB0417EB96810DC841F737A_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 优惠包交接确认单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合同编号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 出库台数 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vehCount!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户名称 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${customerName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 联系电话 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${recPhone!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vehModel!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 优惠包列表 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 优惠名称 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 优惠项目说明 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数量 + + + + + <#list newList as listKey> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${listKey.sNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${listKey.discountName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${listKey.explain!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${listKey.number!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 接收人签字： + + + + + + + + + + + + + + + + + + + + + （要求字迹工整） + + + + + + + + + + + + + + + + + + + + + 联系电话： + + + + + + + + + + + + + + + + + + + + + 日期： + + + + + + + + + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 0b995d4212..c14eed4bbb 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -54,7 +54,7 @@ public enum ProcDefEnum { BUSHANDOVER("交车确认", "process_e8feloik:5:1747508"), LOANFINPOLICYRECORDAPPLY("金融产品政策备案", "process_u45lo7qc:1:2272516"), LOANOTHERPOLICYRECORDAPPLY("其它融产品备案", "process_7pptyzfc:1:2272524"), - DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:2:2472504"), + DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:3:2577504"), /******************************测试流程id*********************************************/ diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyApplyVo.java index 685a35d0b3..f579051ccd 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyApplyVo.java @@ -39,5 +39,7 @@ public class LoanFinOtherPolicyApplyVo implements Vo { private String nodeState; @ApiModelProperty("备注") private String remarks; - + private String procDefId; + @ApiModelProperty("实例id") + private String procInstId; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApply.java index 1bf70013d6..68aea4d4d9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApply.java @@ -21,7 +21,7 @@ import java.util.Date; * @since 1.0 */ @ApiModel(value = "金融产品政策报备", description = "金融产品政策报备") -@TableName("loan_fin_other_policy_record_apply") +@TableName("loan_fin_otherpolicy_record_apply") @Data public class LoanFinOtherPolicyRecordApply extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeign.java index 4903812c72..4621cd90f5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeign.java @@ -8,6 +8,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -116,10 +117,10 @@ public interface LoanFinOtherPolicyRecordApplyFeign { @ApiOperation(value = "获取下一个环节") @GetMapping(value = "/getNextNodesForSubmit") - ResultBean> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query); + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); @ApiOperation(value = "获取上一个环节") @GetMapping(value = "/getPreviousNodesForReject") - ResultBean> getPreviousNodesForReject(@Valid @RequestBody GetNodeQuery query); + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.java index da64cd4844..2af517f89f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.java @@ -23,6 +23,6 @@ public interface LoanFinOtherPolicyRecordApplyMapper extends BaseMapper map); - @Update("update loan_fin_other_policy_record_apply set isDelete = 1 where sid =#{sid}") + @Update("update loan_fin_otherpolicy_record_apply set isDelete = 1 where sid =#{sid}") int updateBySidDelete(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.xml index a7e8579e53..aa3a8e6f9f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.xml @@ -3,7 +3,7 @@ - UPDATE loan_fin_policy_record_apply + UPDATE loan_fin_otherpolicy_record_apply SET nodeState=#{nodeState} , nodeSid=#{taskDefKey} @@ -26,8 +26,10 @@ applicant, applyDate, nodeState, - remarks - FROM loan_fin_other_policy_record_apply + remarks, + procDefId, + procInstId + FROM loan_fin_otherpolicy_record_apply ${ew.sqlSegment} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java index 59ec31facc..402194e5ec 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java @@ -204,6 +204,7 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService