Commit 91ff6ea3471140eb9cefad2cebac8ecec3bf58e1
1 parent
ea12d1d3
feat: 问题修复项
1、内部编号处理 '-' 通过接口刷数据处理 2、计算利润率支持全选(根据页面查询条件) 3、计算设计师权重分母对内部编码去重
Showing
1 changed file
with
3 additions
and
1 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | ||
13 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | 13 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
14 | import com.github.stupdit1t.excel.common.PoiWorkbookType; | 14 | import com.github.stupdit1t.excel.common.PoiWorkbookType; |
15 | import com.github.stupdit1t.excel.core.ExcelHelper; | 15 | import com.github.stupdit1t.excel.core.ExcelHelper; |
16 | +import com.github.stupdit1t.excel.style.CellPosition; | ||
16 | import com.order.erp.common.constant.Constant; | 17 | import com.order.erp.common.constant.Constant; |
17 | import com.order.erp.common.constant.ServerResult; | 18 | import com.order.erp.common.constant.ServerResult; |
18 | import com.order.erp.common.constant.ServerResultCode; | 19 | import com.order.erp.common.constant.ServerResultCode; |
@@ -243,6 +244,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O | @@ -243,6 +244,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O | ||
243 | .opsSheet(list) | 244 | .opsSheet(list) |
244 | .opsHeader().simple().texts(keys).done() | 245 | .opsHeader().simple().texts(keys).done() |
245 | .opsColumn().fields(keys).done() | 246 | .opsColumn().fields(keys).done() |
247 | + .height(CellPosition.CELL, 750) | ||
246 | .done() | 248 | .done() |
247 | .export(response.getOutputStream()); | 249 | .export(response.getOutputStream()); |
248 | } | 250 | } |
@@ -921,7 +923,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O | @@ -921,7 +923,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O | ||
921 | } | 923 | } |
922 | if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) { | 924 | if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) { |
923 | return false; | 925 | return false; |
924 | - } else if ("FAIL".equals(inspectionStageInfo.getEndCheckResult())) { | 926 | + } else if ("FAIL" .equals(inspectionStageInfo.getEndCheckResult())) { |
925 | return false; | 927 | return false; |
926 | } | 928 | } |
927 | return true; | 929 | return true; |