diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java index a9d5b2d6a5..3c6bdcf918 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java @@ -32,6 +32,10 @@ public class BaseVehicleState extends BaseEntity { private String carryVehicleState; @ApiModelProperty("欠款开票状态") private String carryInvoiceState; + @ApiModelProperty("开票申请状态:未发起过0,审批通过的为1,审批不通过为改为0,审批中的为2,驳回或撤回到发起人修改为0,默认为0,提交时需要判断是否已发起开票申请流程") + private String invoiceApplyState; + @ApiModelProperty("资方终审:0未通过,1通过,贷款资方终审通过时设置为1") + private String manageState; @ApiModelProperty("包牌业务") private String packageBusiness; @ApiModelProperty("合同状态") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index 151141e9ba..76c92411be 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -39,6 +39,7 @@ public class BaseVehicleStateService extends MybatisBaseService { log.info("抄送失败:没有获取到业务参数!"); return rb.setMsg("抄送失败!"); } + // + String assignee = (String) processVariables.get("assignee"); + ResultBean stringResultBean = sysUserFeign.fetchBySid(assignee); + String assigneeName = ""; + if(stringResultBean.getData() != null){ + assigneeName= stringResultBean.getData().getName(); + } + Map app = new HashMap<>(); if (processVariables.get("app") != null) { app = (Map) processVariables.get("app"); @@ -711,8 +719,7 @@ public class FlowService extends MybatisBaseService { log.info("抄送方法-historicTaskInstance:{}", JSONObject.toJSONString(historicTaskInstance)); mfq.setAppMap(app); mfq.setBusinessSid(bv.getBusinessSid()); - - mfq.setMsgContent("系统抄送的流程审批,请查看"); + mfq.setMsgContent(assigneeName+"抄送的流程审批,请查看"); // act_re_procdef Map process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId()); log.info("抄送成功-process:{}", process); @@ -739,6 +746,8 @@ public class FlowService extends MybatisBaseService { userSids.deleteCharAt(userSids.length() - 1); mfq.setUserSids(userSids.toString()); mfq.setOrgPath(createrOrgPath); + mfq.setUserSid(assignee); + mfq.setApplicationName(assigneeName); ResultBean resultBean = messageFeign.pushMessageCC(mfq); log.info("抄送成功:{}", userName.toString()); log.info("抄送成功-resultBean:{}", resultBean);