|
|
|
|
@ -12,16 +12,21 @@ import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
|
import org.springblade.desk.quality.constant.BaseCol; |
|
|
|
|
import org.springblade.desk.quality.constant.CycleTestTaskConst; |
|
|
|
|
import org.springblade.desk.quality.constant.JobTypeConst; |
|
|
|
|
import org.springblade.desk.quality.mapper.gen.CycleTestGenMapper; |
|
|
|
|
import org.springblade.desk.quality.mapper.gen.CycleTestTaskGenMapper; |
|
|
|
|
import org.springblade.desk.quality.pojo.entity.CycleTest; |
|
|
|
|
import org.springblade.desk.quality.pojo.entity.CycleTestItem; |
|
|
|
|
import org.springblade.desk.quality.pojo.entity.CycleTestStandard; |
|
|
|
|
import org.springblade.desk.quality.pojo.entity.CycleTestTask; |
|
|
|
|
import org.springblade.desk.quality.pojo.request.JobExt; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.gen.CycleTestStandardGenVO; |
|
|
|
|
import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; |
|
|
|
|
import org.springblade.desk.quality.service.gen.ICycleTestItemGenService; |
|
|
|
|
import org.springblade.desk.quality.service.gen.ICycleTestStandardGenService; |
|
|
|
|
import org.springblade.desk.quality.service.gen.ICycleTestTaskGenService; |
|
|
|
|
import org.springblade.desk.quality.util.PowerJobUtil; |
|
|
|
|
import org.springblade.desk.quality.wrapper.gen.CycleTestStandardGenWrapper; |
|
|
|
|
import org.springblade.desk.quality.wrapper.gen.CycleTestTaskGenWrapper; |
|
|
|
|
import org.springblade.resource.feign.IAttachClient; |
|
|
|
|
import org.springblade.resource.pojo.entity.Attach; |
|
|
|
|
@ -45,9 +50,12 @@ import java.util.stream.Collectors; |
|
|
|
|
/** |
|
|
|
|
* |
|
|
|
|
* 时间说明: |
|
|
|
|
* 任务下发日期=试验周期对应日期-提前下发天数 |
|
|
|
|
* 任务结束日期=任务下发日期+试验周期 |
|
|
|
|
* 开始临期提醒日期=任务结束日期-临期提醒天数(未完成的试验) |
|
|
|
|
* 任务下发日期 = 试验周期对应日期 - 提前下发天数 |
|
|
|
|
* 任务结束日期 = 任务下发日期+试验周期 |
|
|
|
|
* 开始临期提醒日期 = 任务结束日期-临期提醒天数(未完成的试验) |
|
|
|
|
* 临期天数 = 任务结束日期-当前日期 |
|
|
|
|
* <p> |
|
|
|
|
* todo:工艺员 只能看到自己的数据。 |
|
|
|
|
*/ |
|
|
|
|
@Service |
|
|
|
|
@Data |
|
|
|
|
@ -61,6 +69,8 @@ public class CycleTestTaskService { |
|
|
|
|
@Resource |
|
|
|
|
private ICycleTestStandardGenService standardGenService; |
|
|
|
|
@Resource |
|
|
|
|
private CycleTestStandardService standardService; |
|
|
|
|
@Resource |
|
|
|
|
private ICycleTestItemGenService itemGenService; |
|
|
|
|
@Resource |
|
|
|
|
private ICycleTestTaskGenService genService; |
|
|
|
|
@ -71,6 +81,12 @@ public class CycleTestTaskService { |
|
|
|
|
@Resource |
|
|
|
|
private IAttachClient attachClient; |
|
|
|
|
|
|
|
|
|
public R autoCheckTimeout() { |
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
return R.success(""); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* list |
|
|
|
|
* |
|
|
|
|
@ -80,10 +96,12 @@ public class CycleTestTaskService { |
|
|
|
|
*/ |
|
|
|
|
public R<IPage<CycleTestTaskGenVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> cycleTestTask, |
|
|
|
|
Query query) { |
|
|
|
|
log.info("cycleTestTask = {}", cycleTestTask); |
|
|
|
|
IPage<CycleTestTask> pages = genService.page( |
|
|
|
|
Condition.getPage(query), |
|
|
|
|
Condition.getQueryWrapper(cycleTestTask, CycleTestTask.class) |
|
|
|
|
.orderByAsc(BaseCol.ID) |
|
|
|
|
.orderByAsc(BaseCol.STATUS) |
|
|
|
|
); |
|
|
|
|
IPage<CycleTestTaskGenVO> pagesVO = CycleTestTaskGenWrapper.build().pageVO(pages); |
|
|
|
|
pagesVO.getRecords() |
|
|
|
|
@ -116,26 +134,26 @@ public class CycleTestTaskService { |
|
|
|
|
/** |
|
|
|
|
* 定时任务 生成任务 |
|
|
|
|
* |
|
|
|
|
* @param cycleTestId |
|
|
|
|
* @param cycleTestId 指定 周期试验 |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public Boolean generateAuto(Long cycleTestId) { |
|
|
|
|
public CycleTestTask generateAuto(Long cycleTestId) { |
|
|
|
|
CycleTest ct = cycleTestGenMapper.selectById(cycleTestId); |
|
|
|
|
CycleTestTask task = new CycleTestTask(); |
|
|
|
|
{ |
|
|
|
|
task.setStatus(CycleTestTaskConst.STATE_PENDING_ACCEPT); |
|
|
|
|
task.setCode(genCode()); |
|
|
|
|
task.setCycleTestTaskType(CycleTestTaskConst.TYPE_CYCLE); |
|
|
|
|
task.setName(genCode()); |
|
|
|
|
task.setCycleTestItemId(ct.getCycleTestItemId()); |
|
|
|
|
task.setStatus(CycleTestTaskConst.STATE_PENDING_ACCEPT); |
|
|
|
|
task.setTestType(ct.getTestType()); |
|
|
|
|
task.setProcessUserId(ct.getProcessUserId()); |
|
|
|
|
task.setTestUserId(ct.getTestUserId()); |
|
|
|
|
task.setPlateId(ct.getPlateId()); |
|
|
|
|
} |
|
|
|
|
task.setCycleTestItemId(ct.getCycleTestItemId()); |
|
|
|
|
task.setProcessUserId(ct.getProcessUserId()); |
|
|
|
|
// 插入生成任务。
|
|
|
|
|
genMapper.insert(task); |
|
|
|
|
return true; |
|
|
|
|
return task; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
@ -260,10 +278,17 @@ public class CycleTestTaskService { |
|
|
|
|
|
|
|
|
|
public void setVoValue(CycleTestTaskGenVO vo) { |
|
|
|
|
CycleTestItem item = itemGenService.getById(vo.getCycleTestItemId()); |
|
|
|
|
if (item != null) { |
|
|
|
|
vo.setCycleTestItemName(item.getName()); |
|
|
|
|
vo.setCycleTestItemCondition(item.getCondition()); |
|
|
|
|
} |
|
|
|
|
CycleTestStandard standard = standardGenService.getById(item.getCycleTestStandardId()); |
|
|
|
|
vo.setCycleTestItemName(item.getName()); |
|
|
|
|
vo.setCycleTestItemCondition(item.getCondition()); |
|
|
|
|
vo.setCycleTestStandardName(standard.getName()); |
|
|
|
|
if (standard != null) { |
|
|
|
|
vo.setCycleTestStandardName(standard.getName()); |
|
|
|
|
CycleTestStandardGenVO standardGenVO = CycleTestStandardGenWrapper.build().entityVO(standard); |
|
|
|
|
standardService.setVoValue(standardGenVO); |
|
|
|
|
vo.setStandard(standardGenVO); |
|
|
|
|
} |
|
|
|
|
{ |
|
|
|
|
R<UserInfo> ui = userClient.userInfo(vo.getProcessUserId()); |
|
|
|
|
if (!Objects.isNull(ui)) { |
|
|
|
|
@ -334,4 +359,26 @@ public class CycleTestTaskService { |
|
|
|
|
// log.info("{}", ossFile);
|
|
|
|
|
// return R.success("");
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
private LocalDate issueDate(CycleTestTask t) { |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public void test() { |
|
|
|
|
log.warn("test"); |
|
|
|
|
generateAuto(1994327131919831041L); |
|
|
|
|
{ |
|
|
|
|
JobExt je = new JobExt(); |
|
|
|
|
je.setJobType(JobTypeConst.WEEK); |
|
|
|
|
je.setJobTypeWeekValue("3,4"); |
|
|
|
|
log.warn(PowerJobUtil.buildCronWeek(je)); |
|
|
|
|
} |
|
|
|
|
{ |
|
|
|
|
// JobExt je = new JobExt();
|
|
|
|
|
// je.setJobType(JobTypeConst.MONTH);
|
|
|
|
|
// je.setJobTypeMonthValue("09");
|
|
|
|
|
// log.warn(PowerJobUtil.buildCronMonth(je));
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|