任务编码取值

src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java

@@ -86,6 +86,7 @@ public class InspectionTasksController extends DafController {
 	@ApiOperation(value = "分页", notes = "传入inspectionTasks")
 	public R<IPage<InspectionTasks>> list(InspectionTasks inspectionTasks, Query query) {
 		QueryWrapper<InspectionTasks> qw = new QueryWrapper<>();
+		qw.orderByAsc("task_no");
 		// 场站
 		if (null != inspectionTasks.getStation()) {
 			qw.lambda().eq(InspectionTasks::getStation, inspectionTasks.getStation());

src/main/java/org/energy/modules/inspection/entity/InspectionResult.java

@@ -5,6 +5,7 @@ import com.dayu.daf.core.mp.base.BaseEntity;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
@@ -46,11 +47,13 @@ public class InspectionResult extends BaseEntity {
      * 任务执行开始时间
      */
     @ApiModelProperty(value = "任务执行开始时间")
+	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss")
     private LocalDateTime executeStartDate;
     /**
      * 任务执行结束时间
      */
     @ApiModelProperty(value = "任务执行结束时间")
+	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss")
     private LocalDateTime executeEndDate;
     /**
      * 巡检结果

src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml

@@ -24,7 +24,7 @@
         select * from i_inspection_result where is_deleted = 0
     </select>
 
-    <select id="getMaxResultNo" resultMap="inspectionResultResultMap">
+    <select id="getMaxResultNo" resultType="java.lang.String">
         select max(result_no) from i_inspection_result where result_no like ${taskNo}
     </select>