移动端开票申请流程

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java

@@ -3,14 +3,14 @@ package com.yxt.anrui.terminal.api.autoservice.invoiced;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedDto;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedQuery;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedTaskQuery;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.SubmitInvoicedInfoDto;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * @Author dimengzhe
@@ -24,6 +24,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
         fallback = InvoicedFeignFallback.class)
 public interface InvoicedFeign {
 
+    @ApiOperation("提交")
+    @PostMapping("/submitInvoicedInfo")
+    @ResponseBody
+    public ResultBean submitInvoicedInfo(@Valid @RequestBody SubmitInvoicedInfoDto dto);
 
     @ApiOperation("办理")
     @PutMapping("/agreeInvoicedInfo")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/SubmitInvoicedInfoDto.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.autoservice.invoiced.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/6 18:31
+ * @Description
+ */
+@Data
+public class SubmitInvoicedInfoDto {
+    private static final long serialVersionUID = -7454917532669488852L;
+
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java

@@ -4,6 +4,7 @@ import com.yxt.anrui.terminal.api.autoservice.invoiced.InvoicedFeign;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedDto;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedQuery;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedTaskQuery;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.SubmitInvoicedInfoDto;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,11 @@ public class InvoicedRest implements InvoicedFeign {
     @Autowired
     private InvoicedService invoicedService;
 
+    @Override
+    public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
+        return invoicedService.submitInvoicedInfo(dto);
+    }
+
     @Override
     public ResultBean agreeInvoicedInfo(InvoicedDto dto) {
         return invoicedService.agreeInvoicedInfo(dto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -1,7 +1,9 @@
 package com.yxt.anrui.terminal.biz.autoservice.invoiced;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
+import com.yxt.anrui.fin.api.finbillapplication.SubmitFinBillApplicationDto;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeVo;
@@ -13,6 +15,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedDto;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedQuery;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.InvoicedTaskQuery;
+import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.SubmitInvoicedInfoDto;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -120,4 +123,15 @@ public class InvoicedService {
         }
         return rb.success().setData(data);
     }
+
+    public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        SubmitFinBillApplicationDto submitFinBillApplicationDto = new SubmitFinBillApplicationDto();
+        BeanUtil.copyProperties(dto, submitFinBillApplicationDto);
+        ResultBean resultBean = finBillApplicationFeign.submitFinBillApplication(submitFinBillApplicationDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
+    }
 }