修改

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

@@ -1012,6 +1012,12 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         mfq.setBusinessSid(busVehicleApply.getSid());
         mfq.setMsgContent("分享的流程审批，请查看");
         mfq.setUserSid(shareQuery.getUserSid());
+        mfq.setUserSids(userSids.toString());
+        ResultBean<Map<String,String>> flowResultBean = flowableFeign.selectFlow(taskId);
+        if(flowResultBean.getData() != null){
+            mfq.setModuleName(flowResultBean.getData().get("NAME_"));
+            mfq.setMsgTitle(flowResultBean.getData().get("NAME_"));
+        }
         ResultBean<String> stringResultBean = messageFeign.pushMessageShare(mfq);
         log.info("分享成功-resultBean:{}", resultBean);
         if (!resultBean.getSuccess()) {

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

@@ -1603,13 +1603,13 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String idNo = crmCustomerTempVo.getIDNumber();
         //身份证号
         //生成合同时如果为个人时，证件证号全款不是必须的、贷款必须。企业的证件号码不必须。
-        if("2".equals(appOrderDetailsVo.getPayTypeKey())){
+        /*if("2".equals(appOrderDetailsVo.getPayTypeKey())){
             if("1".equals(crmCustomerTempVo.getCustomerTypeKey())){
                 if (StringUtils.isBlank(idNo)) {
                     return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
                 }
             }
-        }
+        }*/
 
         //查询销售订单的车型信息
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -91,6 +92,7 @@ public class FinCollectionConfirmationDto implements Dto {
     @ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）")
     private Integer paymentState; // 审核状态
     @ApiModelProperty("已选应收款项明细")
+    @Valid
     private List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetaileds; // 已选应收款项明细
     @ApiModelProperty("打款凭证附件")
     private List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs; // 打款凭证附件

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinSelectedReceivablesDetailedDto.java <br/>
@@ -73,6 +75,7 @@ public class FinSelectedReceivablesDetailedDto implements Dto {
   /*  @ApiModelProperty("上次认款金额")
     private String lastSubscriptionMoney; // 上次认款金额*/
 	@ApiModelProperty("认款金额")
+    @NotBlank(message = "认款金额不能为空")
     private String subscriptionMoney; // 认款金额
 	@ApiModelProperty("认款申请日期")
     private String subscriptionDate; // 认款申请日期

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -40,6 +40,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -82,7 +83,7 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     @Override
     @ApiOperation("提交新增保存")
     @PostMapping("/save")
-    public ResultBean save(@RequestBody FinCollectionConfirmationDto dto) {
+    public ResultBean save(@Valid @RequestBody FinCollectionConfirmationDto dto) {
         return finCollectionConfirmationService.saveAllDto(dto);
     }
 

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java

@@ -86,5 +86,10 @@ public class FlowableFallback implements FlowableFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<Map<String, String>> selectFlow(String id) {
+        return null;
+    }
+
 
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java

@@ -131,4 +131,9 @@ public interface FlowableFeign {
     @GetMapping(value = "/selectFlowVaributes")
     @ResponseBody
     ResultBean<Map<String,Object>> selectFlowVaributes(@RequestParam("taskId")String taskId);
+
+    @ApiOperation(value = "查询流程的信息")
+    @GetMapping(value = "/selectFlow")
+    @ResponseBody
+    ResultBean<Map<String,String>> selectFlow(@RequestParam("id")String id);
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -605,4 +605,17 @@ public class FlowableRest implements FlowableFeign {
         Map<String, Object> processVariables = historicTaskInstance.getProcessVariables();
         return rb.success().setData(processVariables);
     }
+
+    @Override
+    public ResultBean<Map<String, String>> selectFlow(String taskId) {
+        ResultBean<Map<String, String>> rb = ResultBean.fireFail();
+        HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                .includeProcessVariables().taskId(taskId).singleResult();
+        Map<String, String> process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId());
+        log.info("分享-process:{}", process);
+        if (process == null) {
+            log.info("分享-process:{}", process);
+        }
+        return rb.success().setData(process);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@@ -69,7 +69,7 @@
                  INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid
                  LEFT JOIN sys_user user
                            ON staff.sid = user.staffSid
-        WHERE org.orgSid = #{sid}
+        WHERE org.orgSid = #{sid} and staff.personTypeKey != '01'
     </select>
     <!--根据员工类型key查询员工工号的最大号-->
     <select id="selectJobNumber" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -366,9 +366,10 @@
     </select>
 
     <select id="selectUserByStaffSid" resultType="java.lang.String">
-        select * from sys_user where staffSid in
+        select su.sid from sys_user su left join sys_staffinfo si on su.staffSid = si.sid where su.staffSid in
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        and si.personTypeKey != '01'
     </select>
 </mapper>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java

@@ -20,4 +20,6 @@ public class ShareVehicleApplyQuery implements Query {
     private List<String> members;
     @ApiModelProperty("部门")
     private List<String> groups;
+
+    private String userSid;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.terminal.biz.supplychain.vehicleApply;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
+import com.yxt.anrui.base.api.busvehicleapply.ShareBusVehicleApplyQuery;
 import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplySzVo;
 import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyVo;
 import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyCompleteDto;
@@ -13,7 +14,6 @@ import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysuser.ShareUserQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.terminal.api.supplychain.vehicleApply.*;
@@ -176,8 +176,12 @@ public class VehicleApplyService {
 
     public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) {
         ResultBean rb = ResultBean.fireFail();
-
+        ShareBusVehicleApplyQuery shareBusVehicleApplyQuery = new ShareBusVehicleApplyQuery();
-
+        BeanUtil.copyProperties(shareQuery,shareBusVehicleApplyQuery);
-        return null;
+        ResultBean resultBean = busVehicleApplyFeign.shareBusVehicleApply(shareBusVehicleApplyQuery);
+        if(!resultBean.getSuccess()){
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
     }
 }