1.控制台bug优化

src/main/java/com/ydtech/modules/admin/service/impl/CompanyDataReportServiceImpl.java

@@ -236,8 +236,26 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
         HashMap<String, String> dateMapByType = getDateMapByType(ordersDataVo.getDateType(), ordersDataVo.getBeginDate(), ordersDataVo.getEndDate());
         ordersDataVo.setBeginDate(dateMapByType.get("startDate"));
         ordersDataVo.setEndDate(dateMapByType.get("endDate"));
-
         List<OrdersDataExcel> resultSubOrder = insAreaCompanyMapper.querOrdersDataListExcel(ordersDataVo);
+            if(!resultSubOrder.isEmpty()){
+                OrdersDataDto ordersDataDto = new OrdersDataDto();
+                ordersDataDto.setBeginDate(dateMapByType.get("startDate"));
+                ordersDataDto.setEndDate(dateMapByType.get("endDate"));
+                for (OrdersDataExcel record : resultSubOrder) {
+                    String licenseno = record.getLicenseno();  //车牌号
+                    String frameno = record.getFrameno();   //车牌号
+                    ordersDataDto.setLicenseno(licenseno);
+                    ordersDataDto.setFrameno(frameno);
+                    OrdersDataDto dto = insAreaCompanyMapper.getSumBigOrderCount(ordersDataDto);
+                    String orderNumber = dto.getOrderNumber();
+                    BigDecimal num1 = new BigDecimal(orderNumber);
+                    BigDecimal num2 = new BigDecimal(record.getOrderNumber());
+                    BigDecimal result = num1.divide(num2, 2, RoundingMode.HALF_UP);
+                    record.setCloseRate(result.toString());
+                    record.setNamesimple(dto.getNamesimple());
+
+                }
+            }
         String uploadPath = this.uploadPath + "/excel/";
         Path path = Paths.get(uploadPath);
         if (!Files.exists(path)) {

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -1550,7 +1550,7 @@
             </if>
 
              <if test="taskStatisticsVo.companyId !=null  and  taskStatisticsVo.companyId !=''">
-                and ifa.company_id =#{taskStatisticsVo.companyId}
+                and iac.company_id =#{taskStatisticsVo.companyId}
             </if>
 
             <if test="taskStatisticsVo.createtimeStart !=null and taskStatisticsVo.createtimeStart != '' and taskStatisticsVo.createtimeEnd !=null and taskStatisticsVo.createtimeEnd != ''">
@@ -2364,6 +2364,7 @@
                 AND DATE_FORMAT( io.createtime, '%Y') =#{vo.year}
             </if>
         </where>
+        limit  10
     </select>
     <select id="queryAgencyUserInsAreaPage" resultType="com.ydtech.modules.admin.model.vo.AgencyUserInsAreaVo">
         select
@@ -2527,7 +2528,7 @@
             </if>
 
             <if test="taskStatisticsVo.companyId !=null  and  taskStatisticsVo.companyId !=''">
-                and ifa.company_id =#{taskStatisticsVo.companyId}
+                and iac.company_id =#{taskStatisticsVo.companyId}
             </if>
 
             <if test="taskStatisticsVo.createtimeStart !=null and taskStatisticsVo.createtimeStart != '' and taskStatisticsVo.createtimeEnd !=null and taskStatisticsVo.createtimeEnd != ''">