业务端报表

hx-form/src/main/java/com/fjhx/form/entity/SaleReportBo.java

@@ -25,10 +25,15 @@ public class SaleReportBo {
      */
     private Long ofCompanyId;
     private String ofCompanyName;
+
+    /**
+     * 业务部门id
+     */
+    private Long deptId;
     /**
      * 业务部门
      */
-    private String ofDeptName;
+    private String deptName;
 
     /**
      * 生产公司

hx-form/src/main/java/com/fjhx/form/service/impl/ReportServiceImpl.java

@@ -100,6 +100,23 @@ public class ReportServiceImpl implements ReportService {
     public Page<SaleReportBo> saleReport(ProductionReportSelectDto dto) {
         IWrapper<Object> wrapper = IWrapper.getWrapper();
         Page<SaleReportBo> saleReportBoPage = reportMapper.saleReport(dto.getPage(), wrapper);
+        List<SaleReportBo> records = saleReportBoPage.getRecords();
+
+        //获取部门列表
+        List<SysDept> deptList = deptService.list();
+        Map<Long, String> deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+
+        for (SaleReportBo record : records) {
+            //业务公司
+            record.setOfCompanyName(deptMap.get(record.getOfCompanyId()));
+            //业务部门
+            record.setDeptName(deptMap.get(record.getDeptId()));
+            //工厂
+            record.setCompanyName(deptMap.get(record.getCompanyId()));
+            //不及时率
+            BigDecimal untimelyRate = record.getOutInterval().divide(BigDecimal.valueOf(30), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+            record.setUntimelyRate(untimelyRate);
+        }
         return saleReportBoPage;
     }
 }

hx-form/src/main/resources/mapper/ReportMapper.xml

@@ -23,6 +23,7 @@
         SELECT c.contract_type,
                c.`code`,
                c.of_company_id,
+               c.dept_id,
                c.company_id,
                c.belong_type,
                c.amount,