保养工单状态变更、计划查询顺序

op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java

@@ -256,7 +256,9 @@ public class EquOrderServiceImpl implements IEquOrderService {
         }
 
         // 更新工单信息
-        equOrder.setOrderStatus("1"); // 状态为已完成
+        if (!equOrder.getPlanType().equals("maintenance")) {
+            equOrder.setOrderStatus("1"); // 状态为已完成
+        }
         equOrder.setUpdateTime(DateUtils.getNowDate());
         equOrder.setUpdateBy(SecurityContextHolder.getUserName());
         equOrder.setPlanPerson(SecurityContextHolder.getUserName());

op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml

@@ -87,6 +87,7 @@
 			<if test="getLoopEndArrayEnd != null "> and #{getLoopEndArrayEnd} >= CONVERT(date,plan_loop_end)</if>
 			 and del_flag = '0'
 		</where>
+		order by create_time desc
 	</select>
 
 	<select id="selectEquPlanByPlanId" parameterType="String" resultMap="EquPlanResult">