验收单 增加节点

src/main/java/com/sunxung/factoring/component/util/ConstantUtil.java

@@ -469,6 +469,12 @@ public class ConstantUtil {
      * 验收单法务审核
      */
     public static final String ACCEPTANCE_SHEET_APPROVAL_CANDIDATE = "acceptance_sheet_approval_candidate";
+
+    /**
+     * 验收单业务审核
+     */
+    public static final String ACCEPTANCE_BUSINESS_APPROVAL_CANDIDATE = "acceptance_business_approval_candidate";
+
     /**
      * 验收单验收人员变更审核
      */

src/main/java/com/sunxung/factoring/entity/acceptance/AcceptanceApproval.java

@@ -25,6 +25,13 @@ public class AcceptanceApproval extends BaseEntity {
     @TableField("c_acceptance_basic_info_id")
     private Long acceptanceBasicInfoId;
 
+
+    /**
+     * 验收单历史新息表id
+     */
+    @TableField("c_acceptance_basic_his_id")
+    private Long acceptanceBasicHisId;
+
     /**
      * 审批意见
      */
@@ -296,4 +303,12 @@ public class AcceptanceApproval extends BaseEntity {
         List<FileStorage> acceptanceUpstreamFileSign) {
         this.acceptanceUpstreamFileSign = acceptanceUpstreamFileSign;
     }
+
+    public Long getAcceptanceBasicHisId() {
+        return acceptanceBasicHisId;
+    }
+
+    public void setAcceptanceBasicHisId(Long acceptanceBasicHisId) {
+        this.acceptanceBasicHisId = acceptanceBasicHisId;
+    }
 }

src/main/java/com/sunxung/factoring/entity/acceptance/AcceptanceBasicInfo.java

@@ -107,6 +107,14 @@ public class AcceptanceBasicInfo extends Project {
      */
     @TableField("sign_confirm")
     private Integer signConfirm;
+
+
+    /**
+     * 申请审核-融资，0:不申请 1:申请
+     */
+    @TableField("is_approval")
+    private Integer approval;
+
     /**
      * 验收单签署人Id
      */
@@ -117,6 +125,13 @@ public class AcceptanceBasicInfo extends Project {
      */
     @TableField("steel_waiter")
     private Integer steelWaiter;
+
+    /**
+     * 业务审核状态（0/null未通过   1审核已通过）
+     */
+    @TableField("business_approval_status")
+    private Integer businessApprovalStatus;
+
     /**
      * 钢小二销售单号
      */
@@ -512,4 +527,20 @@ public class AcceptanceBasicInfo extends Project {
         List<FileStorage> procureContractFile) {
         this.procureContractFile = procureContractFile;
     }
+
+    public Integer getApproval() {
+        return approval;
+    }
+
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    public Integer getBusinessApprovalStatus() {
+        return businessApprovalStatus;
+    }
+
+    public void setBusinessApprovalStatus(Integer businessApprovalStatus) {
+        this.businessApprovalStatus = businessApprovalStatus;
+    }
 }

src/main/java/com/sunxung/factoring/entity/acceptance/AcceptanceBusinessApproval.java

@@ -0,0 +1,312 @@
+package com.sunxung.factoring.entity.acceptance;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sunxung.factoring.entity.BaseEntity;
+import com.sunxung.factoring.entity.sys.FileStorage;
+import com.sunxung.factoring.entity.sys.FileStorageDO;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 验收单管理-业务审核表
+ * @author liutao
+ * @date 2021.09.15
+ */
+@TableName("acceptance_business_approval")
+public class AcceptanceBusinessApproval extends BaseEntity {
+
+    /**
+     * 验收单基础信息表id
+     */
+    @TableField("c_acceptance_basic_info_id")
+    private Long acceptanceBasicInfoId;
+
+    /**
+     * 验收单历史新息表id
+     */
+    @TableField("c_acceptance_basic_his_id")
+    private Long acceptanceBasicHisId;
+
+    /**
+     * 审批意见
+     */
+    @TableField("approval_comment")
+    private String approvalComment;
+    /**
+     * 审批结论 0:通过 2：否决 3：退回
+     */
+    @NotNull(message = "请选择审核结论")
+    @TableField("approval_conclusion")
+    private String approvalConclusion;
+    /**
+     * 审核人Id
+     */
+    @TableField("auditor_id")
+    private Long auditorId;
+    /**
+     * 审核结论 前端用
+     */
+    @TableField(exist = false)
+    private String result;
+    /**
+     * 流程id
+     */
+    @TableField(exist = false)
+    private String taskId;
+
+    /**
+     * 验收单附件
+     */
+    @TableField(exist = false)
+    private List<FileStorage> file;
+    /**
+     *验收单补充附件
+     */
+    @TableField(exist = false)
+    private List<FileStorage> additional;
+    /**
+     *验收单上游验收单
+     */
+    @TableField(exist = false)
+    private List<FileStorageDO> acceptanceUpstreamFile;
+
+    /**
+     *采购合同
+     */
+    @TableField(exist = false)
+    private List<FileStorage> salesContract;
+    /**
+     *销售合同
+     */
+    @TableField(exist = false)
+    private List<FileStorage> purchContract;
+
+//    /**
+//     * 验收单已签署文件
+//     */
+//    @TableField(exist = false)
+//    private FileStorage acceptanceSignedFile;
+
+    /**
+     * 签署确认
+     */
+    @TableField("sign_confirm")
+    private Integer signConfirm;
+
+    @TableField(exist = false)
+    private List<Long> fileIds;
+
+    @TableField(exist = false)
+    private List<MultipartFile> multipartFileList;
+
+    @TableField(exist = false)
+    private AcceptancePersonInfo acceptancePersonInfo;
+
+//    @TableField(exist = false)
+//    private AcceptancePersonInfoHistoryRef acceptancePersonInfoHistoryRef;
+
+    @TableField(exist = false)
+    private List<FileStorage> signConfirmFiles;
+
+    @TableField(exist = false)
+    private List<FileStorageDO> fileStorageDOList;
+    /**
+     * 补充说明附件
+     */
+    @TableField(exist = false)
+    private List<FileStorageDO> supplementFiles;
+
+    /**
+     * 验收单附件/上游验收单   (自动签署后的)
+     */
+    @TableField(exist = false)
+    private List<FileStorage>  acceptanceUpstreamFileSign;
+
+
+//    public AcceptancePersonInfoHistoryRef getAcceptancePersonInfoHistoryRef() {
+//        return acceptancePersonInfoHistoryRef;
+//    }
+//
+//    public void setAcceptancePersonInfoHistoryRef(AcceptancePersonInfoHistoryRef acceptancePersonInfoHistoryRef) {
+//        this.acceptancePersonInfoHistoryRef = acceptancePersonInfoHistoryRef;
+//    }
+
+    public List<FileStorage> getSignConfirmFiles() {
+        return signConfirmFiles;
+    }
+
+    public void setSignConfirmFiles(List<FileStorage> signConfirmFiles) {
+        this.signConfirmFiles = signConfirmFiles;
+    }
+
+    public Integer getSignConfirm() {
+        return signConfirm;
+    }
+
+    public void setSignConfirm(Integer signConfirm) {
+        this.signConfirm = signConfirm;
+    }
+
+    public AcceptancePersonInfo getAcceptancePersonInfo() {
+        return acceptancePersonInfo;
+    }
+
+    public void setAcceptancePersonInfo(AcceptancePersonInfo acceptancePersonInfo) {
+        this.acceptancePersonInfo = acceptancePersonInfo;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
+
+    public List<MultipartFile> getMultipartFileList() {
+        return multipartFileList;
+    }
+
+    public void setMultipartFileList(List<MultipartFile> multipartFileList) {
+        this.multipartFileList = multipartFileList;
+    }
+
+    public AcceptanceBusinessApproval() {
+    }
+
+    public Long getAcceptanceBasicInfoId() {
+        return acceptanceBasicInfoId;
+    }
+
+    public void setAcceptanceBasicInfoId(Long acceptanceBasicInfoId) {
+        this.acceptanceBasicInfoId = acceptanceBasicInfoId;
+    }
+
+    public String getApprovalComment() {
+        return approvalComment;
+    }
+
+    public void setApprovalComment(String approvalComment) {
+        this.approvalComment = approvalComment;
+    }
+
+    public String getApprovalConclusion() {
+        return approvalConclusion;
+    }
+
+    public void setApprovalConclusion(String approvalConclusion) {
+        this.approvalConclusion = approvalConclusion;
+    }
+
+    public Long getAuditorId() {
+        return auditorId;
+    }
+
+    public void setAuditorId(Long auditorId) {
+        this.auditorId = auditorId;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public List<FileStorage> getFile() {
+        return file;
+    }
+
+    public void setFile(List<FileStorage> file) {
+        this.file = file;
+    }
+
+    public List<FileStorage> getAdditional() {
+        return additional;
+    }
+
+    public void setAdditional(List<FileStorage> additional) {
+        this.additional = additional;
+    }
+
+
+    public List<FileStorage> getSalesContract() {
+        return salesContract;
+    }
+
+    public void setSalesContract(List<FileStorage> salesContract) {
+        this.salesContract = salesContract;
+    }
+
+    public List<FileStorage> getPurchContract() {
+        return purchContract;
+    }
+
+    public void setPurchContract(List<FileStorage> purchContract) {
+        this.purchContract = purchContract;
+    }
+
+//    public FileStorage getAcceptanceSignedFile() {
+//        return acceptanceSignedFile;
+//    }
+//
+//    public void setAcceptanceSignedFile(FileStorage acceptanceSignedFile) {
+//        this.acceptanceSignedFile = acceptanceSignedFile;
+//    }
+
+    public List<FileStorageDO> getAcceptanceUpstreamFile() {
+        return acceptanceUpstreamFile;
+    }
+
+    public void setAcceptanceUpstreamFile(
+        List<FileStorageDO> acceptanceUpstreamFile) {
+        this.acceptanceUpstreamFile = acceptanceUpstreamFile;
+    }
+
+    public List<FileStorageDO> getFileStorageDOList() {
+        return fileStorageDOList;
+    }
+
+    public void setFileStorageDOList(
+        List<FileStorageDO> fileStorageDOList) {
+        this.fileStorageDOList = fileStorageDOList;
+    }
+
+    public List<FileStorageDO> getSupplementFiles() {
+        return supplementFiles;
+    }
+
+    public void setSupplementFiles(
+        List<FileStorageDO> supplementFiles) {
+        this.supplementFiles = supplementFiles;
+    }
+
+    public List<FileStorage> getAcceptanceUpstreamFileSign() {
+        return acceptanceUpstreamFileSign;
+    }
+
+    public void setAcceptanceUpstreamFileSign(
+        List<FileStorage> acceptanceUpstreamFileSign) {
+        this.acceptanceUpstreamFileSign = acceptanceUpstreamFileSign;
+    }
+
+    public Long getAcceptanceBasicHisId() {
+        return acceptanceBasicHisId;
+    }
+
+    public void setAcceptanceBasicHisId(Long acceptanceBasicHisId) {
+        this.acceptanceBasicHisId = acceptanceBasicHisId;
+    }
+}

src/main/java/com/sunxung/factoring/entity/acceptance/AcceptanceHisInfo.java

@@ -117,6 +117,12 @@ public class AcceptanceHisInfo extends BaseEntity {
      */
     @TableField("steel_waiter")
     private Integer steelWaiter;
+    /**
+     * 申请审核，0:不申请 1:申请
+     */
+    @TableField("is_approval")
+    private Integer approval;
+
     /**
      * 货物信息
      */
@@ -405,4 +411,12 @@ public class AcceptanceHisInfo extends BaseEntity {
     public void setSellBillNumber(List<String> sellBillNumber) {
         SellBillNumber = sellBillNumber;
     }
+
+    public Integer getApproval() {
+        return approval;
+    }
+
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
 }

src/main/java/com/sunxung/factoring/mapper/acceptancesheet/AcceptanceBusinessApprovalMapper.java

@@ -0,0 +1,13 @@
+package com.sunxung.factoring.mapper.acceptancesheet;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sunxung.factoring.entity.acceptance.AcceptanceBusinessApproval;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author liutao
+ * @date 2021.09.15
+ */
+@Mapper
+public interface AcceptanceBusinessApprovalMapper extends BaseMapper<AcceptanceBusinessApproval> {
+}

src/main/java/com/sunxung/factoring/service/acceptancesheet/AcceptanceBasicInfoService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.sunxung.factoring.component.util.XMlToDoc;
 import com.sunxung.factoring.entity.acceptance.AcceptanceApproval;
 import com.sunxung.factoring.entity.acceptance.AcceptanceBasicInfo;
+import com.sunxung.factoring.entity.acceptance.AcceptanceBusinessApproval;
 import com.sunxung.factoring.entity.acceptance.AcceptancePersonInfo;
 import com.sunxung.factoring.entity.acceptance.vo.GoodsSearch;
 import com.sunxung.factoring.entity.project.vo.BusinessProcessingTaskVo;
@@ -26,7 +27,6 @@ public interface AcceptanceBasicInfoService extends IService<AcceptanceBasicInfo
      * 新建验收单
      *
      * @param acceptanceBasicInfo
-     * @param request
      * @return
      */
     void add(AcceptanceBasicInfo acceptanceBasicInfo);
@@ -46,6 +46,12 @@ public interface AcceptanceBasicInfoService extends IService<AcceptanceBasicInfo
      */
     void legalReview(AcceptanceApproval acceptanceApproval) throws Exception;
 
+    /**
+     * 业务审核
+     */
+    void businessReview(AcceptanceBusinessApproval acceptanceBusinessApproval);
+
+
     File inputData(AcceptanceBasicInfo acceptanceBasicInfo, XMlToDoc xmlDoc);
 
 
@@ -94,6 +100,10 @@ public interface AcceptanceBasicInfoService extends IService<AcceptanceBasicInfo
      */
     AcceptanceApproval findFileList(Long acceptanceBasicInfoId);
 
+    /**
+     *
+     */
+
     /**
      * 查询已经结算并且审核通过的单信息
      *

src/main/java/com/sunxung/factoring/service/acceptancesheet/AcceptanceHisInfoService.java

@@ -8,6 +8,6 @@ import com.sunxung.factoring.entity.acceptance.AcceptanceHisInfo;
  * @date 2021.9.10
  */
 public interface AcceptanceHisInfoService extends IService<AcceptanceHisInfo> {
-
 }
 
+

src/main/java/com/sunxung/factoring/service/acceptancesheet/AcceptanceSheetBusinessReviewService.java

@@ -0,0 +1,20 @@
+package com.sunxung.factoring.service.acceptancesheet;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sunxung.factoring.entity.acceptance.AcceptanceApproval;
+import com.sunxung.factoring.entity.acceptance.AcceptanceBusinessApproval;
+
+/**
+ * @@author liutao
+ * @date 2021.09.27
+ */
+public interface AcceptanceSheetBusinessReviewService extends IService<AcceptanceBusinessApproval> {
+
+    /**
+     * 查看审核详情
+     * @param acceptanceBusinessApprovalId
+     * @return
+     */
+     AcceptanceBusinessApproval getView(Long acceptanceBusinessApprovalId);
+
+}

src/main/java/com/sunxung/factoring/service/acceptancesheet/impl/AcceptanceBasicInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.deepoove.poi.data.style.BorderStyle;
 import com.google.common.collect.Lists;
 import com.sunxung.factoring.component.datatransfer.WordWriter;
 import com.sunxung.factoring.component.exception.BusinessException;
+import com.sunxung.factoring.component.exception.ServiceException;
 import com.sunxung.factoring.component.exception.ValidatorException;
 import com.sunxung.factoring.component.util.*;
 import com.sunxung.factoring.component.util.excel.ExcelUtil;
@@ -88,9 +89,6 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
     @Autowired
     private SalesContractService salesContractService;
 
-    @Autowired
-    private SerialNumberGenerator serialNumberGenerator;
-
     @Autowired
     private IPurchContractNeedUserRelService purchContractNeedUserRelService;
     @Autowired
@@ -163,9 +161,6 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
     @Autowired
     private SettlementGoodsInfoService settlementGoodsInfoService;
 
-    @Autowired
-    private IPurchContractSignConclusionService purchContractSignConclusionService;
-
     @Autowired
     private IAcceptancePersonInfoService acceptancePersonInfoService;
 
@@ -181,21 +176,6 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
     @Autowired
     private IAcceptanceSignConfirmationElectronicInfoService acceptanceSignConfirmationElectronicInfoService;
 
-    @Autowired
-    private SteelWaiterService steelWaiterService;
-
-    @Autowired
-    private ISellBillService sellBillService;
-
-    @Autowired
-    private ISellBillItemService sellBillItemService;
-
-    @Autowired
-    private ISellBillFileRefService sellBillFileRefService;
-
-    @Autowired
-    private IAcceptanceSellBillRefService acceptanceSellBillRefService;
-
     @Autowired
     private IAcceptanceSellBillRefHisService acceptanceSellBillRefHisService;
 
@@ -208,9 +188,7 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
     @Autowired
     private FileService fileService;
     @Autowired
-    private ISupplierInfoService supplierInfoService;
-    @Autowired
-    private IProjectCoreEnterpriseService projectCoreEnterpriseService;
+    private AcceptanceSheetBusinessReviewService  acceptanceBusinessApprovalService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -591,36 +569,79 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
     @Transactional
     public void updateDetailHandleProcess(AcceptanceBasicInfo acceptanceBasicInfo) {
 
-        List<Long> legalSpecialists = userService.findUserIdByRole(ConstantUtil.LEGAL_SPECIALIST);
-        String legalSpecias = legalSpecialists.stream().map(c -> c.toString()).collect(Collectors.joining(","));
-
         if (acceptanceBasicInfo == null) {
             throw new ValidatorException(CodeUtil.FAIL, "验收单信息不能为空！");
         }
+        if(acceptanceBasicInfo.getBusinessApprovalStatus()!=null && acceptanceBasicInfo.getBusinessApprovalStatus()==1 && acceptanceBasicInfo.getApproval()==0){
+            throw new ServiceException(CodeUtil.FAIL,"业务审核通过后必须要申请融资");
+        }
+        List<Long> legalSpecialists = userService.findUserIdByRole(ConstantUtil.LEGAL_SPECIALIST);
+        List<Long> projectManage = userService.findUserIdByRole(ConstantUtil.PROJECT_MANAGER);
+        String legalSpecias = legalSpecialists.stream().map(c -> c.toString()).collect(Collectors.joining(","));
+        String projectManageStr = projectManage.stream().map(c -> c.toString()).collect(Collectors.joining(","));
         //保存历史
         Long historyId = addHistoryAcceptanceSheet(acceptanceBasicInfo);
         User admin = userService.getByLoginName("admin");
         Map<String, Object> procVariables = new HashMap<>();
         Map<String, Object> msgVariables = new HashMap<>();
-        if (acceptanceBasicInfo.getSignConfirm().equals(1)) {
-            procVariables.put(ConstantUtil.ACCEPTANCE_SIGN_CONFIRM_ASSIGNEE, admin.getId());
-            procVariables.put("result", "签署确认");
-            flowableService.completeMyTask(acceptanceBasicInfo.getTaskId(), acceptanceBasicInfo, procVariables,
-                    null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET);
-        } else if (acceptanceBasicInfo.getSignConfirm().equals(0)) {
-            procVariables.put(ConstantUtil.ACCEPTANCE_SHEET_APPROVAL_CANDIDATE, legalSpecias);
-            procVariables.put("result", "法务审核");
+        Task task = flowableService.getByTaskQuery(acceptanceBasicInfo.getTaskId());
+//        if (acceptanceBasicInfo.getSignConfirm().equals(1)) {
+//            procVariables.put(ConstantUtil.ACCEPTANCE_SIGN_CONFIRM_ASSIGNEE, admin.getId());
+//            procVariables.put("result", "签署确认");
+//            flowableService.completeMyTask(acceptanceBasicInfo.getTaskId(), acceptanceBasicInfo, procVariables,
+//                    null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET);
+//        } else if (acceptanceBasicInfo.getSignConfirm().equals(0)) {
+//            procVariables.put(ConstantUtil.ACCEPTANCE_SHEET_APPROVAL_CANDIDATE, legalSpecias);
+//            procVariables.put("result", "法务审核");
+//            msgVariables.put(ConstantUtil.FLOWABLE_MSG_TITLE, "验收单编号：" + acceptanceBasicInfo.getAcceptanceNumber());
+//            msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
+//                    "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
+//                            + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—法务审核阶段，"
+//                            + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+//            Task task = flowableService.getByTaskQuery(acceptanceBasicInfo.getTaskId());
+//            User u = new User();
+//            u.setId(Long.parseLong(task.getAssignee()));
+//            ThreadLocalUtil.setUser(u);
+//            flowableService.completeMyTask(acceptanceBasicInfo.getTaskId(), acceptanceBasicInfo, procVariables,
+//                    null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET, legalSpecialists);
+//        }
+        if (acceptanceBasicInfo.getApproval().equals(1)) {
+            User user = new User();
+            user.setId(Long.parseLong(task.getAssignee()));
+            ThreadLocalUtil.setUser(user);
+            if(acceptanceBasicInfo.getSignConfirm().equals(1)){
+                procVariables.put(ConstantUtil.ACCEPTANCE_SIGN_CONFIRM_ASSIGNEE, admin.getId());
+                procVariables.put("result", "签署确认");
+                msgVariables.put(ConstantUtil.FLOWABLE_MSG_TITLE, "验收单编号：" + acceptanceBasicInfo.getAcceptanceNumber());
+                msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
+                    "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
+                        + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—签署确认阶段，"
+                        + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+                flowableService.completeMyTask(task.getId(), acceptanceBasicInfo, procVariables, null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET);
+            }else if(acceptanceBasicInfo.getSignConfirm().equals(0)){
+
+                procVariables.put(ConstantUtil.ACCEPTANCE_SHEET_APPROVAL_CANDIDATE, legalSpecias);
+                procVariables.put("result", "法务审核");
+                msgVariables.put(ConstantUtil.FLOWABLE_MSG_TITLE, "验收单编号：" + acceptanceBasicInfo.getAcceptanceNumber());
+                msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
+                    "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
+                        + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—法务审核阶段，"
+                        + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+                flowableService.completeMyTask(task.getId(), acceptanceBasicInfo, procVariables, null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET, legalSpecialists);
+            }
+        } else if (acceptanceBasicInfo.getApproval().equals(0)) {
+            //如果不申请审核 则由业务经理处理 下一步内容
+            procVariables.put(ConstantUtil.ACCEPTANCE_BUSINESS_APPROVAL_CANDIDATE, projectManageStr);
+            procVariables.put("result", "否");
             msgVariables.put(ConstantUtil.FLOWABLE_MSG_TITLE, "验收单编号：" + acceptanceBasicInfo.getAcceptanceNumber());
             msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
-                    "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
-                            + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—法务审核阶段，"
-                            + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
-            Task task = flowableService.getByTaskQuery(acceptanceBasicInfo.getTaskId());
-            User u = new User();
-            u.setId(Long.parseLong(task.getAssignee()));
-            ThreadLocalUtil.setUser(u);
-            flowableService.completeMyTask(acceptanceBasicInfo.getTaskId(), acceptanceBasicInfo, procVariables,
-                    null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET, legalSpecialists);
+                "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
+                    + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—业务经理审核阶段，"
+                    + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+            User user = new User();
+            user.setId(Long.parseLong(task.getAssignee()));
+            ThreadLocalUtil.setUser(user);
+            flowableService.completeMyTask(task.getId(), acceptanceBasicInfo, procVariables, null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET,projectManage);
         }
 
     }
@@ -708,6 +729,11 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
     public void legalReview(AcceptanceApproval acceptanceApproval) throws Exception {
         //判断审核结果
         AcceptanceBasicInfo acceptanceBasicInfo = this.baseMapper.getSpecialOneById(acceptanceApproval.getAcceptanceBasicInfoId());
+        //查询历史 把该次审批对应的  验收单基础历史信息表 绑定起来
+        AcceptanceHisInfo hisInfo = acceptanceHisInfoService.lambdaQuery()
+            .eq(AcceptanceHisInfo::getAcceptanceNumber, acceptanceBasicInfo.getAcceptanceNumber())
+            .orderByDesc(AcceptanceHisInfo::getGmtCreate).last("limit 1").one();
+        acceptanceApproval.setAcceptanceBasicHisId(hisInfo.getId());
         String result;
         switch (acceptanceApproval.getApprovalConclusion()) {
             case ConstantConversionUtil.APPROVAL_RESULT_PASS:
@@ -797,6 +823,60 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
         flowableService.completeMyTask(acceptanceApproval.getTaskId(), acceptanceBasicInfo, null, result, acceptanceApproval.getId(), msgVariables, ConstantUtil.ACCEPTANCE_SHEET);
     }
 
+    /**
+     * 业务审核
+     * @param businessApproval
+     */
+    @Override
+    @Transactional
+    public void businessReview(AcceptanceBusinessApproval businessApproval) {
+        //拾取task
+        flowableService.claimTask(businessApproval.getTaskId(), ThreadLocalUtil.getUserId(), ConstantUtil.PROJECT_MANAGER);
+        //判断审核结果
+        AcceptanceBasicInfo acceptanceBasicInfo = this.baseMapper.getSpecialOneById(businessApproval.getAcceptanceBasicInfoId());
+        //查询历史 把该次审批对应的  验收单基础历史信息表 绑定起来
+        AcceptanceHisInfo hisInfo = acceptanceHisInfoService.lambdaQuery()
+            .eq(AcceptanceHisInfo::getAcceptanceNumber, acceptanceBasicInfo.getAcceptanceNumber())
+            .orderByDesc(AcceptanceHisInfo::getGmtCreate).last("limit 1").one();
+        businessApproval.setAcceptanceBasicHisId(hisInfo.getId());
+
+        //无论业务审核 通过还是 退回 都会到 c端 录入验收单 节点， 但是会修改 业务审核状态字段
+        String result = "业务审核";
+        if(ConstantConversionUtil.APPROVAL_RESULT_PASS.equals(businessApproval.getApprovalConclusion())){
+            //审核通过
+            acceptanceBasicInfo.setBusinessApprovalStatus(1);
+        }else  if(ConstantConversionUtil.APPROVAL_RESULT_BACK.equals(businessApproval.getApprovalConclusion())){
+             //审核退回
+            acceptanceBasicInfo.setBusinessApprovalStatus(0);
+        }else{
+            throw new ServiceException("500","审批结论参数错误");
+        }
+        //修改验收单信息
+        updateById(acceptanceBasicInfo);
+        //保存审核结果
+        businessApproval.setAuditorId(ThreadLocalUtil.getUserId());
+        acceptanceBusinessApprovalService.save(businessApproval);
+
+        //完成审核流程流转到下一流程或者完成流程
+        Map<String, Object> msgVariables = new HashMap<>();
+        msgVariables.put(ConstantUtil.FLOWABLE_MSG_TITLE, "验收单编号：" + acceptanceBasicInfo.getAcceptanceNumber());
+        msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
+            "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
+                + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—验收单填写阶段，"
+                + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+        if (result.equals(ConstantUtil.OVERRULE)) {
+            msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
+                "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已驳回，进入“"
+                    + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—退回修改”阶段，"
+                    + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+
+        } else if (result.equals(ConstantUtil.APPROVAL) || result.equals(ConstantUtil.TERMINATE)) {
+            msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
+                "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已通过业务经理审核");
+        }
+        flowableService.completeMyTask(businessApproval.getTaskId(), acceptanceBasicInfo, null, result, businessApproval.getId(), msgVariables, ConstantUtil.ACCEPTANCE_SHEET);
+    }
+
     @Override
     public File inputData(AcceptanceBasicInfo acceptanceBasicInfo, XMlToDoc xmlDoc) {
         //业务信息
@@ -905,10 +985,16 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
 
         List<Long> legalSpecialists = userService.findUserIdByRole(ConstantUtil.LEGAL_SPECIALIST);
         if (legalSpecialists == null || legalSpecialists.size() == 0) {
-            throw new ValidatorException(CodeUtil.FAIL, ConstantUtil.OPERATION_SPECIALIST + "角色内无任何用户！");
+            throw new ValidatorException(CodeUtil.FAIL, ConstantUtil.LEGAL_SPECIALIST + "角色内无任何用户！");
+        }
+        List<Long> projectManage  = userService.findUserIdByRole(ConstantUtil.PROJECT_MANAGER);
+        if(projectManage==null || projectManage.size()==0){
+            throw new ValidatorException(CodeUtil.FAIL, ConstantUtil.PROJECT_MANAGER + "角色内无任何用户！");
         }
 
         String legalSpecias = legalSpecialists.stream().map(c -> c.toString()).collect(Collectors.joining(","));
+        String projectManageStr = projectManage.stream().map(c -> c.toString()).collect(Collectors.joining(","));
+
         User admin = userService.getByLoginName("admin");
         //3.开启流程实例
         Map<String, Object> procVariables = new HashMap<>();
@@ -937,31 +1023,43 @@ public class AcceptanceBasicInfoServiceImpl extends ServiceImpl<AcceptanceBasicI
         String processInstId = processInst.getId();
         Map<String, Object> msgVariables = new HashMap<>();
         Task task = flowableService.findRuntimeTaskByProcessInstId(processInstId).get(0);
-        if (acceptanceBasicInfo.getSignConfirm().equals(1)) {
-            procVariables.put(ConstantUtil.ACCEPTANCE_SIGN_CONFIRM_ASSIGNEE, admin.getId());
-            procVariables.put("result", "签署确认");
-            msgVariables.put(ConstantUtil.FLOWABLE_MSG_TITLE, "验收单编号：" + acceptanceBasicInfo.getAcceptanceNumber());
-            msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
-                    "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
-                            + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—签署确认阶段，"
-                            + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+        if (acceptanceBasicInfo.getApproval().equals(1)) {
             User user = new User();
             user.setId(Long.parseLong(task.getAssignee()));
             ThreadLocalUtil.setUser(user);
-            flowableService.completeMyTask(task.getId(), acceptanceBasicInfo, procVariables, null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET);
-
-        } else if (acceptanceBasicInfo.getSignConfirm().equals(0)) {
-            procVariables.put(ConstantUtil.ACCEPTANCE_SHEET_APPROVAL_CANDIDATE, legalSpecias);
-            procVariables.put("result", "法务审核");
+            if(acceptanceBasicInfo.getSignConfirm().equals(1)){
+                procVariables.put(ConstantUtil.ACCEPTANCE_SIGN_CONFIRM_ASSIGNEE, admin.getId());
+                procVariables.put("result", "签署确认");
+                msgVariables.put(ConstantUtil.FLOWABLE_MSG_TITLE, "验收单编号：" + acceptanceBasicInfo.getAcceptanceNumber());
+                msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
+                    "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
+                        + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—签署确认阶段，"
+                        + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+                flowableService.completeMyTask(task.getId(), acceptanceBasicInfo, procVariables, null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET);
+            }else if(acceptanceBasicInfo.getSignConfirm().equals(0)){
+
+                procVariables.put(ConstantUtil.ACCEPTANCE_SHEET_APPROVAL_CANDIDATE, legalSpecias);
+                procVariables.put("result", "法务审核");
+                msgVariables.put(ConstantUtil.FLOWABLE_MSG_TITLE, "验收单编号：" + acceptanceBasicInfo.getAcceptanceNumber());
+                msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
+                    "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
+                        + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—法务审核阶段，"
+                        + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+                 flowableService.completeMyTask(task.getId(), acceptanceBasicInfo, procVariables, null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET, legalSpecialists);
+            }
+        } else if (acceptanceBasicInfo.getApproval().equals(0)) {
+            //如果不申请审核 则由业务经理处理 下一步内容
+            procVariables.put(ConstantUtil.ACCEPTANCE_BUSINESS_APPROVAL_CANDIDATE, projectManageStr);
+            procVariables.put("result", "否");
             msgVariables.put(ConstantUtil.FLOWABLE_MSG_TITLE, "验收单编号：" + acceptanceBasicInfo.getAcceptanceNumber());
             msgVariables.put(ConstantUtil.FLOWABLE_MSG_CONTENT,
-                    "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
-                            + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—法务审核阶段，"
-                            + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
+                "验收单编号为“" + acceptanceBasicInfo.getAcceptanceNumber() + "”的验收单已进入“"
+                    + ConstantConversionUtil.flowBusinessKeyNames.get(ConstantUtil.ACCEPTANCE_SHEET) + "—业务经理审核阶段，"
+                    + ConstantUtil.FLOWABLE_MSG_ASSIGNEE);
             User user = new User();
             user.setId(Long.parseLong(task.getAssignee()));
             ThreadLocalUtil.setUser(user);
-            flowableService.completeMyTask(task.getId(), acceptanceBasicInfo, procVariables, null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET, legalSpecialists);
+            flowableService.completeMyTask(task.getId(), acceptanceBasicInfo, procVariables, null, historyId, msgVariables, ConstantUtil.ACCEPTANCE_SHEET,projectManage);
         }
 
     }

src/main/java/com/sunxung/factoring/service/acceptancesheet/impl/AcceptanceSheetBusinessReviewServiceImpl.java

@@ -0,0 +1,64 @@
+package com.sunxung.factoring.service.acceptancesheet.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sunxung.factoring.component.util.ConstantConversionUtil;
+import com.sunxung.factoring.component.util.ConstantUtil;
+import com.sunxung.factoring.dict.impl.FileModuleDict;
+import com.sunxung.factoring.entity.acceptance.AcceptanceApproval;
+import com.sunxung.factoring.entity.acceptance.AcceptanceBasicInfo;
+import com.sunxung.factoring.entity.acceptance.AcceptanceBusinessApproval;
+import com.sunxung.factoring.entity.acceptance.AcceptanceHisInfo;
+import com.sunxung.factoring.entity.sys.FileStorage;
+import com.sunxung.factoring.entity.sys.FileStorageDO;
+import com.sunxung.factoring.mapper.acceptancesheet.AcceptanceApprovalMapper;
+import com.sunxung.factoring.mapper.acceptancesheet.AcceptanceBusinessApprovalMapper;
+import com.sunxung.factoring.service.acceptancesheet.*;
+import com.sunxung.factoring.service.sys.FileService;
+import com.sunxung.factoring.service.sys.FileStorageService;
+import com.sunxung.factoring.service.sys.ISysAttachmentRefService;
+import com.sunxung.factoring.service.sys.dto.AttachmentDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 业务审核-service
+ * @author liutao
+ * @date 2021.09.27
+ */
+@Service(value = "business_reviewService")
+public class AcceptanceSheetBusinessReviewServiceImpl extends ServiceImpl<AcceptanceBusinessApprovalMapper, AcceptanceBusinessApproval>
+    implements AcceptanceSheetBusinessReviewService {
+
+
+
+    @Autowired
+    private AcceptanceBasicInfoService acceptanceBasicInfoService;
+
+    @Autowired
+    private  AcceptanceHisInfoService acceptanceHisInfoService;
+
+    @Autowired
+    private ISysAttachmentRefService sysAttachmentRefService;
+    @Autowired
+    private IAcceptanceSignConfirmationService acceptanceSignConfirmationService;
+
+    @Autowired
+    private IAcceptanceSignConfirmationElectronicInfoService acceptanceSignConfirmationElectronicInfoService;
+
+    @Autowired
+    private FileStorageService fileStorageService;
+
+    @Autowired
+    private FileService fileService;
+
+    @Override
+    public AcceptanceBusinessApproval getView(Long acceptanceBusinessApprovalId) {
+
+        AcceptanceBusinessApproval businessApproval = getById(acceptanceBusinessApprovalId);
+
+
+        return businessApproval;
+    }
+}

src/main/java/com/sunxung/factoring/service/acceptancesheet/impl/AcceptanceSheetLegalFlowServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sunxung.factoring.service.acceptancesheet.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.sunxung.factoring.component.util.CollectionUtil;
 import com.sunxung.factoring.component.util.ConstantConversionUtil;
 import com.sunxung.factoring.component.util.ConstantUtil;
@@ -55,21 +56,23 @@ public class AcceptanceSheetLegalFlowServiceImpl extends ServiceImpl<AcceptanceA
         AcceptanceApproval acceptanceApproval = getById(acceptanceApprovalId);
         AcceptanceBasicInfo detail = acceptanceBasicInfoService.getDetail(
             acceptanceApproval.getAcceptanceBasicInfoId());
-        //判断这次审核 是所有审核中的第几次
-        List<AcceptanceApproval> approvals = this.lambdaQuery()
-            .eq(AcceptanceApproval::getAcceptanceBasicInfoId,
-                acceptanceApproval.getAcceptanceBasicInfoId()).list();
-        int index = 0;
-        for(int i =0;i<approvals.size();i++){
-            if(approvals.get(i).getId().equals(acceptanceApprovalId)){
-                index = i;
-                break;
-            }
-        }
+//        //判断这次审核 是所有审核中的第几次
+//        List<AcceptanceApproval> approvals = this.lambdaQuery()
+//            .eq(AcceptanceApproval::getAcceptanceBasicInfoId,
+//                acceptanceApproval.getAcceptanceBasicInfoId()).list();
+//        int index = 0;
+//        for(int i =0;i<approvals.size();i++){
+//            if(approvals.get(i).getId().equals(acceptanceApprovalId)){
+//                index = i;
+//                break;
+//            }
+//        }
         //通过业务编号查询 这次审核对应的上次 的历史验收单信息
-        List<AcceptanceHisInfo> list = acceptanceHisInfoService.lambdaQuery()
-            .eq(AcceptanceHisInfo::getAcceptanceNumber, detail.getAcceptanceNumber()).list();
-        AcceptanceHisInfo acceptanceHisInfo = list.get(index);
+//        List<AcceptanceHisInfo> list = acceptanceHisInfoService.lambdaQuery()
+//            .eq(AcceptanceHisInfo::getAcceptanceNumber, detail.getAcceptanceNumber()).list();
+//        AcceptanceHisInfo acceptanceHisInfo = Lists.reverse(list).get(index);
+        AcceptanceHisInfo acceptanceHisInfo = acceptanceHisInfoService.getById(
+            acceptanceApproval.getAcceptanceBasicHisId());
         //
         List<FileStorageDO> file1 = fileService.findByBusinessId(acceptanceHisInfo.getId(),
             FileModuleDict.ChildEnum.ACCEPTANCE_HIS_FILE.getCode());

src/main/java/com/sunxung/factoring/service/acceptancesheet/impl/AcceptanceSignConfirmationServiceImpl.java

@@ -118,6 +118,11 @@ public class AcceptanceSignConfirmationServiceImpl extends ServiceImpl<Acceptanc
         return acceptanceSignConfirmationHistory;
     }
 
+    /**
+     *  第一个节点 处理过程
+     * @param acceptanceSignConfirmation
+     * @return
+     */
     @Override
     public ResponseJson handleProcess(AcceptanceSignConfirmation acceptanceSignConfirmation) {
 

src/main/java/com/sunxung/factoring/service/project/impl/BusinessProcessingTaskServiceImpl.java

@@ -320,7 +320,9 @@ public class BusinessProcessingTaskServiceImpl implements BusinessProcessingTask
                     taskVo.setTaskName(processingLog.getTaskName());
                     if (processingLog.getTaskName().equals("法务审核") || processingLog.getTaskName().equals("单价变更审核")) {
                         taskVo.setAssigneeName("法务专员");
-                    } else {
+                    } else if(processingLog.getTaskName().equals("业务审核")){
+                        taskVo.setAssigneeName("业务经理");
+                    }else {
                         if (taskVo.getAssignee() != null) {
                             taskVo.setAssigneeName(taskVo.getAssignee().getName());
                         } else {

src/main/java/com/sunxung/factoring/web/acceptancesheet/AcceptanceController.java

@@ -79,7 +79,7 @@ public class AcceptanceController {
 
 
     /**
-     * 跳转法务审核页面
+     * 法务审核页面
      * 2.0
      *
      * @return
@@ -211,4 +211,21 @@ public class AcceptanceController {
     public void downloadGoodsInfos(SearchVo searchVo, HttpServletResponse response){
         acceptanceBasicInfoService.downloadGoodsInfos(searchVo,response);
     }
+
+
+
+
+
+    /*************************************************************************************************************/
+
+    /**
+     * 法务审核页面-内容
+     * @return
+     */
+    @RequestMapping("businessReview")
+    @ResponseBody
+    public ResponseJson businessApproval(@RequestBody  AcceptanceBusinessApproval businessApproval) {
+        acceptanceBasicInfoService.businessReview(businessApproval);
+        return new ResponseJson();
+    }
 }

src/main/resources/mapper/cashflowmanage/CashFlowManageBaseInfoMapper.xml

@@ -49,7 +49,7 @@
 	<resultMap id="dictionaryResult" type="Dictionary">
 		<result property="id" column="did" />
 		<result property="name" column="dname" />
-		<result property="code" column="dcode" />
+		<result property="code" column="cash_type" />
 	</resultMap>
 
 	<resultMap id="currencyDictResult" type="Dictionary">
@@ -197,6 +197,7 @@
 			t1.business_number,
 			t1.entry_out_type,
 			t1.cash_status,
+			t1.cash_type,
 			t1.supplier_id,
 			t3.corporate_name supplier_name,
 			t1.trading_platform_id,