大屏数据源_试车预估结束日期

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckServiceImpl.java

@@ -2,6 +2,9 @@ package com.rongwei.bscommon.sys.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.unit.DataUnit;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.*;
@@ -2276,6 +2279,10 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
             indicator.setTotal(Integer.valueOf(largeScreenCheckVo.getDenominator()));
             // 百分比
             indicator.setCompletionrate( Convert.toBigDecimal(largeScreenCheckVo.getQaprogress()).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+            // 放预估试车结束日期
+            if(!Objects.isNull(largeScreenCheckVo.getEndData())){
+                indicator.setRoption(DateUtil.format(largeScreenCheckVo.getEndData(), "yyyy/MM/dd"));
+            }
             resultList.add(indicator);
         }
         if(!resultList.isEmpty()){

business-common/src/main/resources/mybatis/business/ZhcxCommissionCheckDao.xml

@@ -114,11 +114,11 @@
     </select>
 
     <select id="getLargeScreenData" resultType="com.rongwei.bsentity.vo.check.LargeScreenCheckVo">
-        SELECT MACHINEID   as machinenoid,
-               MACHINENO   as machineno,
-               PROJECTCODE as projectcode,
-               PROJECTID   as projectid,
-               PROJECTNAME as projectname,
+        SELECT c.MACHINEID   as machinenoid,
+               c.MACHINENO   as machineno,
+               c.PROJECTCODE as projectcode,
+               c.PROJECTID   as projectid,
+               c.PROJECTNAME as projectname,
                CASE
                    WHEN b.qaresult IS NULL THEN '0'
                    WHEN b.qaresult = 0 THEN '0'
@@ -135,7 +135,8 @@
                    WHEN b.qatesttime_cx IS NULL THEN '0'
                    WHEN b.qatesttime_cx = 0 THEN '0'
                    ELSE ROUND(b.qatesttime_cx / b.qaalltesttime_cx, 4)
-                   END     AS qaprogress
+                   END     AS qaprogress,
+               se.ESTIMATEDENDDATE as endData
         FROM INCONTROL.ZHCX_COMMISSION_CHECK c
                  LEFT JOIN (SELECT PID,
                                    count(*)                                               AS total,
@@ -152,6 +153,7 @@
                             FROM INCONTROL.ZHCX_COMMISSION_CHECK_DETAIL det
                             WHERE det.DELETED = '0'
                             GROUP BY PID) b ON b.PID = c.ID
+        LEFT JOIN INCONTROL.ZHCX_COMMISSION_CHECK_PARAMETER_SET_DETAL se on se.CHECKID = c.ID AND se.DELETED = '0'
         WHERE c.DELETED = '0'
         <if test='projectId != null'> and c.PROJECTID = #{projectId} </if>
         <if test='machineno != null'> and c.MACHINENO = #{machineno} </if>

business-entity/src/main/java/com/rongwei/bsentity/vo/check/LargeScreenCheckVo.java

@@ -2,6 +2,8 @@ package com.rongwei.bsentity.vo.check;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class LargeScreenCheckVo {
     /**
@@ -51,4 +53,9 @@ public class LargeScreenCheckVo {
      * 分母2
      */
     private String denominator2;
+
+    /**
+     * 试车预估结束日期
+     */
+    private Date endData;
 }