Bladeren bron

优化排班

java110 3 jaren geleden
bovenliggende
commit
b2ce33b4d0

+ 1 - 1
java110-db/src/main/resources/mapper/common/MachineTypeV1ServiceDaoImplMapper.xml

@@ -137,7 +137,7 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        order by t.seq desc,t.create_time desc
+        order by t.seq
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

+ 2 - 1
service-community/src/main/java/com/java110/community/cmd/inspectionTask/UpdateInspectionTaskCmd.java

@@ -63,7 +63,8 @@ public class UpdateInspectionTaskCmd extends Cmd {
         businessInspectionTask.putAll(BeanConvertUtil.beanCovertMap(inspectionTaskDtos.get(0)));
 
         InspectionTaskPo inspectionTaskPo = BeanConvertUtil.covertBean(businessInspectionTask, InspectionTaskPo.class);
-        inspectionTaskPo.setActInsTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        //这里时间不做修改,有可能还没有巡检
+        //inspectionTaskPo.setActInsTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         inspectionTaskPo.setActUserId(reqJson.getString("userId"));
         inspectionTaskPo.setActUserName(reqJson.getString("userName"));
         inspectionTaskPo.setState(reqJson.getString("state"));