更新执行开始时间

src/main/java/com/taauav/admin/dto/TauvInspectDriverDTO.java

@@ -16,10 +16,10 @@ import java.util.Date;
 @Data
 public class TauvInspectDriverDTO extends BaseInspectDriverDTO {
     /**
-     * 飞行小组
+     * 飞手
      */
-    private String flightGroup;
-    private String flightGroupText;
+    private String flightHand;
+    private String flightHandText;
     /**
      * 添加时间
      */
@@ -78,20 +78,12 @@ public class TauvInspectDriverDTO extends BaseInspectDriverDTO {
     private String driverEnd;
 
     /**
-     * 执行开始时间
+     * 执行时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date executionStartTime;
-    private String formatExecutionStartTime;
-
-    /**
-     * 执行结束时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date executionEndTime;
-    private String formatExecutionEndTime;
+    private Date executionTime;
+    private String formatExecutionTime;
 
     /**
      * 飞行时长

src/main/java/com/taauav/admin/dto/TauvInspectDriverPicDTO.java

@@ -57,8 +57,8 @@ public class TauvInspectDriverPicDTO extends BaseInspectDriverDTO{
     /**
      * 巡检开始时间
      */
-    private Integer executionStartTime;
-    private String formatExecutionStartTime;
+    private Integer executionTime;
+    private String formatExecutionTime;
     /**
      * 最近上传时间
      */

src/main/java/com/taauav/admin/mapper/TauvInspectDriverMapper.xml

@@ -24,8 +24,8 @@
         <if test="param.inspectTime != null and param.inspectTime != ''">
             and inspect.inspect_time >= #{param.inspectTime}
         </if>
-<!--        <if test="param.flightGroup != null and param.flightGroup != ''">-->
-<!--            and driver.flight_group = #{param.flightGroup}-->
+<!--        <if test="param.flightHand != null and param.flightHand != ''">-->
+<!--            and driver.flight_hand = #{param.flightHand}-->
 <!--        </if>-->
         <if test="param.status != null and param.status != '' ">
             and driver.status in
@@ -35,7 +35,7 @@
 
         </if>
         <if test="param.allocation != null and param.allocation>0">
-            and driver.flight_group > 0
+            and driver.flight_hand > 0
         </if>
 <!--        <if test="param.driverExam != null and param.driverExam > 0">-->
 <!--            and driver.driver_exam = #{param.driverExam}-->
@@ -67,11 +67,11 @@
             </foreach>
 
         </if>
-        <if test="param.flightGroup != null and param.flightGroup>0">
-            and flight_group = #{param.flightGroup}
+        <if test="param.flightHand != null and param.flightHand>0">
+            and flight_hand = #{param.flightHand}
         </if>
         <if test="param.startTime !=null and param.endTime != null">
-            and execution_start_time between #{param.startTime} and #{param.endTime}
+            and execution_time between #{param.startTime} and #{param.endTime}
         </if>
         <if test="param.isReview != null and param.isReview>0">
             and is_review = #{param.isReview}
@@ -79,6 +79,6 @@
 <!--        <if test="param.driverExam != null and param.driverExam > 0">-->
 <!--            and driver_exam = #{param.driverExam}-->
 <!--        </if>-->
-        order by status asc,execution_start_time desc,inspect_no desc,num asc,id desc
+        order by status asc,execution_time desc,inspect_no desc,num asc,id desc
     </select>
 </mapper>

src/main/java/com/taauav/admin/mapper/TauvReportMapper.xml

@@ -11,7 +11,7 @@
                 </foreach>
             </if>
             <if test="param.inspectStatus != null and param.inspectStatus >0"> and b.status = #{param.inspectStatus}</if>
-            <if test="param.flightGroup != null and param.flightGroup > 0"> and a.flight_group = #{param.flightGroup}</if>
+            <if test="param.flightHand != null and param.flightHand > 0"> and a.flight_hand = #{param.flightHand}</if>
             <if test="param.driverArea != null and param.driverArea !=''"> and a.driver_area in
                 <foreach collection="param.driverArea" item="area" open="(" close=")" separator=",">
                     #{area}
@@ -48,7 +48,7 @@
     <!--内部用户报告数据查询-->
     <select id="getInnerUserSearchDataList"  parameterType="java.util.Map" resultType="com.taauav.admin.dto.TauvReportDTO">
         select  a.* from tauv_report a left join tauv_report_check b on a.id=b.report_id
-        where a.mark=1 and (a.flight_group = #{param.adminId} or b.check_user = #{param.adminId})
+        where a.mark=1 and (a.flight_hand = #{param.adminId} or b.check_user = #{param.adminId})
         <if test="param.status != null and param.status != ''">
             and a.status in <foreach collection="param.status" item="status" separator="," open="(" close=")">
             #{status}
@@ -56,7 +56,7 @@
         </if>
         <if test="param.inspectStatus != null and param.inspectStatus >0"> and b.status = #{param.inspectStatus}</if>
         <if test="param.inspectStatus != null and param.inspectStatus >0"> and b.status = #{param.inspectStatus}</if>
-        <if test="param.flightGroup != null and param.flightGroup > 0"> and a.flight_group = #{param.flightGroup}</if>
+        <if test="param.flightHand != null and param.flightHand > 0"> and a.flight_hand = #{param.flightHand}</if>
         <if test="param.driverArea != null and param.driverArea !=''"> and a.driver_area in
             <foreach collection="param.driverArea" item="area" open="(" close=")" separator=",">
                 #{area}

src/main/java/com/taauav/admin/service/ISysAuthGroupService.java

@@ -111,5 +111,5 @@ public interface ISysAuthGroupService extends IBaseService<SysAuthGroup> {
      * @param admin
      * @return
      */
-    Boolean isFlightGroup(SysAdmin admin);
+    Boolean isFlightHand(SysAdmin admin);
 }

src/main/java/com/taauav/admin/service/impl/SysAuthGroupServiceImpl.java

@@ -332,7 +332,7 @@ public class SysAuthGroupServiceImpl extends BaseServiceImpl<SysAuthGroupMapper,
      * @return
      */
     @Override
-    public Boolean isFlightGroup(SysAdmin admin) {
+    public Boolean isFlightHand(SysAdmin admin) {
         QueryWrapper wrapper = new QueryWrapper();
         wrapper.eq("mark", 1);
         wrapper.eq("name", "flight_auth_group");

src/main/java/com/taauav/admin/service/impl/TauvInspectDriverServiceImpl.java

@@ -559,7 +559,7 @@ public class TauvInspectDriverServiceImpl extends BaseServiceImpl<TauvInspectDri
             return response.failure(info.get("error"));
         }
         Integer groupId = (Integer) info.get("flightGroup");
-        Long startTime = new Long(info.get("executionStartTime").toString());
+        Long startTime = new Long(info.get("executionTime").toString());
         Long inspectTime = new Long(info.get("inspectTime").toString());
         if (startTime > 0) {
             info.put("executionTime", FunctionUtils.formatTime(startTime.intValue(), "yyyy-MM-dd HH:mm:ss"));
@@ -567,9 +567,9 @@ public class TauvInspectDriverServiceImpl extends BaseServiceImpl<TauvInspectDri
             info.put("executionTime", "");
         }
         if (inspectTime > 0) {
-            info.put("formatinspectTime", FunctionUtils.formatTime(inspectTime.intValue(), "yyyy-MM-dd HH:mm:ss"));
+            info.put("formatInspectTime", FunctionUtils.formatTime(inspectTime.intValue(), "yyyy-MM-dd HH:mm:ss"));
         } else {
-            info.put("formatinspectTime", "");
+            info.put("formatInspectTime", "");
         }
         SysAdmin adminInfo = iSysAdminService.getAdminInfo(groupId);
         info.put("flightGroupText", StringUtils.isEmpty(adminInfo) ? "" : adminInfo.getRealname());
@@ -604,12 +604,12 @@ public class TauvInspectDriverServiceImpl extends BaseServiceImpl<TauvInspectDri
 //        driver.setFormatExecutionEndTime(FunctionUtils.formatTime(driver.getExecutionEndTime(), "yyyy-MM-dd HH:mm:ss"));
         driver.setFormatCreateTime(DateUtil.format(driver.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
         driver.setFormatInspectTime(DateUtil.format(driver.getInspectTime(), "yyyy-MM-dd HH:mm:ss"));
-        if (!StringUtils.isEmpty(driver.getExecutionStartTime())) {
-            driver.setFormatExecutionStartTime(DateUtil.format(driver.getExecutionStartTime(), "yyyy-MM-dd HH:mm:ss"));
-        }
-        if (!StringUtils.isEmpty(driver.getExecutionEndTime())) {
-            driver.setFormatExecutionEndTime(DateUtil.format(driver.getExecutionEndTime(), "yyyy-MM-dd HH:mm:ss"));
+        if (!StringUtils.isEmpty(driver.getExecutionTime())) {
+            driver.setFormatExecutionTime(DateUtil.format(driver.getExecutionTime(), "yyyy-MM-dd HH:mm:ss"));
         }
+//        if (!StringUtils.isEmpty(driver.getExecutionEndTime())) {
+//            driver.setFormatExecutionEndTime(DateUtil.format(driver.getExecutionEndTime(), "yyyy-MM-dd HH:mm:ss"));
+//        }
         if (!StringUtils.isEmpty(driver.getDriverArea())) {
             SysCity cityInfo = iSysCityService.getInfoById(driver.getDriverArea());
             driver.setDriverAreaText(StringUtils.isEmpty(cityInfo) ? "" : cityInfo.getName());

src/main/java/com/taauav/admin/service/impl/TauvInspectFileServiceImpl.java

@@ -123,9 +123,9 @@ public class TauvInspectFileServiceImpl extends BaseServiceImpl<TauvInspectFileM
             Map<Integer, String> statusList = picDTO.getStatusList();
             String format = "yyyy-MM-dd HH:mm:ss";
             for (TauvInspectDriverPicDTO driverPicDTO : list) {
-                Integer executionStartTime = driverPicDTO.getExecutionStartTime();
-                if (!StringUtils.isEmpty(executionStartTime)) {
-                    driverPicDTO.setFormatExecutionStartTime(FunctionUtils.formatTime(executionStartTime, format));
+                Integer executionTime = driverPicDTO.getExecutionTime();
+                if (!StringUtils.isEmpty(executionTime)) {
+                    driverPicDTO.setFormatExecutionTime(FunctionUtils.formatTime(executionTime, format));
                 }
                 Integer status = driverPicDTO.getStatus().intValue();
                 driverPicDTO.setStatusText(StringUtils.isEmpty(status) ? "" : statusList.get(status));

src/main/java/com/taauav/admin/service/impl/TauvReportServiceImpl.java

@@ -135,7 +135,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau
 //        String cityIdStr = adminInfo.getCityIds();
         if (!"1".equals(adminId.toString())) {
             // 谁执行的报告谁生成
-            map.put("flightGroup", adminId);
+            map.put("flightHand", adminId);
         }
         // 生成的报告必须是已复核完成的
         map.put("inspectStatus", 6);