Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.as.api.asappendix.AsAppendix;
-import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApply;
 import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto;
 import com.yxt.anrui.as.api.asbusrepairbill.*;
 import com.yxt.anrui.as.api.asbusrepairbill.app.*;
@@ -18,7 +17,6 @@ import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance;
 import com.yxt.anrui.as.api.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecord;
 import com.yxt.anrui.as.api.asbusrepairbillinvoice.AsBusrepairBillInvoice;
 import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode;
-import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNodeDto;
 import com.yxt.anrui.as.api.asbusrepairbillother.AsBusrepairBillOther;
 import com.yxt.anrui.as.api.asbusrepairbillsitem.AsBusrepairBillSitem;
 import com.yxt.anrui.as.api.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairer;
@@ -37,9 +35,7 @@ import com.yxt.anrui.as.biz.asbillsettelapply.AsBillSettelApplyService;
 import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
 import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService;
 import com.yxt.anrui.as.biz.asbusrepairbillaitemspec.AsBusrepairBillAitemspecService;
-import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceRest;
 import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceService;
-import com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecordRest;
 import com.yxt.anrui.as.biz.asbusrepairbillinsurancerecord.AsBusrepairBillInsuranceRecordService;
 import com.yxt.anrui.as.biz.asbusrepairbillinvoice.AsBusrepairBillInvoiceService;
 import com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeService;
@@ -67,19 +63,16 @@ import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
 import com.yxt.anrui.as.feign.portal.sysuser.SysUserVo;
 import com.yxt.anrui.as.feign.sms.SmsGoods;
 import com.yxt.anrui.as.feign.sms.SmsGoodsFeign;
-import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventory;
 import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryFeign;
 import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryPush;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.ConstantUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.WordConvertUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -95,8 +88,6 @@ import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.*;
 
-import static java.util.Comparator.comparing;
-
 /**
  * @description:
  * @author: dimengzhe
@@ -152,8 +143,6 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     @Autowired
     private AsServiceItemService asServiceItemService;
     @Autowired
-    private AsArrearsoutApplyService asArrearsoutApplyService;
-    @Autowired
     private DocPdfComponent docPdfComponent;
     @Autowired
     private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapply/AsBwinvoiceapplyRest.java

@@ -26,7 +26,6 @@
 package com.yxt.anrui.as.biz.asbwinvoiceapply;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.yxt.anrui.as.api.asbusclaimcheckapply.flowable.*;
 import com.yxt.anrui.as.api.asbwinvoiceapply.flowable.*;
 import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
 import com.yxt.common.core.query.PagerQuery;
@@ -46,19 +45,6 @@ import com.yxt.anrui.as.api.asbwinvoiceapply.AsBwinvoiceapplyDto;
 import javax.validation.Valid;
 import java.util.List;
 
-/**
- * Project: yxt-as(保外工单) <br/>
- * File: AsBwinvoiceapplyFeignFallback.java <br/>
- * Class: com.yxt.anrui.as.biz.asbwinvoiceapply.AsBwinvoiceapplyRest <br/>
- * Description: 保外工单开票申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-06-17 13:42:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "保外工单开票申请")
 @RestController
 @RequestMapping("v1/asbwinvoiceapply")