发票流程审核

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/controller/CwFinanceInvoiceController.java

@@ -7,6 +7,7 @@ import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.finance.invoice.domain.CwFinanceInvoice;
+import com.jeeplus.finance.invoice.domain.CwFinanceInvoiceBase;
 import com.jeeplus.finance.invoice.service.CwFinanceInvoiceService;
 import com.jeeplus.finance.invoice.service.dto.CwFinanceDTO;
 import com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceDTO;
@@ -139,6 +140,7 @@ public class CwFinanceInvoiceController {
         CwFinanceInvoice cwFinanceInvoice = cwFinanceInvoiceService.saveForm(cwFinanceInvoiceDTO);
         return ResponseUtil.newInstance().add("businessTable", "cw_finance_invoice")
                 .add("businessId", cwFinanceInvoice.getId())
+                .add("recordType",cwFinanceInvoice.getRecordType())
                 .add("no", cwFinanceInvoice.getNo())
                 .ok ("操作成功");
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -425,14 +425,17 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                         if (null!=cwProjectRecordsMapper.queryById(cwFinanceInvoiceBase.getProgramId())){
                             cwFinanceInvoiceBase.setType("1");
                             cwFinanceInvoiceBaseMapper.updateById(cwFinanceInvoiceBase);
+                            cwFinanceInvoice.setRecordType(cwFinanceInvoiceBase.getType());
                         }
                         if (null!=cwProjectReportMapper.queryById(cwFinanceInvoiceBase.getProgramId())){
                             cwFinanceInvoiceBase.setType("2");
                             cwFinanceInvoiceBaseMapper.updateById(cwFinanceInvoiceBase);
+                            cwFinanceInvoice.setRecordType(cwFinanceInvoiceBase.getType());
                         }
                     }else {
                         cwFinanceInvoiceBase.setType("0");
                         cwFinanceInvoiceBaseMapper.updateById(cwFinanceInvoiceBase);
+                        cwFinanceInvoice.setRecordType(cwFinanceInvoiceBase.getType());
                     }
 
                 });

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/constant/FlowableConstant.java

@@ -20,5 +20,6 @@ public interface FlowableConstant {
     String PROCESS_STATUS_COMMENT = "_process_status_comment"; //流程状态描述
     String AFTER_ADDSIGN = "after";    //后加签
     String BEFORE_ADDSIGN = "before";    //前加签
+    String RECORDTYPE="recordType";   //项目类型
 
 }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -167,7 +167,7 @@ public class FlowableTaskController {
      */
     @PostMapping("start")
     public ResponseEntity start(@RequestBody Flow flow) {
-        String procInsId = flowTaskService.startProcess ( flow.getProcDefKey ( ), flow.getBusinessTable ( ), flow.getBusinessId ( ), flow.getTitle ( ), flow.getProcDefId() );
+        String procInsId = flowTaskService.startProcess ( flow.getProcDefKey ( ), flow.getBusinessTable ( ), flow.getBusinessId ( ), flow.getTitle ( ),flow.getRecordType(), flow.getProcDefId() );
 
         //指定下一步处理人
         if ( StringUtils.isNotBlank ( flow.getAssignee ( ) ) ) {

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/model/Flow.java

@@ -67,9 +67,13 @@ public class Flow {
 
     private List <Flow> list; // 任务列表
 
+    private String applyUserId; // 流程发起人id  查询条件
+
 
     private String formUrl;//流程表单地址
 
+    private String recordType;//获取发票基本信息类型
+
 
     public Flow() {
         super ( );
@@ -166,6 +170,7 @@ public class Flow {
     }
 
 
+
     /**
      * 通过Map设置流程变量值
      *

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -613,11 +613,12 @@ public class FlowTaskService {
      * @param businessTable 业务表表名
      * @param businessId    业务表编号
      * @param title         流程标题，显示在待办任务标题
+     * @param recordType    项目类型
      * @return 流程实例ID
      */
-    public String startProcess(String procDefKey, String businessTable, String businessId, String title, String procDefId) {
+    public String startProcess(String procDefKey, String businessTable, String businessId, String title,String recordType, String procDefId) {
         Map <String, Object> vars = Maps.newHashMap ( );
-        return startProcess ( procDefKey, businessTable, businessId, title,  vars , procDefId);
+        return startProcess ( procDefKey, businessTable, businessId, title,  vars ,recordType, procDefId);
     }
 
     /**
@@ -631,7 +632,7 @@ public class FlowTaskService {
      * @return 流程实例ID
      */
     @SuppressWarnings("unused")
-    public String startProcess(String procDefKey, String businessTable, String businessId, String title, Map <String, Object> vars,  String procDefId) {
+    public String startProcess(String procDefKey, String businessTable, String businessId, String title, Map <String, Object> vars,String recordType,  String procDefId) {
         //String userId = UserUtils.getUser().getLoginName();//ObjectUtils.toString(UserUtils.getUser().getId())
         // 设置流程变量
         if ( vars == null ) {
@@ -652,6 +653,11 @@ public class FlowTaskService {
         if ( StrUtil.isNotBlank ( title ) ) {
             vars.put ( FlowableConstant.TITLE, title );
         }
+        //设置项目类型
+        if (StrUtil.isNotBlank(recordType)){
+            vars.put(FlowableConstant.RECORDTYPE,recordType);
+        }
+
 
         // 启动流程
         ProcessInstance procIns = runtimeService.startProcessInstanceByKeyAndTenantId ( procDefKey, businessTable + ":" + businessId, vars, /*tenantApi.getCurrentTenantId ( )*/ flowMapper.getTenantIdByProcDefKey(procDefKey) );