fix:业务研发净利润四张表添加状态筛选,对于通过订单在导出时添加通过标识。

chenhang4442024
1 parent 45794e51
Showing 6 changed files with 183 additions and 10 deletions
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
src/main/java/com/order/erp/mapper/order/ProjectBaseInfoMapper.java
src/main/java/com/order/erp/service/order/impl/OrderCostInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
src/main/resources/images/know.png
src/main/resources/mapper/ProjectBaseInfoMapper.xml
@@ -211,5 +211,26 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
      * checkNo   checkNo状态。
      */
     private Long checkNoStatus;
+
+    /**
+     *  业务研发净利润分析表状态
+     * */
+    private Integer developmentStatus;
+    /**
+     *  包装费用明细表状态
+     * */
+    private Integer packStatus;
+    /**
+     *  内部生产净利润分析表状态
+     * */
+    private Integer innerProductionStatus;
+    /**
+     *  内部生产明细表状态
+     * */
+    private Integer innerProduceStatus;
+    /**
+     * 业务研发以及内部生产表中的前缀项目号
+     * */
+    private Set<String> projectNoPrefixSet;
 }
@@ -24,5 +24,7 @@ public interface ProjectBaseInfoMapper extends BaseMapper&lt;ProjectBaseInfoDO&gt; {
     List<String> selectDistinctProjectNos( @Param("queryVO")OrderBaseInfoQueryVO queryVO);
+    IPage<OrderBaseInfoDO> pageProjectNos(@Param("page") Page<OrderBaseInfoDO> page, @Param("queryVO")OrderBaseInfoQueryVO queryVO);
+
 }
@@ -195,6 +195,21 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     @Override
     public ServerResult<Page<InnerProfitDetailVO>> listInnerProfitDetailByPage(OrderBaseInfoQueryVO queryVO) {
+        Set<Long> orderIds = null;
+        if(Objects.nonNull(queryVO.getInnerProduceStatus())){
+            List<OrderCostInfoDO> list = list(new LambdaQueryWrapper<OrderCostInfoDO>()
+                    .select(OrderCostInfoDO::getOrderId).eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(OrderCostInfoDO::getInnerProduceStatus, queryVO.getInnerProduceStatus()));
+            orderIds = CollectionUtils.isEmpty(list)
+                    ? new HashSet<>()
+                    : list.stream()
+                    .map(OrderCostInfoDO::getOrderId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+        }
+        if(CollectionUtils.isNotEmpty(orderIds)){
+            queryVO.setOrderIds(orderIds);
+        }
         ServerResult serverResult = orderBaseInfoService.listByPage(queryVO);
         Page<OrderInfoResultVO> page = (Page<OrderInfoResultVO>) serverResult.getData();
         List<OrderInfoResultVO> records = page.getRecords();
@@ -302,6 +317,21 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     @Override
     public ServerResult<Page<BusinessProfitDetailVO>> listBusinessProfitDetailByPage(OrderBaseInfoQueryVO queryVO) {
+        Set<Long> orderIds=null;
+        if(Objects.nonNull(queryVO.getPackStatus())){
+            List<OrderCostInfoDO> list = list(new LambdaQueryWrapper<OrderCostInfoDO>().select(OrderCostInfoDO::getOrderId)
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(OrderCostInfoDO::getPackStatus, queryVO.getPackStatus()));
+             orderIds = CollectionUtils.isEmpty(list)
+                    ? new HashSet<>()
+                    : list.stream()
+                    .map(OrderCostInfoDO::getOrderId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+        }
+        if(CollectionUtils.isNotEmpty(orderIds)){
+            queryVO.setOrderIds(orderIds);
+        }
         ServerResult serverResult = orderBaseInfoService.listByPage(queryVO);
         Page<OrderInfoResultVO> page = (Page<OrderInfoResultVO>) serverResult.getData();
         List<OrderInfoResultVO> records = page.getRecords();
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -49,6 +50,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -285,7 +287,25 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     @Override
     public ServerResult<Page<InnerProfitInfoVO>> listInnerProfitInfoByPage(OrderBaseInfoQueryVO queryVO) {
-        Page<OrderBaseInfoDO> page = pageProjectNo(queryVO);
+        Set<String> projectNoPrefix = null;
+        //如果有状态则先查询有状态的数据。
+        if(Objects.nonNull(queryVO.getInnerProductionStatus())){
+            List<ProjectBaseInfoDO> list = list(new LambdaQueryWrapper<ProjectBaseInfoDO>()
+                    .select(ProjectBaseInfoDO::getProjectNoPrefix)
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(ProjectBaseInfoDO::getInnerProductionStatus, queryVO.getInnerProductionStatus()));
+            projectNoPrefix = CollectionUtils.isEmpty(list)
+                    ? new HashSet<>()
+                    : list.stream()
+                    .map(ProjectBaseInfoDO::getProjectNoPrefix)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+        }
+        if(CollectionUtils.isNotEmpty(projectNoPrefix)){
+            queryVO.setProjectNoPrefixSet(projectNoPrefix);
+        }
+        Page<OrderBaseInfoDO> page  = (Page<OrderBaseInfoDO>) baseMapper.pageProjectNos(new Page<>(queryVO.getPage(), queryVO.getPageSize()), queryVO);
+//        Page<OrderBaseInfoDO> page=pageProjectNo(queryVO);
         List<OrderInfoResultVO> orderInfoResultVOS = getOrderInfoResultVOS(page, queryVO);
         List<InnerProfitInfoVO> innerProfitInfoVOs = buildInnerProfitInfos(orderInfoResultVOS);
         return buildPageResult(page, innerProfitInfoVOs);
@@ -293,6 +313,23 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     @Override
     public ServerResult<Page<BusinessProfitInfoVO>> listBusinessProfitInfoByPage(OrderBaseInfoQueryVO queryVO) {
+        Set<String> projectNoPrefix = null;
+        //如果有状态则先查询有状态的数据。
+        if(Objects.nonNull(queryVO.getDevelopmentStatus())){
+            List<ProjectBaseInfoDO> list = list(new LambdaQueryWrapper<ProjectBaseInfoDO>()
+                    .select(ProjectBaseInfoDO::getProjectNoPrefix)
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(ProjectBaseInfoDO::getDevelopmentStatus, queryVO.getDevelopmentStatus()));
+            projectNoPrefix = CollectionUtils.isEmpty(list)
+                    ? new HashSet<>()
+                    : list.stream()
+                    .map(ProjectBaseInfoDO::getProjectNoPrefix)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+        }
+        if(CollectionUtils.isNotEmpty(projectNoPrefix)){
+            queryVO.setProjectNoPrefixSet(projectNoPrefix);
+        }
         Integer page = queryVO.getPage();
         Integer size = queryVO.getPageSize();
         // 之前是查询项目号前八位,但是遇到A06-PS-2503-1,就会出问题,所以这里根据第二段截取,判断是否包含中文或者英文,如果包含中文或者英文时就截取前三段,如果不包含,则区前八位。
@@ -323,7 +360,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     /**
      * 分页查询项目号前8位
      */
-    private Page<OrderBaseInfoDO> pageProjectNo(OrderBaseInfoQueryVO queryVO) {
+/*    private Page<OrderBaseInfoDO> pageProjectNo(OrderBaseInfoQueryVO queryVO) {
         LambdaQueryWrapper<OrderBaseInfoDO> orderBaseInfoDOLambdaQueryWrapper = orderBaseInfoService.buildQueryByParam(queryVO).select(OrderBaseInfoDO::getId);
         return orderBaseInfoService.page(new Page<>(queryVO.getPage(), queryVO.getPageSize()),
                 new LambdaQueryWrapper<OrderBaseInfoDO>()
@@ -338,7 +375,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                             }
                         })
                         .groupBy(OrderBaseInfoDO::getProjectNo));
-    }
+    }*/
     /**
      * 分页查询项目号前8位
@@ -1086,7 +1123,27 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         createMergedRow(sheet, cellStyle, 34, 35, 0, 4, "研发贸易净利润率");
         createMergedRow(sheet, cellStyle, 34, 35, 5, 6, Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP) + "%").orElse("-"));
         createMergedRow(sheet, cellStyle, 34, 35, 7, 9, "");
-        createMergedRow(sheet, cellStyle, 36, 37, 0, 4, "包装费用合计金额");
+        if(ProfitStatusEnum.APPROVED.getStatus() .equals(Optional.ofNullable(businessProfitInfoVO.getDevelopmentStatus()).orElse(null))) {
+            // 插入图片到总经理审核下面的单元格
+            InputStream is = getClass().getClassLoader().getResourceAsStream("images/know.png"); // 假设图片在 resources/static 目录下
+            //采用btyes部署到服务器上报错,所以不使用bytes。
+//            byte[] bytes = IOUtils.toByteArray(is);
+
+            int pictureIdx = workbook.addPicture(is, Workbook.PICTURE_TYPE_PNG);
+            is.close();
+
+            Drawing<?> drawing = sheet.createDrawingPatriarch();
+            ClientAnchor anchor = workbook.getCreationHelper().createClientAnchor();
+// 设置图片位置和大小（行列号对应“总经理审核”下的单元格范围）
+            anchor.setCol1(7); // 起始列：总经理审核格子开始列
+            anchor.setRow1(26); // 起始行：总经理审核格子开始行
+            anchor.setCol2(10); // 结束列：总经理审核格子结束列
+            anchor.setRow2(35); // 结束行：总经理审核格子结束行
+            Picture picture = drawing.createPicture(anchor, pictureIdx);
+// 如果图片仍然过大，调整缩放比例
+            picture.resize(1.1); // 调整为 80% 的大小
+        }
+       /* createMergedRow(sheet, cellStyle, 36, 37, 0, 4, "包装费用合计金额");
         createMergedRow(sheet, cellStyle, 36, 37, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
         createMergedRow(sheet, cellStyle, 36, 37, 7, 9, "");
         createMergedRow(sheet, cellStyle, 38, 39, 0, 4, "包装费用实际金额");
@@ -1120,7 +1177,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
 //        createMergedRow(sheet, cellStyle, 52, 53, 7, 9, "");
         createMergedRow(sheet, cellStyle, 50, 51, 0, 4, "综合收益");
         createMergedRow(sheet, cellStyle, 50, 51, 5, 6, Optional.ofNullable(businessProfitInfoVO.getComprehensiveProfit()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 50, 51, 7, 9, "");
+        createMergedRow(sheet, cellStyle, 50, 51, 7, 9, "");*/
         // 设置响应头
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -1134,7 +1191,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     @Override
     public void exportInnerProfitInfo(HttpServletResponse response, String projectNoPrefix) throws Exception {
-        ServerResult serverResult = listInnerProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(1).productionDepartment(Collections.singletonList("内部")).projectNoLikeRight(projectNoPrefix).build());
+        ServerResult serverResult = listInnerProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(1).productionDepartment(Collections.singletonList("内部")).projectNoLikeRight(projectNoPrefix+"%").build());
         Page<InnerProfitInfoVO> page = (Page<InnerProfitInfoVO>) serverResult.getData();
         List<InnerProfitInfoVO> profitInfoVOS = page.getRecords();
         InnerProfitInfoVO ProfitInfoVO = profitInfoVOS.get(0);
@@ -1278,7 +1335,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         projectBaseInfoDO.setInnerProductionStatus(ProfitStatusEnum.APPROVED.getStatus());
         //把审核通过时的计算数据时的系统配置保存到永久配置中。防止后续更改系统配置后,正确的数据会被更新掉。
         //获取当前的系统配置。
-        String projectNoSuffixYear = vo.getProjectNo().substring(vo.getProjectNo().lastIndexOf("-")+1).substring(0, 2);
+        String projectNoSuffixYear = vo.getProjectNo().substring(ProjectNoUtils.extractProjectNoPrefix(vo.getProjectNo()).lastIndexOf("-") + 1).substring(0, 2);
         ProjectBaseAfterReviewSettingDO projectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingService.getOne(new LambdaQueryWrapper<ProjectBaseAfterReviewSettingDO>()
                 .eq(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, vo.getProjectNo())
 //                .eq(ProjectBaseAfterReviewSettingDO::getYear,"20"+vo.getProjectNo().substring(4, 6))
@@ -1413,6 +1470,26 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         createMergedRow(sheet, cellStyle, 22, 23, 4, 5, "￥" + Optional.ofNullable(vo.getInnerProductionProfit()).orElse(BigDecimal.ZERO));
         createMergedRow(sheet, cellStyle, 22, 23, 6, 7, Optional.ofNullable(vo.getInnerProductionProfitRate()).map(r -> r.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%").orElse("-"));
         createMergedRow(sheet, cellStyle, 22, 23, 8, 9, "");
+        if(ProfitStatusEnum.APPROVED.getStatus() .equals(Optional.ofNullable(vo.getInnerProductionStatus()).orElse(null))) {
+            // 插入图片到总经理审核下面的单元格
+            InputStream is = getClass().getClassLoader().getResourceAsStream("images/know.png"); // 假设图片在 resources/static 目录下
+            //采用btyes部署到服务器上报错,所以不使用bytes。
+//            byte[] bytes = IOUtils.toByteArray(is);
+
+            int pictureIdx = workbook.addPicture(is, Workbook.PICTURE_TYPE_PNG);
+            is.close();
+
+            Drawing<?> drawing = sheet.createDrawingPatriarch();
+            ClientAnchor anchor = workbook.getCreationHelper().createClientAnchor();
+// 设置图片位置和大小（行列号对应“总经理审核”下的单元格范围）
+            anchor.setCol1(7); // 起始列：总经理审核格子开始列
+            anchor.setRow1(17); // 起始行：总经理审核格子开始行
+            anchor.setCol2(10); // 结束列：总经理审核格子结束列
+            anchor.setRow2(27); // 结束行：总经理审核格子结束行
+            Picture picture = drawing.createPicture(anchor, pictureIdx);
+// 如果图片仍然过大，调整缩放比例
+            picture.resize(1.1); // 调整为 80% 的大小
+        }
         // 设置响应头
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -1509,13 +1586,13 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                             ? vo.getDevelopmentProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"
                             : ""
             );
-            hashMap.put("包装费用合计￥",Objects.nonNull(vo.getPacketRmbTotalPrice()) ? String.format("%.2f",vo.getPacketRmbTotalPrice()) : "");
+ /*           hashMap.put("包装费用合计￥",Objects.nonNull(vo.getPacketRmbTotalPrice()) ? String.format("%.2f",vo.getPacketRmbTotalPrice()) : "");
             hashMap.put("包装费用实际金额￥",Objects.nonNull(vo.getPacketActualRmbPrice()) ? vo.getPacketActualRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
             hashMap.put("订单总数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
             hashMap.put("实际跟单单价￥",Objects.nonNull(vo.getActualOrderRmbPrice()) ? vo.getActualOrderRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
             hashMap.put("实际跟单单价$",Objects.nonNull(vo.getActualOrderPrice()) ? vo.getActualOrderPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
             hashMap.put("包装费用收益￥",Objects.nonNull(vo.getPacketProfitRmbPrice()) ? vo.getPacketProfitRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
-            hashMap.put("综合收益￥",Objects.nonNull(vo.getComprehensiveProfit()) ? vo.getComprehensiveProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("综合收益￥",Objects.nonNull(vo.getComprehensiveProfit()) ? vo.getComprehensiveProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");*/
 //            if(StringUtils.isNotBlank(queryVO.getProjectExportSelect().getSpainPaidRmbCommission()) &&
 //            OrderLockFieldEnum.SELECTED.name().equals(queryVO.getProjectExportSelect().getSpainPaidRmbCommission())){
 //            }
@@ -7,6 +7,7 @@
         SELECT DISTINCT project_no
         FROM order_base_info
         <where>
+            enable_flag = 10
             <if test="queryVO.customerCode != null and queryVO.customerCode.size() > 0">
                 AND customer_code IN
                 <foreach collection="queryVO.customerCode" item="code" open="(" separator="," close=")">
@@ -19,9 +20,51 @@
                     #{proj}
                 </foreach>
             </if>
+            <if test="queryVO.projectNoPrefixSet != null and queryVO.projectNoPrefixSet.size() > 0">
+                AND (
+                <foreach collection="queryVO.projectNoPrefixSet" item="proj" separator="OR">
+                    project_no LIKE CONCAT(#{proj}, '%')
+                </foreach>
+                )
+            </if>
         </where>
     </select>
+    <select id="pageProjectNos" resultType="com.order.erp.domain.dto.order.OrderBaseInfoDO">
+        SELECT project_no
+        FROM order_base_info
+        <where>
+            enable_flag = 10
+            <if test="queryVO.customerCode != null and queryVO.customerCode.size() > 0">
+                AND customer_code IN
+                <foreach collection="queryVO.customerCode" item="code" open="(" separator="," close=")">
+                    #{code}
+                </foreach>
+            </if>
+            <if test="queryVO.projectNo != null and queryVO.projectNo.size() > 0">
+                AND project_no IN
+                <foreach collection="queryVO.projectNo" item="proj" open="(" separator="," close=")">
+                    #{proj}
+                </foreach>
+            </if>
+            <if test="queryVO.projectNoPrefixSet != null and queryVO.projectNoPrefixSet.size() > 0">
+                AND  project_no IN
+                <foreach collection="queryVO.projectNoPrefixSet" item="proj" open="(" separator="," close=")">
+                    #{proj}
+                </foreach>
-
+            </if>
+            <if test="queryVO.ProductionDepartment !=null and queryVO.ProductionDepartment.size() > 0">
+                AND production_department
+                IN
+                <foreach collection="queryVO.ProductionDepartment" item="department" open="(" separator="," close=")">
+                    #{department}
+                </foreach>
+            </if>
+            <if test="queryVO.projectNoLikeRight != null and queryVO.projectNoLikeRight != ''">
+                AND project_no LIKE #{queryVO.projectNoLikeRight}
+            </if>
+        </where>
+        GROUP BY project_no
+    </select>
 </mapper>