Merge remote-tracking branch 'origin/master'

luodangjia

2024-09-12 cab3810cada6499726ad2d584c84452fbfb107ee

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java

@@ -5,6 +5,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.other.api.domain.TInvoiceType;
import com.ruoyi.other.query.InvoiceTypePageList;
import com.ruoyi.other.service.TInvoiceTypeService;
@@ -40,13 +42,12 @@
      PageInfo<TInvoiceType> pageInfo = invoiceTypeService.pageList(pageList);
      return AjaxResult.success(pageInfo);
   }
   @ResponseBody
   @GetMapping("/pageListR")
   @ApiOperation(value = "获取开票公司和类型列表", tags = {"管理后台-发票管理"})
   public R<List<TInvoiceType>> pageListR( String company){
   public R<List<TInvoiceType>> pageListR(String invoicingCompany ){
      List<TInvoiceType> list = new ArrayList<>();
      if (StringUtils.hasLength(company)){
         list = invoiceTypeService.lambdaQuery().eq(TInvoiceType::getInvoicingCompany, company).list();
      if (StringUtils.hasLength(invoicingCompany )){
         list = invoiceTypeService.lambdaQuery().eq(TInvoiceType::getInvoicingCompany, invoicingCompany).list();
      }else{
         list = invoiceTypeService.lambdaQuery().list();
      }
@@ -57,6 +58,7 @@
   @ResponseBody
   @PostMapping("/addInvoiceType")
   @ApiOperation(value = "添加发票类型", tags = {"管理后台-发票类型管理"})
   @Log(title = "【发票类型管理】添加发票类型", businessType = BusinessType.INSERT)
   public AjaxResult addInvoiceType(@RequestBody TInvoiceType invoiceType){
      invoiceTypeService.save(invoiceType);
      return AjaxResult.success();
@@ -74,6 +76,7 @@
   @ResponseBody
   @PostMapping("/editInvoiceType")
   @ApiOperation(value = "编辑发票类型", tags = {"管理后台-发票类型管理"})
   @Log(title = "【发票类型管理】编辑发票类型", businessType = BusinessType.UPDATE)
   public AjaxResult editInvoiceType(@RequestBody TInvoiceType invoiceType){
      invoiceTypeService.updateById(invoiceType);
      return AjaxResult.success();
@@ -83,6 +86,7 @@
   @ResponseBody
   @DeleteMapping("/delInvoiceType")
   @ApiOperation(value = "删除发票类型", tags = {"管理后台-发票类型管理"})
   @Log(title = "【发票类型管理】删除发票类型", businessType = BusinessType.DELETE)
   public AjaxResult<TInvoiceType> delInvoiceType(Integer[] id){
      List<TInvoiceType> tInvoiceTypes = invoiceTypeService.listByIds(Arrays.asList(id));
      for (TInvoiceType invoiceType : tInvoiceTypes) {