Commit edb5901d by ghxdhr

项目不填入报告的接口

parent 0862f296
...@@ -597,4 +597,10 @@ public class EntrustSampleItemController extends ServiceController { ...@@ -597,4 +597,10 @@ public class EntrustSampleItemController extends ServiceController {
return success(entrustSampleItemService.getTesterWorkloadStatusQuery(queryDTO)); return success(entrustSampleItemService.getTesterWorkloadStatusQuery(queryDTO));
} }
@ApiOperation("项目不写入报告")
@PostMapping("/notWriteToReport")
public RestResult<Boolean> notWriteToReport(@RequestParam("ids") List<Long> ids) {
return success(entrustSampleItemService.notWriteToReport(ids));
}
} }
...@@ -86,4 +86,6 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte ...@@ -86,4 +86,6 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
Page<LmsUserRelGroupVO> selectAllPersonWorkload(Page<LmsUserRelGroupVO> page,LmsUserRelGroup rel); Page<LmsUserRelGroupVO> selectAllPersonWorkload(Page<LmsUserRelGroupVO> page,LmsUserRelGroup rel);
List<EntrustSampleCalcResultVO> getSampleCalcResult(QueryDTO queryDTO); List<EntrustSampleCalcResultVO> getSampleCalcResult(QueryDTO queryDTO);
Boolean notWriteToReport(List<Long> ids);
} }
...@@ -858,6 +858,20 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI ...@@ -858,6 +858,20 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
return baseMapper.selectSampleCalcResult(queryDTO); return baseMapper.selectSampleCalcResult(queryDTO);
} }
/* 不写入报告-- 修改选中项目的[inReport]属性 */
@Override
public Boolean notWriteToReport(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
RestAssert.fail("请选择不写入报告的项目!");
}
List<EntrustSampleItem> items = ids.stream().map(id -> {
EntrustSampleItem item = new EntrustSampleItem().setInReport(0);
item.setId(id);
return item;
}).collect(Collectors.toList());
return updateBatchById(items);
}
/* 项目是否未检测 */ /* 项目是否未检测 */
public Boolean isNotTesting(EntrustSampleItem item) { public Boolean isNotTesting(EntrustSampleItem item) {
return entrustSampleItemIndexService.list(Condition.create() return entrustSampleItemIndexService.list(Condition.create()
......
...@@ -180,6 +180,8 @@ ...@@ -180,6 +180,8 @@
JOIN entrust_sample s ON i.entrust_sample_id = s.ID JOIN entrust_sample s ON i.entrust_sample_id = s.ID
WHERE i.deleted = 0 AND s.deleted = 0 WHERE i.deleted = 0 AND s.deleted = 0
-- 查询在报告中体现的
AND i.in_report = 1
AND i.entrust_sample_id IN AND i.entrust_sample_id IN
<foreach collection="ids" index="index" item="sampleId" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="sampleId" open="(" separator="," close=")">
#{sampleId} #{sampleId}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment