diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java index 005a0798f3..5cd998feeb 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java @@ -60,9 +60,9 @@ public class Flow4Rest { ResultBean submit2() { ResultBean rb = ResultBean.fireFail(); List userIds = new ArrayList<>(); - userIds.add("aaa"); - userIds.add("bbb"); - userIds.add("ccc"); + userIds.add("1d85d1fe-e527-4ec5-a5e4-c37a76a36518"); + userIds.add("64e289bc-80cd-487a-9498-5ae61e260f71"); + userIds.add("7ffcd76a-4fa0-4c9c-87ca-a0c2116bb2ed"); Map variables = new HashMap<>(); variables.put("approvers", userIds); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java index 5b3756233d..a239dd5fc9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java @@ -31,6 +31,8 @@ public class AsBusclaimInvoiceBillQuery implements Query { private String closeDateEnd; @ApiModelProperty("开票名称") private String invoiceName; + @ApiModelProperty("开票单位名称") + private String purchaseSystemName; @ApiModelProperty("开票类型key") private String invoiceValue; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java index 726b5a60d6..e4533f2acf 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java @@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.as.api.asappendix.AsAppendix; -import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply; import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill; -import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillExcelInfo; -import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo; import com.yxt.anrui.as.api.asbusclaimcheck.AsBusclaimCheckDto; import com.yxt.anrui.as.api.asbusclaiminvoicebill.*; import com.yxt.anrui.as.api.asbusclaiminvoicebill.flowable.*; @@ -22,7 +19,6 @@ import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillPr import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectFile; import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech; -import com.yxt.anrui.as.api.asbwinvoiceapply.AsBwinvoiceapplyFile; import com.yxt.anrui.as.biz.asappendix.AsAppendixService; import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService; import com.yxt.anrui.as.biz.asbusclaimcheck.AsBusclaimCheckService; @@ -65,10 +61,8 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; @@ -191,6 +185,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService