Commit 0a9ed5a1 by wangweidong

土工平台修改

parent 94c18c7d
...@@ -53,6 +53,21 @@ public class EntrustSampleBackupController extends ServiceController { ...@@ -53,6 +53,21 @@ public class EntrustSampleBackupController extends ServiceController {
return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup)); return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
} }
@ApiOperation("样品处理分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_handle")
public RestResult<Page<EntrustSampleBackupVO>> getPageHandle(EntrustSampleBackupVO entrustSampleBackup) {
entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.HANDLE);
return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
}
@ApiOperation("查询 id 信息") @ApiOperation("查询 id 信息")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class), @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
...@@ -87,6 +102,14 @@ public class EntrustSampleBackupController extends ServiceController { ...@@ -87,6 +102,14 @@ public class EntrustSampleBackupController extends ServiceController {
} }
@ApiOperation("提交处置")
@PostMapping("/submit_to_handle")
public RestResult<Boolean> submitToHandle(@RequestParam("ids") Long [] ids) {
return success(entrustSampleBackupService.submitToHandle(ids,getAccount()));
}
@ApiOperation("根据 ids 删除") @ApiOperation("根据 ids 删除")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class), @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
......
...@@ -213,4 +213,62 @@ public class EntrustSampleController extends ServiceController { ...@@ -213,4 +213,62 @@ public class EntrustSampleController extends ServiceController {
return success(entrustSampleService.backJudgeCheck(ids,remark,getAccount())); return success(entrustSampleService.backJudgeCheck(ids,remark,getAccount()));
} }
@ApiOperation("任务分配按照样品分配左侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_allot_by_sample_left")
public RestResult<Page<EntrustSampleVO>> getPageAllotByItemLeft(EntrustSampleVO sampleVO) {
sampleVO.setItemStatus(EntrustSampleItemStatusEnum.ALLOT);
return success(entrustSampleService.pageBySampleLeft(getPage(), sampleVO));
}
@ApiOperation("数据录入按照样品录入左侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_input_by_sample_left")
public RestResult<Page<EntrustSampleVO>> getPageInputByItemLeft(EntrustSampleVO sampleVO) {
sampleVO.setItemStatus(EntrustSampleItemStatusEnum.TEST);
return success(entrustSampleService.pageBySampleLeft(getPage(), sampleVO));
}
@ApiOperation("数据复核按照样品复核左侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_check_by_sample_left")
public RestResult<Page<EntrustSampleVO>> getPageCheckByItemLeft(EntrustSampleVO sampleVO) {
sampleVO.setItemStatus(EntrustSampleItemStatusEnum.CHECK);
return success(entrustSampleService.pageBySampleLeft(getPage(), sampleVO));
}
@ApiOperation("数据审核按照样品审核左侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_audit_by_sample_left")
public RestResult<Page<EntrustSampleVO>> getPageAuditByItemLeft(EntrustSampleVO sampleVO) {
sampleVO.setItemStatus(EntrustSampleItemStatusEnum.AUDIT);
return success(entrustSampleService.pageBySampleLeft(getPage(), sampleVO));
}
} }
...@@ -119,6 +119,51 @@ public class EntrustSampleItemController extends ServiceController { ...@@ -119,6 +119,51 @@ public class EntrustSampleItemController extends ServiceController {
@ApiOperation("数据录入按照样品录入右侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_input_by_sample_right")
public RestResult<Page<EntrustSampleItemVO>> getPageInputBySampleRight(EntrustSampleItemVO entrustSampleItem) {
entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.TEST);
return success(entrustSampleItemService.pageAllotBySampleRight(getPage(), entrustSampleItem));
}
@ApiOperation("数据复核按照样品复核右侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_check_by_sample_right")
public RestResult<Page<EntrustSampleItemVO>> getPageCheckBySampleRight(EntrustSampleItemVO entrustSampleItem) {
entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.CHECK);
return success(entrustSampleItemService.pageAllotBySampleRight(getPage(), entrustSampleItem));
}
@ApiOperation("数据审核按照样品审核右侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_audit_by_sample_right")
public RestResult<Page<EntrustSampleItemVO>> getPageAuditBySampleRight(EntrustSampleItemVO entrustSampleItem) {
entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.AUDIT);
return success(entrustSampleItemService.pageAllotBySampleRight(getPage(), entrustSampleItem));
}
@ApiOperation("任务分配按照样品分配右侧分页列表") @ApiOperation("任务分配按照样品分配右侧分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......
...@@ -23,4 +23,6 @@ public interface IEntrustSampleBackupService extends IBaseService<EntrustSampleB ...@@ -23,4 +23,6 @@ public interface IEntrustSampleBackupService extends IBaseService<EntrustSampleB
boolean handleOk(Long[] ids, Account account); boolean handleOk(Long[] ids, Account account);
Page<EntrustSampleBackupVO> pageVO(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup); Page<EntrustSampleBackupVO> pageVO(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup);
boolean submitToHandle(Long[] ids, Account account);
} }
...@@ -34,4 +34,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> { ...@@ -34,4 +34,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
boolean submitJudgeCheck(Long[] ids, Account account); boolean submitJudgeCheck(Long[] ids, Account account);
boolean backJudgeCheck(Long[] ids, String remark, Account account); boolean backJudgeCheck(Long[] ids, String remark, Account account);
Page<EntrustSampleVO> pageBySampleLeft(Page<EntrustSampleVO> page, EntrustSampleVO sampleVO);
} }
...@@ -54,4 +54,14 @@ public class EntrustSampleBackupServiceImpl extends BaseServiceImpl<EntrustSampl ...@@ -54,4 +54,14 @@ public class EntrustSampleBackupServiceImpl extends BaseServiceImpl<EntrustSampl
public Page<EntrustSampleBackupVO> pageVO(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup) { public Page<EntrustSampleBackupVO> pageVO(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup) {
return page.setRecords(baseMapper.selectVOList(page,entrustSampleBackup)); return page.setRecords(baseMapper.selectVOList(page,entrustSampleBackup));
} }
@Override
public boolean submitToHandle(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择提交处置的样品!");
EntrustSampleBackup backup = new EntrustSampleBackup();
backup.setStatus(EntrustSampleBackupStatusEnum.HANDLE);
backup.setProgress(EntrustSampleBackupStatusEnum.HANDLE);
return super.update(backup,Condition.create().in("id",ids));
}
} }
...@@ -310,6 +310,25 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe ...@@ -310,6 +310,25 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
return super.update(sample,Condition.create().in("id",ids)); return super.update(sample,Condition.create().in("id",ids));
} }
@Override
public Page<EntrustSampleVO> pageBySampleLeft(Page<EntrustSampleVO> page, EntrustSampleVO sampleVO) {
if (null == sampleVO.getEntrustId()){
return page;
}
List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().eq("status",sampleVO.getItemStatus()));
if (CollectionUtils.isEmpty(itemList)){
return page;
}
List<Long> sampleIds = new ArrayList<>();
for (EntrustSampleItem item : itemList) {
sampleIds.add(item.getEntrustSampleId());
}
sampleVO.setIds(sampleIds);
return page.setRecords(baseMapper.selectVOList(page,sampleVO));
}
public void reportMakeTestContent(XWPFTable xwpfTable, int length, int index, List<?> objList) { public void reportMakeTestContent(XWPFTable xwpfTable, int length, int index, List<?> objList) {
//检测内容 //检测内容
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
b.storage_location, b.storage_location,
b.storage_method, b.storage_method,
b.storage_period, b.storage_period,
b.sample_id,
b.handler, b.handler,
b.handle_time, b.handle_time,
...@@ -28,6 +29,11 @@ FROM ...@@ -28,6 +29,11 @@ FROM
<if test="null!=vo.sampleCode"> <if test="null!=vo.sampleCode">
AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%') AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
</if> </if>
<if test="null!=vo.status">
AND b.status =#{vo.status}
</if>
<if test="null!=vo.sampleName"> <if test="null!=vo.sampleName">
AND s.name LIKE CONCAT('%',#{vo.sampleName},'%') AND s.name LIKE CONCAT('%',#{vo.sampleName},'%')
</if> </if>
......
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
name, name,
status, status,
standard, standard,
test_value,
group_name, group_name,
group_id group_id
FROM FROM
......
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