新增设备点检pda

equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java

@@ -219,5 +219,22 @@ public class ResourceInspectTaskController {
         return R.ok();
     }
 
+    /**
+     * 扫码设备编号，获取当天的点检任务
+     * @param resourceInspectTaskDto
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/getInspectTaskByResource")
+    public R getInspectTaskByResource(ResourceInspectTaskDto resourceInspectTaskDto){
+        try {
+            return R.ok(resourceInspectTaskService.getInspectTaskByResource(resourceInspectTaskDto));
+        }catch (Exception e){
+            return R.failed("数据更新失败" + e.getMessage());
+        }
+    }
+
+
+
 
 }

equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTask.java

@@ -152,15 +152,34 @@ public class ResourceInspectTask extends Model<ResourceInspectTask> {
      */
    @TableField("MODIFIED_DATE_TIME")
    private LocalDateTime modifiedDateTime;
-
+   /**
+    * 检验项目清单
+    */
    @TableField(exist = false)
    private List<ResourceInspectTaskParam> taskItemDetailList;
-
+   /**
+    * 耗用备品清单
+    */
    @TableField(exist = false)
    private List<ResourceInspectTaskSpare> spareList;
-
+   /**
+    * 设备handle
+    */
    @TableField(exist = false)
    private String ResourceBo;
+   /**
+    * 设备描述
+    */
+   @TableField(exist = false)
+   private String resourceDescription;
+
+   public String getResourceDescription() {
+      return resourceDescription;
+   }
+
+   public void setResourceDescription(String resourceDescription) {
+      this.resourceDescription = resourceDescription;
+   }
 
    public String getResourceBo() {
       return ResourceBo;

equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskService.java

@@ -55,4 +55,12 @@ public interface ResourceInspectTaskService extends IService<ResourceInspectTask
     void saveOrUpdateTaskInfo(ResourceInspectTaskDto resourceInspectTaskDto);
 
 
+    /**
+     * 扫码设备编号，获取当天的点检任务
+     * @param resourceInspectTaskDto
+     * @return
+     */
+    ResourceInspectTask getInspectTaskByResource(ResourceInspectTaskDto resourceInspectTaskDto);
+
+
 }

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java

@@ -178,7 +178,7 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
         String site = CommonMethods.getSite();
         String taskNo = resourceInspectTaskDto.getTaskNo();
         String taskHandle = HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site, taskNo);
-        String executor = resourceInspectTaskDto.getExecutor();
+        String executor = CommonMethods.getUser();
         String status = resourceInspectTaskDto.getStatus();
         // 检验项、备品清单
         List<ResourceInspectTaskParam> taskItemDetailList = resourceInspectTaskDto.getTaskItemDetailList();
@@ -223,6 +223,30 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
         resourceInspectTaskSpareService.saveBatch(taskSpareList);
     }
 
+    @Override
+    public ResourceInspectTask getInspectTaskByResource(ResourceInspectTaskDto resourceInspectTaskDto) {
+        resourceInspectTaskDto.setSite(CommonMethods.getSite());
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime compareStart = now.minusHours(now.getHour()).minusMinutes(now.getMinute());
+        LocalDateTime compareEnd = compareStart.plusDays(1);
+        resourceInspectTaskDto.setCompareStartDate(compareStart.toString().substring(0,16).replace('T',' '));
+        resourceInspectTaskDto.setCompareEndDate(compareEnd.toString().substring(0,16).replace('T',' '));
+        // 获取当日任务的handle
+        List<ResourceInspectTaskDto> resourceInspectTaskList = resourceInspectTaskMapper.findResourceInspectTaskList(resourceInspectTaskDto);
+        if (resourceInspectTaskList.size() == 1){
+            ResourceInspectTask resourceInspectTask = new ResourceInspectTask();
+            resourceInspectTask.setHandle(resourceInspectTaskList.get(0).getHandle());
+            ResourceInspectTask resourceInspectTaskAll = resourceInspectTaskService.getResourceInspectTaskAll(resourceInspectTask);
+            resourceInspectTaskAll.setResourceDescription(resourceInspectTaskList.get(0).getResourceDescription());
+            return resourceInspectTaskAll;
+        }
+        // 获取任务详情
+        if (resourceInspectTaskList.size() > 1){
+            throw BusinessException.build("当前设备当日点检任务不止一个！");
+        }
+        throw BusinessException.build("未找到当日的点检任务！");
+    }
+
     /***
      * 任务创建周期
      */

equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml

@@ -706,6 +706,7 @@
               AND ZRIT.STATUS = #{status}
     </select>
 
+    <!--条件查询，根据点检计划、设备查询处理中、新建的点检任务-->
     <select id="getInspectTaskList" resultType="com.foreverwin.mesnac.equip.model.ResourceInspectTask">
         SELECT * FROM WIP.Z_RESOURCE_INSPECT_TASK ZRIT
         WHERE ZRIT.SITE = #{site}