Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotopeationfill/IotOpeationFillController.java

@@ -25,6 +25,7 @@ import cn.iocoder.yudao.module.pms.service.iotopeationfill.IotOpeationFillServic
 import cn.iocoder.yudao.module.pms.service.yanfan.YfDeviceService;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import com.aliyun.tea.utils.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -309,6 +310,17 @@ public class IotOpeationFillController {
         }
 
         PageResult<IotOpeationFillOrderDO> fillList = iotOpeationFillService.fillList2(pageReqVO,idList);
+        // 处理时间字段
+        if (fillList != null && CollectionUtils.isNotEmpty(fillList.getList())) {
+            for (IotOpeationFillOrderDO record : fillList.getList()) {
+                LocalDateTime createTime = record.getCreateTime();
+                LocalDateTime updateTime = record.getUpdateTime();
+
+                if (createTime != null && updateTime != null && createTime.isEqual(updateTime)) {
+                    record.setUpdateTime(null); // 相等时将updateTime置为null
+                }
+            }
+        }
 
         return success(BeanUtils.toBean(fillList, IotOpeationFillOrderDO.class));
     }

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

@@ -48,6 +48,7 @@ public interface IotOpeationFillOrderMapper extends BaseMapperX<IotOpeationFillO
                 .eqIfPresent(IotOpeationFillOrderDO::getUserId, reqVO.getUserId())
                 .betweenIfPresent(IotOpeationFillOrderDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(IotOpeationFillOrderDO::getCreateTime)
+                .orderByAsc(IotOpeationFillOrderDO::getOrderStatus)
                 .orderByAsc(IotOpeationFillOrderDO::getDeptId));
 
     }

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

@@ -463,14 +463,14 @@
     </select>
 
     <update id="updateFillOrder" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO">
-        update rqiot.rq_iot_opeation_fill_order set order_status = 1 where id = #{id}
+        update rqiot.rq_iot_opeation_fill_order set order_status = 1,update_time = NOW()  where id = #{id}
     </update>
     <update id="updateFillOrder1" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO">
         update rqiot.rq_iot_opeation_fill_order set order_status = 0 where id = #{id}
     </update>
 
     <update id="updateFillOrder2" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO">
-        update rqiot.rq_iot_opeation_fill_order set order_status = 2 where id = #{id}
+        update rqiot.rq_iot_opeation_fill_order set order_status = 2,update_time = NOW() where id = #{id}
     </update>