运行记录优化070501

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/TDDeviceMapper.java

@@ -75,6 +75,7 @@ public interface TDDeviceMapper extends BaseMapperX<TDDeviceDO> {
             "  ts BETWEEN #{ts}" +
             "  and #{ts1}"+
             "  and identity = #{colName}\n" +
+            "  and log_value != 0.0"+
             "  AND _c0 IS NOT NULL")
     @DS("tdengine")
     @TenantIgnore

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotopeationfill/IotOpeationFillMapper.java

@@ -67,6 +67,8 @@ public interface IotOpeationFillMapper extends BaseMapperX<IotOpeationFillDO> {
     @TenantIgnore
     List<IotOpeationFillDO> fillListByUserId(IotOpeationFillRespVO vo);
     @TenantIgnore
+    List<IotOpeationFillDO> getOrderIds(IotOpeationFillRespVO vo);
+    @TenantIgnore
     List<IotOpeationFillDO> fillListByDeptId(IotOpeationFillRespVO vo);
     @TenantIgnore
     List<IotOpeationFillDO> rdList();

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotopeationfill/IotOpeationFillOrderMapper.java

@@ -45,7 +45,7 @@ public interface IotOpeationFillOrderMapper extends BaseMapperX<IotOpeationFillO
                 .inIfPresent(IotOpeationFillOrderDO::getId, orderIds)
                 .eqIfPresent(IotOpeationFillOrderDO::getOrderType, reqVO.getOrderType())
                 .eqIfPresent(IotOpeationFillOrderDO::getOrderStatus, reqVO.getOrderStatus())
-                .likeIfPresent(IotOpeationFillOrderDO::getUserName, reqVO.getUserName())
+                .likeIfPresent(IotOpeationFillOrderDO::getUserName, reqVO.getOrderName())
                 .eqIfPresent(IotOpeationFillOrderDO::getUserId, reqVO.getUserId())
                 .betweenIfPresent(IotOpeationFillOrderDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(IotOpeationFillOrderDO::getCreateTime)

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotopeationfill/IotOpeationFillServiceImpl.java

@@ -166,7 +166,7 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
         IotOpeationFillRespVO fillRespVO = new IotOpeationFillRespVO();
         fillRespVO.setOrgName(vo.getOrderName());
         fillRespVO.setDeptId(vo.getDeptId());
-        List<IotOpeationFillDO> fillList = iotOpeationFillMapper.fillListByUserId(fillRespVO);
+        List<IotOpeationFillDO> fillList = iotOpeationFillMapper.getOrderIds(fillRespVO);
         List<Long> orderIds = fillList.stream().map(IotOpeationFillDO::getOrderId).collect(Collectors.toList());
         return iotOpeationFillOrderMapper.selectPage1(vo,deptIds,orderIds);
     }

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotOpeationFillMapper.xml

@@ -187,9 +187,9 @@
         )
         AND (
         <if test="orderId != null and orderId != ''">
-            a.order_id = #{orderId} AND
+            a.order_id = #{orderId}
         </if>
-        <if test="orgName != null and orgName != ''">
+        <!--<if test="orgName != null and orgName != ''">
             (
             a.device_name LIKE CONCAT('%', #{orgName}, '%')
             OR a.device_code LIKE CONCAT('%', #{orgName}, '%')
@@ -198,10 +198,32 @@
         </if>
         <if test="orgName == null or orgName == ''">
             1=1
-        </if>
+        </if>-->
         )
     </select>
 
+
+    <select id="getOrderIds" parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
+        select
+            distinct order_id
+        from rq_iot_opeation_fill
+        where
+            deleted = 0
+        and
+            order_id is not null
+        and(
+        <if test="orgName != null and orgName != ''">
+            (
+            device_name LIKE CONCAT('%', #{orgName}, '%')
+            OR device_code LIKE CONCAT('%', #{orgName}, '%')
+            )
+        </if>
+        <if test="orgName == null or orgName == ''">
+            1=1
+        </if>)
+    </select>
+
     <select id="fillListByDeptId" parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
         select