h5巡检任务问题修复

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwInspectionTaskPointServiceImpl.java

@@ -7,7 +7,13 @@ import com.rongwei.zhsw.system.dao.SwInspectionTaskPointDao;
 import com.rongwei.zhsw.system.service.SwInspectionTaskPointService;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwe.zhsw.system.domain.SwInspectionTaskDo;
+import com.rongwei.zhsw.system.service.SwInspectionTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.rongwei.zhsw.system.dao.SwInspectionTaskDao;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -21,6 +27,8 @@ import java.util.stream.Collectors;
 public class SwInspectionTaskPointServiceImpl extends ServiceImpl<SwInspectionTaskPointDao, SwInspectionTaskPointDo>
         implements SwInspectionTaskPointService {
 
+    @Autowired
+    private SwInspectionTaskService swInspectionTaskService;
     @Override
     public R updateInspectionTask(Map<String, Object> taskPointInfo) {
         if (taskPointInfo == null || !taskPointInfo.containsKey("id")) {
@@ -56,6 +64,38 @@ public class SwInspectionTaskPointServiceImpl extends ServiceImpl<SwInspectionTa
         }
         // 更新数据
         this.updateById(pointDo);
+
+        String inspectionTaskId = pointDo.getInspectiontaskid();
+        // 获取巡检任务ID
+        if (StringUtils.isNotBlank(inspectionTaskId)) {
+            // 查询同一巡检任务下的所有检查点
+            LambdaQueryWrapper<SwInspectionTaskPointDo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(SwInspectionTaskPointDo::getInspectiontaskid, inspectionTaskId);
+            List<SwInspectionTaskPointDo> allPoints = this.list(queryWrapper);
+
+            // 判断是否所有检查点都已完成巡检
+            boolean allCompleted = true;
+            for (SwInspectionTaskPointDo point : allPoints) {
+                if (point.getInspectionresult() == null) {
+                    allCompleted = false;
+                    break;
+                }
+            }
+
+            SwInspectionTaskDo taskDo = swInspectionTaskService.getById(inspectionTaskId);
+            if (taskDo != null) {
+                // 全部完成设置为'2'，否则设置为'3'
+                String status = allCompleted ? "2" : "3";
+                taskDo.setInspectionstatus(status);
+                if ("2".equals(status)){
+                    taskDo.setCreateusername((String) taskPointInfo.get("inspectionsubmitterid"));
+                    taskDo.setCreateuserid((String) taskPointInfo.get("inspectionsubmitter"));
+                    taskDo.setCreatedate(new Date());
+                }
+                swInspectionTaskService.updateById(taskDo);
+            }
+        }
+
         return R.ok("提交成功",pointDo.getPhotograph());
     }
 

zhsw-entity/src/main/java/com/rongwe/zhsw/system/domain/SwInspectionTaskDo.java

@@ -89,4 +89,20 @@ public class SwInspectionTaskDo extends BaseDo {
      * 巡检周期名称
      */
     private String inspectioncyclename;
-}
+    /**
+     * 巡检路线ID
+     */
+    private String INSPECTIONROUTEID;
+    /**
+     * 巡检提交人
+     */
+    private String inspectionsubmitter;
+    /**
+     * 巡检提交人id
+     */
+    private String inspectionsubmitterid;
+    /**
+     * 巡检提交时间
+     */
+    private String inspectionsubmissiontime;
+}