定检任务

als-modules/agile-assurance/src/main/java/org/eco/als/controller/SmTaskController.java

@@ -19,14 +19,7 @@ import org.eco.common.security.utils.LoginHelper;
 import org.eco.common.web.annotation.RepeatSubmit;
 import org.eco.common.web.core.BaseController;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
@@ -36,7 +29,7 @@ import java.util.List;
  * 定检任务Controller
  *
  * @author wgk
- * @date 2024-07-25
+ * @date 2024-11-20
  */
 @Validated
 @RequiredArgsConstructor

als-modules/agile-assurance/src/main/java/org/eco/als/domain/SmTask.java

@@ -8,13 +8,12 @@ import lombok.EqualsAndHashCode;
 import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
-import java.util.Date;
 
 /**
  * 定检任务对象 als_sm_task_t
  *
  * @author wgk
- * @date 2024-07-25
+ * @date 2024-11-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -33,6 +32,7 @@ public class SmTask extends BaseEntity {
      * 机号
      */
     private String aircraftId;
+
     /**
      * 机型
      */
@@ -44,34 +44,24 @@ public class SmTask extends BaseEntity {
     private String name;
 
     /**
-     * 任务编码
-     */
-    private String code;
-
-    /**
-     * 维修时间
-     */
-    private Date endTime;
-
-    /**
-     * 剩余时间
+     * 专业
      */
-    private String remainTime;
+    private String specialty;
 
     /**
-     * 专业
+     * 任务编码
      */
-    private String specialty;
+    private String taskCode;
 
     /**
-     * 下发日期
+     * 周期
      */
-    private Date issueDate;
+    private String periodTime;
 
     /**
-     * 完成日期
+     * 剩余时间
      */
-    private Date finishDate;
+    private String remainTime;
 
     /**
      * 负责人
@@ -79,30 +69,15 @@ public class SmTask extends BaseEntity {
     private String headName;
 
     /**
-     * 单位
+     * 系统
      */
-    private String unitName;
+    private String systemName;
 
     /**
-     * 维修内容
+     * 任务内容
      */
     private String contents;
 
-    /**
-     * 质检员
-     */
-    private String qcBy;
-
-    /**
-     * 填写人
-     */
-    private String fillBy;
-
-    /**
-     * 状态（1正常）
-     */
-    private String status;
-
     /**
      * 备注
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/SmTaskBo.java

@@ -1,21 +1,16 @@
 package org.eco.als.domain.bo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.SmTask;
 import org.eco.common.orm.core.domain.BaseEntity;
 
-import java.util.Date;
-
 /**
  * 定检任务业务对象 als_sm_task_t
  *
  * @author wgk
- * @date 2024-07-25
+ * @date 2024-11-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -27,55 +22,39 @@ public class SmTaskBo extends BaseEntity {
     private Long id;
 
     /**
-     * 机号Id
+     * 机号
      */
-    @NotNull(message = "机号不能为空")
     private String aircraftId;
 
     /**
      * 机型
      */
-    @NotBlank(message = "机型不能为空")
     private String aircraftModel;
 
     /**
      * 任务名称
      */
-    @NotNull(message = "任务名称不能为空")
     private String name;
 
     /**
-     * 任务编码
-     */
-    private String code;
-
-    /**
-     * 维修时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date endTime;
-
-    /**
-     * 剩余时间
+     * 专业
      */
-    private String remainTime;
+    private String specialty;
 
     /**
-     * 专业
+     * 任务编码
      */
-    private String specialty;
+    private String taskCode;
 
     /**
-     * 下发日期
+     * 周期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date issueDate;
+    private String periodTime;
 
     /**
-     * 完成日期
+     * 剩余时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date finishDate;
+    private String remainTime;
 
     /**
      * 负责人
@@ -83,30 +62,15 @@ public class SmTaskBo extends BaseEntity {
     private String headName;
 
     /**
-     * 单位
+     * 系统
      */
-    private String unitName;
+    private String systemName;
 
     /**
-     * 维修内容
+     * 任务内容
      */
     private String contents;
 
-    /**
-     * 质检员
-     */
-    private String qcBy;
-
-    /**
-     * 填写人
-     */
-    private String fillBy;
-
-    /**
-     * 状态（1正常）
-     */
-    private String status;
-
     /**
      * 备注
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/SmTaskImportVo.java

@@ -4,18 +4,15 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 定检任务导入视图对象 als_sm_task_t
  *
  * @author wgk
- * @date 2024-07-25
+ * @date 2024-11-20
  */
 
 @Data
@@ -31,7 +28,7 @@ public class SmTaskImportVo implements Serializable {
      * 机号
      */
     @ExcelProperty(value = "机号")
-    private String aircraftNo;
+    private String aircraftId;
 
     /**
      * 机型
@@ -42,19 +39,26 @@ public class SmTaskImportVo implements Serializable {
     /**
      * 任务名称
      */
+    @ExcelProperty(value = "任务名称")
     private String name;
 
+    /**
+     * 专业
+     */
+    @ExcelProperty(value = "专业")
+    private String specialty;
+
     /**
      * 任务编码
      */
     @ExcelProperty(value = "任务编码")
-    private String code;
+    private String taskCode;
 
     /**
-     * 维修时间
+     * 周期
      */
-    @ExcelProperty(value = "维修时间")
-    private Date endTime;
+    @ExcelProperty(value = "周期")
+    private String periodTime;
 
     /**
      * 剩余时间
@@ -62,24 +66,6 @@ public class SmTaskImportVo implements Serializable {
     @ExcelProperty(value = "剩余时间")
     private String remainTime;
 
-    /**
-     * 专业
-     */
-    @ExcelProperty(value = "专业")
-    private String specialty;
-
-    /**
-     * 下发日期
-     */
-    @ExcelProperty(value = "下发日期")
-    private Date issueDate;
-
-    /**
-     * 完成日期
-     */
-    @ExcelProperty(value = "完成日期")
-    private Date finishDate;
-
     /**
      * 负责人
      */
@@ -87,36 +73,17 @@ public class SmTaskImportVo implements Serializable {
     private String headName;
 
     /**
-     * 单位
+     * 系统
      */
-    @ExcelProperty(value = "单位")
-    private String unitName;
+    @ExcelProperty(value = "系统")
+    private String systemName;
 
     /**
-     * 维修内容
+     * 任务内容
      */
-    @ExcelProperty(value = "维修内容")
+    @ExcelProperty(value = "任务内容")
     private String contents;
 
-    /**
-     * 质检员
-     */
-    @ExcelProperty(value = "质检员")
-    private String qcBy;
-
-    /**
-     * 填写人
-     */
-    @ExcelProperty(value = "填写人")
-    private String fillBy;
-
-    /**
-     * 状态（1正常）
-     */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "common_type")
-    private String status;
-
     /**
      * 备注
      */

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/SmTaskVo.java

@@ -8,19 +8,16 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.als.domain.SmTask;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
 import org.eco.common.orm.core.domain.BaseEntity;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 定检任务视图对象 als_sm_task_t
  *
  * @author wgk
- * @date 2024-07-25
+ * @date 2024-11-20
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -37,17 +34,11 @@ public class SmTaskVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "编号")
     private Long id;
 
-    /**
-     * 机号Id
-     */
-    private String aircraftId;
-
     /**
      * 机号
      */
     @ExcelProperty(value = "机号")
-    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
-    private String aircraftNo;
+    private String aircraftId;
 
     /**
      * 机型
@@ -61,17 +52,23 @@ public class SmTaskVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "任务名称")
     private String name;
 
+    /**
+     * 专业
+     */
+    @ExcelProperty(value = "专业")
+    private String specialty;
+
     /**
      * 任务编码
      */
     @ExcelProperty(value = "任务编码")
-    private String code;
+    private String taskCode;
 
     /**
-     * 维修时间
+     * 周期
      */
-    @ExcelProperty(value = "维修时间")
-    private Date endTime;
+    @ExcelProperty(value = "周期")
+    private String periodTime;
 
     /**
      * 剩余时间
@@ -79,24 +76,6 @@ public class SmTaskVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "剩余时间")
     private String remainTime;
 
-    /**
-     * 专业
-     */
-    @ExcelProperty(value = "专业")
-    private String specialty;
-
-    /**
-     * 下发日期
-     */
-    @ExcelProperty(value = "下发日期")
-    private Date issueDate;
-
-    /**
-     * 完成日期
-     */
-    @ExcelProperty(value = "完成日期")
-    private Date finishDate;
-
     /**
      * 负责人
      */
@@ -104,36 +83,17 @@ public class SmTaskVo extends BaseEntity implements Serializable {
     private String headName;
 
     /**
-     * 单位
+     * 系统
      */
-    @ExcelProperty(value = "单位")
-    private String unitName;
+    @ExcelProperty(value = "系统")
+    private String systemName;
 
     /**
-     * 维修内容
+     * 任务内容
      */
-    @ExcelProperty(value = "维修内容")
+    @ExcelProperty(value = "任务内容")
     private String contents;
 
-    /**
-     * 质检员
-     */
-    @ExcelProperty(value = "质检员")
-    private String qcBy;
-
-    /**
-     * 填写人
-     */
-    @ExcelProperty(value = "填写人")
-    private String fillBy;
-
-    /**
-     * 状态（1正常）
-     */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "common_type")
-    private String status;
-
     /**
      * 备注
      */

als-modules/agile-assurance/src/main/java/org/eco/als/service/ISmTaskService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * 定检任务Service接口
  *
  * @author wgk
- * @date 2024-07-25
+ * @date 2024-11-20
  */
 public interface ISmTaskService extends IBaseService<SmTask> {
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/SmTaskServiceImpl.java

@@ -35,7 +35,7 @@ import static org.eco.als.domain.table.SmTaskTableDef.SM_TASK;
  * 定检任务Service业务层处理
  *
  * @author wgk
- * @date 2024-07-25
+ * @date 2024-11-20
  */
 @Service
 @Slf4j
@@ -61,28 +61,28 @@ public class SmTaskServiceImpl extends BaseServiceImpl<SmTaskMapper, SmTask> imp
             queryWrapper.and(SM_TASK.AIRCRAFT_ID.in
                 (airTypeIds));
         }
-        queryWrapper.and(SM_TASK.AIRCRAFT_ID.eq
-            (smTaskBo.getAircraftId()));
-        queryWrapper.and(SM_TASK.AIRCRAFT_MODEL.eq
-            (smTaskBo.getAircraftModel()));
+        if (StringUtils.isNotBlank(smTaskBo.getAircraftModel())) {
+            String[] airModelIds = smTaskBo.getAircraftModel().split(",");
+            queryWrapper.and(SM_TASK.AIRCRAFT_MODEL.in
+                (airModelIds));
+        }
         queryWrapper.and(SM_TASK.NAME.like
             (smTaskBo.getName()));
-        queryWrapper.and(SM_TASK.CODE.eq
-            (smTaskBo.getCode()));
-        queryWrapper.and(SM_TASK.END_TIME.eq
-            (smTaskBo.getEndTime()));
-        queryWrapper.and(SM_TASK.REMAIN_TIME.eq
-            (smTaskBo.getRemainTime()));
         queryWrapper.and(SM_TASK.SPECIALTY.eq
             (smTaskBo.getSpecialty()));
-        queryWrapper.and(SM_TASK.ISSUE_DATE.eq
-            (smTaskBo.getIssueDate()));
-        queryWrapper.and(SM_TASK.FINISH_DATE.eq
-            (smTaskBo.getFinishDate()));
+        queryWrapper.and(SM_TASK.TASK_CODE.eq
+            (smTaskBo.getTaskCode()));
+        queryWrapper.and(SM_TASK.PERIOD_TIME.eq
+            (smTaskBo.getPeriodTime()));
+        queryWrapper.and(SM_TASK.REMAIN_TIME.eq
+            (smTaskBo.getRemainTime()));
         queryWrapper.and(SM_TASK.HEAD_NAME.like
             (smTaskBo.getHeadName()));
-        queryWrapper.and(SM_TASK.UNIT_NAME.like
-            (smTaskBo.getUnitName()));
+        queryWrapper.and(SM_TASK.SYSTEM_NAME.like
+            (smTaskBo.getSystemName()));
+        queryWrapper.and(SM_TASK.CONTENTS.eq
+            (smTaskBo.getContents()));
+
         return queryWrapper;
     }
 
@@ -161,7 +161,8 @@ public class SmTaskServiceImpl extends BaseServiceImpl<SmTaskMapper, SmTask> imp
     public boolean update(SmTaskBo smTaskBo) {
         SmTask smTask = MapstructUtils.convert(smTaskBo, SmTask.class);
         if (ObjectUtil.isNotNull(smTask) && ObjectUtil.isNotNull(smTask.getId())) {
-            return this.updateById(smTask);
+            boolean updated = this.updateById(smTask);
+            return updated;
         }
         return false;
     }