优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmReportController.java

@@ -14,6 +14,7 @@ import com.bonus.material.basic.domain.report.*;
 import com.bonus.material.basic.service.BmReportService;
 import com.bonus.material.common.utils.DocxUtil;
 import com.bonus.material.common.utils.HttpFileUtil;
+import com.bonus.material.ma.service.ITypeService;
 import com.bonus.material.part.domain.PartTypeCheckInfo;
 import com.bonus.material.part.domain.PartTypeQueryDto;
 import io.swagger.annotations.Api;
@@ -63,6 +64,9 @@ public class BmReportController extends BaseController {
     @Resource
     private BmReportService bmReportService;
 
+    @Resource
+    private ITypeService iTypeService;
+
     // 存储下载进度
     private static final Map<String, DownloadProgress> downloadProgressMap = new ConcurrentHashMap<>();
 
@@ -75,6 +79,8 @@ public class BmReportController extends BaseController {
     @GetMapping("/getPurChaseReportList")
     public AjaxResult getPurChaseReportList(PurChaseReportInfo bean) {
         bean.setIsExport(1);
+        Long companyId = iTypeService.getUserDeptId();
+        bean.setCompanyId(companyId);
         startPage();
         List<PurChaseReportInfo> pageList = bmReportService.getPurChaseReportList(bean);
         return AjaxResult.success(getDataTable(pageList));

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportDetails.java

@@ -3,6 +3,7 @@ package com.bonus.material.basic.domain.report;
 import com.bonus.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
 
 import java.math.BigDecimal;
 
@@ -26,12 +27,12 @@ public class PurChaseReportDetails {
     @Excel(name = "设备编码")
     private String maCode;
 
-    @ApiModelProperty(value = "采购价格含税")
-    @Excel(name = "采购价格（含税）")
-    private BigDecimal purchasePrice;
-
     @ApiModelProperty(value = "采购价格不含税")
-    @Excel(name = "采购价格（不含税）")
+    @Excel(name = "采购价格（不含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
     private BigDecimal purchasePriceNoTax;
 
+    @ApiModelProperty(value = "采购价格含税")
+    @Excel(name = "采购价格（含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
+    private BigDecimal purchasePrice;
+
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportInfo.java

@@ -58,14 +58,14 @@ public class PurChaseReportInfo {
     @Excel(name = "待入库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
     private BigDecimal pendingInputNum;
 
-    @ApiModelProperty(value = "采购价格含税")
-    @Excel(name = "采购价格（含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
-    private BigDecimal purchasePrice;
-
     @ApiModelProperty(value = "采购价格不含税")
     @Excel(name = "采购价格（不含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
     private BigDecimal purchasePriceNoTax;
 
+    @ApiModelProperty(value = "采购价格含税")
+    @Excel(name = "采购价格（含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
+    private BigDecimal purchasePrice;
+
     @ApiModelProperty(value = "物资厂家")
     @Excel(name = "物资厂家", width = 30)
     private String supplierName;

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java

@@ -34,8 +34,6 @@ public class BmReportServiceImpl implements BmReportService {
     @Resource
     private BmFileInfoMapper fileInfoMapper;
 
-    @Resource
-    private ITypeService iTypeService;
     /**
      * 新购入库报表查询
      * @param bean
@@ -44,9 +42,6 @@ public class BmReportServiceImpl implements BmReportService {
     @Override
     public List<PurChaseReportInfo> getPurChaseReportList(PurChaseReportInfo bean) {
         bean.setUserId(SecurityUtils.getLoginUser().getUserid());
-        // jsk
-        Long companyId=iTypeService.getUserDeptId();
-        bean.setCompanyId(companyId);
         BigDecimal totalPurchaseNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP);
         BigDecimal totalPassNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP);
         BigDecimal totalInputNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP);