优化

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("合同状态")

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<BaseVehicleState
                     baseVehicleState.setFinState("0");
                     baseVehicleState.setCarryVehicleState("0");
                     baseVehicleState.setCarryInvoiceState("0");
+                    baseVehicleState.setInvoiceApplyState("0");
                     baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
                     baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
@@ -116,6 +117,7 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     baseVehicleState.setFinState("0");
                     baseVehicleState.setCarryVehicleState("0");
                     baseVehicleState.setCarryInvoiceState("0");
+                    baseVehicleState.setInvoiceApplyState("0");
                     baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
                     baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
@@ -131,6 +133,7 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     baseVehicleState.setFinState(BaseVehicleStateEnum.BusStateEnum.FIN_STATE_JQ.getStateKey());
                     baseVehicleState.setCarryVehicleState("0");
                     baseVehicleState.setCarryInvoiceState("0");
+                    baseVehicleState.setInvoiceApplyState("0");
                     baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
                     baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
@@ -145,6 +148,7 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     //欠款提车提交后，将提车状态修改为1,0为未提交过，1为审核通过，2为审核中
                     baseVehicleState.setCarryVehicleState("2");
                     baseVehicleState.setFinState("0");
+                    baseVehicleState.setInvoiceApplyState("0");
                     baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
                     baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_2.getStateKey());

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@@ -704,6 +704,14 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
             log.info("抄送失败：没有获取到业务参数!");
             return rb.setMsg("抄送失败！");
         }
+        //
+        String assignee = (String) processVariables.get("assignee");
+        ResultBean<SysUserVo> stringResultBean = sysUserFeign.fetchBySid(assignee);
+        String assigneeName = "";
+        if(stringResultBean.getData() != null){
+            assigneeName= stringResultBean.getData().getName();
+        }
+
         Map<String, Object> app = new HashMap<>();
         if (processVariables.get("app") != null) {
             app = (Map<String, Object>) processVariables.get("app");
@@ -711,8 +719,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
         log.info("抄送方法-historicTaskInstance:{}", JSONObject.toJSONString(historicTaskInstance));
         mfq.setAppMap(app);
         mfq.setBusinessSid(bv.getBusinessSid());
-
-        mfq.setMsgContent("系统抄送的流程审批,请查看");
+        mfq.setMsgContent(assigneeName+"抄送的流程审批,请查看");
 //        act_re_procdef
         Map<String, String> process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId());
         log.info("抄送成功-process:{}", process);
@@ -739,6 +746,8 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
         userSids.deleteCharAt(userSids.length() - 1);
         mfq.setUserSids(userSids.toString());
         mfq.setOrgPath(createrOrgPath);
+        mfq.setUserSid(assignee);
+        mfq.setApplicationName(assigneeName);
         ResultBean<String> resultBean = messageFeign.pushMessageCC(mfq);
         log.info("抄送成功:{}", userName.toString());
         log.info("抄送成功-resultBean:{}", resultBean);