diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java index 3fa01448..e0d08c2b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java @@ -309,4 +309,14 @@ public class CycleTestTask extends BaseEntity { */ @Schema(description = "超期原因") private String reasonForOut; + /** + * 临期天数 + */ + @Schema(description = "临期天数") + private Integer dayToPlanedFinish; + /** + * 超期天数 + */ + @Schema(description = "超期天数") + private Integer dayToOut; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskSearch.java index 697fe912..3cd52023 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskSearch.java @@ -30,7 +30,6 @@ public class CycleTestTaskSearch extends CycleTestTask { private Date createTimeEnd; @Schema(description = "状态数组") private List statusList; - /** * [周期试验项目]名称 */ @@ -63,6 +62,18 @@ public class CycleTestTaskSearch extends CycleTestTask { @JsonDeserialize(using = LocalDateTimeEndOfDayDeserializer.class) @Schema(description = "一次性任务生成日期-结束") private LocalDateTime oneTimeGenDateEnd; + /** + * 一次性任务生成日期-开始 + */ + @JsonDeserialize(using = DateBeginOfDayDeserializer.class) + @Schema(description = "生成日期-开始") + private Date genDatetimeStart; + /** + * 一次性任务生成日期-结束 + */ + @JsonDeserialize(using = DateEndOfDayDeserializer.class) + @Schema(description = "生成日期-结束") + private Date genDatetimeEnd; /** * 下发时间-开始 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java index 1eb91fe6..013bd255 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java @@ -3,10 +3,12 @@ */ package org.springblade.desk.quality.pojo.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.util.json.serializer.IntegerAllToStringSerializer; import java.io.Serial; import java.time.LocalDateTime; @@ -61,8 +63,9 @@ public class CycleTestTaskVO extends CycleTestTask { /** * 临期天数 */ + @JsonSerialize(using = IntegerAllToStringSerializer.class) @Schema(description = "临期天数") - private String countDayToPlanedFinish; + private Integer countDayToPlanedFinish; /** * 填报[附件]附件地址 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/CycleTestTaskExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/CycleTestTaskExcel.java index c84440e4..6c4b3988 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/CycleTestTaskExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/CycleTestTaskExcel.java @@ -76,7 +76,7 @@ public class CycleTestTaskExcel implements Serializable { */ @Schema(description = "工艺员[用户]姓名") @ColumnWidth(20) - @ExcelProperty("状态") + @ExcelProperty("工艺员") private String processUserName; /** * 任务生成时间 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestTaskMapper.xml index edc65115..4573c5fa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestTaskMapper.xml @@ -37,6 +37,8 @@ + + @@ -187,12 +204,21 @@ AND t.CREATE_TIME <= #{q.createTimeEnd} + + AND t.CREATE_TIME >= #{q.genDatetimeStart} + + + AND t.CREATE_TIME <= #{q.genDatetimeEnd} + AND t.TEST_TYPE = #{q.testType} AND t.CODE LIKE '%' || #{q.code} || '%' + + AND item.ID = #{q.cycleTestItemId} + AND item.NAME LIKE '%' || #{q.cycleTestItemName} || '%' @@ -229,6 +255,12 @@ AND t.FINISH_DATE <= #{q.finishDateEnd} + + AND t.DAY_TO_PLANED_FINISH = #{q.dayToPlanedFinish} + + + AND t.DAY_TO_OUT = #{q.dayToOut} + ORDER BY t.STATUS ASC,t.CREATE_TIME ASC diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java index 11880fdf..b23d6a74 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java @@ -201,7 +201,7 @@ public class CycleTestService2 { String namesF = names.toString(); if (StringUtils.isNotBlank(namesF) && StringUtils.endsWith(namesF, ",")) { // 去掉结尾, - StringUtils.removeEnd(namesF, ","); + namesF = StringUtils.removeEnd(namesF, ","); } vo.setPlateNames(namesF); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java index 7e0b0e87..ddc4e774 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java @@ -514,7 +514,7 @@ public class CycleTestTaskService2 { } /** - * 临期天数 + * 计算临期天数 * 临期天数 ≤ 0时,红色 * 临期天数 0~7 时,橙色 * 临期天数 >= 7时,黄色 @@ -526,18 +526,18 @@ public class CycleTestTaskService2 { * @param id * @return */ - public String getCountDayToOut(Long id) { + public Integer getCountDayToOut(Long id) { CycleTestTask task = service.getById(id); if (Objects.equals(task.getStatus(), CycleTestTaskConst.S_PENDING_ACCEPT) || Objects.equals(task.getStatus(), CycleTestTaskConst.S_PENDING_TEST)) { LocalDate outLD = getOutDate(id); if (outLD == null) { - return ""; + return 0; } long daysDiff = ChronoUnit.DAYS.between(LocalDate.now(), outLD); - return "" + (int) daysDiff; + return (int) daysDiff; } - return ""; + return 0; } /** @@ -563,9 +563,11 @@ public class CycleTestTaskService2 { if (todayLD.isEqual(remindLD) || (todayLD.isAfter(remindLD) && todayLD.isBefore(outLD))) { task.setFlagOut(BaseValue.NO); task.setFlagApproach(BaseValue.YES); - // 更新状态 - service.updateById(task); } + // 设置临期天数 + task.setDayToPlanedFinish(getCountDayToOut(task.getId())); + // 更新状态 + service.updateById(task); } }