src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -91,4 +91,16 @@ @TableField(exist = false) private String dateStr; @ApiModelProperty(value = "是否必须手机拍照") private boolean takePhone; @ApiModelProperty(value = "是否可以上传相册") private boolean takeAlbum; @ApiModelProperty(value = "是否提交过巡检") private boolean inspectionSubmitted; @ApiModelProperty(value = "巡检期限") private String inspectionDeadline; } src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -106,4 +106,12 @@ @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT) private Long tenantId; @ApiModelProperty(value = "是否必须手机拍照") private boolean takePhone; @ApiModelProperty(value = "是否可以上传相册") private boolean takeAlbum; @ApiModelProperty(value = "巡检期限") private String inspectionDeadline; } src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
@@ -8,7 +8,6 @@ import com.ruoyi.basic.dto.StorageBlobDTO; import com.ruoyi.basic.mapper.StorageAttachmentMapper; import com.ruoyi.basic.mapper.StorageBlobMapper; import com.ruoyi.basic.pojo.StorageAttachment; import com.ruoyi.basic.pojo.StorageBlob; import com.ruoyi.basic.service.StorageAttachmentService; import com.ruoyi.common.enums.FileNameType; @@ -35,9 +34,6 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; import static com.ruoyi.common.constant.StorageAttachmentConstants.StorageAttachmentFile; import static com.ruoyi.common.enums.StorageAttachmentRecordType.InspectionTasks; /** * @author :yys @@ -162,9 +158,12 @@ dto.setDateStr(inspectionTask.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); // 初始化三个附件列表 dto.setCommonFileList(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION.getValue())).collect(Collectors.toList())); dto.setCommonFileListAfter(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())).collect(Collectors.toList())); dto.setCommonFileListBefore(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue())).collect(Collectors.toList())); dto.setCommonFileList(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION.getValue()) && commonFile.getCommonId().equals(dto.getId())).collect(Collectors.toList())); dto.setCommonFileListAfter(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_AFTER.getValue()) && commonFile.getCommonId().equals(dto.getId())).collect(Collectors.toList())); dto.setCommonFileListBefore(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue()) && commonFile.getCommonId().equals(dto.getId())).collect(Collectors.toList())); return dto; src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
@@ -116,6 +116,9 @@ inspectionTask.setFrequencyType(timingTask.getFrequencyType()); inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail()); inspectionTask.setTenantId(timingTask.getTenantId()); inspectionTask.setTakeAlbum(timingTask.isTakeAlbum()); inspectionTask.setTakePhone(timingTask.isTakePhone()); inspectionTask.setInspectionDeadline(timingTask.getInspectionDeadline()); return inspectionTask; } src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java
@@ -102,6 +102,9 @@ jobDataMap.put("taskId", task.getId()); // 任务ID（Long，可序列化） jobDataMap.put("taskName", task.getTaskName()); // 任务名称（String，可序列化） jobDataMap.put("taskType", task.getFrequencyType()); // 任务类型（String） jobDataMap.put("takePhone", task.isTakePhone()); // 是否必须手机拍照 jobDataMap.put("takeAlbum", task.isTakeAlbum()); // 是否可以上传相册 jobDataMap.put("inspectionDeadline", task.getInspectionDeadline()); // 巡检期限 // 按需添加其他必要的基本类型参数 // 3. 构建JobDetail，设置持久化相关属性 src/main/resources/application-kthg.yml
@@ -16,6 +16,14 @@ # 协同审批编号前缀(配置文件后缀命名) approvalNumberPrefix: NEW getui: appId: PfjyAAE0FK64FaO1w2CMb1 appKey: zTMb831OEL6J4GK1uE3Ob4 masterSecret: K1GFtsv42v61tXGnF7SGE5 domain: https://restapi.getui.cn/v2/ # 离线推送使用的包名/组件名 intentComponent: uni.app.UNI099A590/io.dcloud.PandoraEntry # 开发环境配置 server: # 服务器的HTTP端口，默认为8080
