土工平台修改

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleItemController.java

@@ -177,6 +177,67 @@ 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_check_by_item_left")
+    public RestResult<Page<EntrustSampleItemVO>> getPageCheckByItemLeft(EntrustSampleItemVO entrustSampleItem) {
+        entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.CHECK);
+        return success(entrustSampleItemService.pageByItemLeft(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_item_right")
+    public RestResult<Page<EntrustSampleItemVO>> getPageCheckByItemRight(EntrustSampleItemVO entrustSampleItem) {
+        entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.CHECK);
+        return success(entrustSampleItemService.pageByItemRight(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_item_left")
+    public RestResult<Page<EntrustSampleItemVO>> getPageAuditByItemLeft(EntrustSampleItemVO entrustSampleItem) {
+        entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.AUDIT);
+        return success(entrustSampleItemService.pageByItemLeft(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_item_right")
+    public RestResult<Page<EntrustSampleItemVO>> getPageAuditByItemRight(EntrustSampleItemVO entrustSampleItem) {
+        entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.AUDIT);
+        return success(entrustSampleItemService.pageByItemRight(getPage(), entrustSampleItem));
+    }
+
+
+
 
     @ApiOperation("数据录入提交")
     @PostMapping("/submit_test")
@@ -194,6 +255,14 @@ public class EntrustSampleItemController extends ServiceController {
 
 
 
+    @ApiOperation("数据审核提交")
+    @PostMapping("/submit_audit")
+    public RestResult<Boolean> submitAudit(@RequestParam("ids")Long []ids ) {
+        return success(entrustSampleItemService.submitAudit(ids,getAccount()));
+    }
+
+
+
 
 
     @ApiOperation("数据复核退回")

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemService.java

@@ -34,6 +34,8 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
 
     boolean submitCheck(Long[] ids, Account account);
 
+    boolean submitAudit(Long[] ids, Account account);
+
     boolean backCheck(Long[] ids, String reason, Account account);
 
     boolean backAudit(Long[] ids, String reason, Account account);

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java

@@ -7,6 +7,7 @@ import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
 import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
+import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemRecordService;
@@ -22,6 +23,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -173,7 +175,57 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
 
 
         super.update(item,Condition.create().in("id",ids));
-         entrustSampleItemRecordService.record(ids,EntrustSampleItemStatusEnum.CHECK.getDisplay(),EntrustSampleItemStatusEnum.AUDIT.getDisplay(),0,"数据审核提交",account);
+         entrustSampleItemRecordService.record(ids,EntrustSampleItemStatusEnum.CHECK.getDisplay(),EntrustSampleItemStatusEnum.AUDIT.getDisplay(),0,"数据复核提交",account);
+        return true;
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitAudit(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的检测项目");
+        List<EntrustSampleItem> list = super.list(Condition.create().in("id",ids).eq("status",EntrustSampleItemStatusEnum.AUDIT));
+        RestAssert.fail(list.size()!=ids.length,"请选择待审核的检测项目");
+
+        EntrustSampleItem item = new EntrustSampleItem();
+
+
+        item.setStatus(EntrustSampleItemStatusEnum.END);
+        item.setProgress(EntrustSampleItemStatusEnum.END);
+        item.setAuditor(account.getUserName());
+        item.setAuditorId(account.getUserId());
+        item.setAuditTime(new Date());
+
+
+        super.update(item,Condition.create().in("id",ids));
+        entrustSampleItemRecordService.record(ids,EntrustSampleItemStatusEnum.AUDIT.getDisplay(),EntrustSampleItemStatusEnum.END.getDisplay(),0,"数据审核提交",account);
+
+
+
+        List<Long> sampleIds = list.stream().map(i->{
+            return i.getEntrustSampleId();
+        }).collect(Collectors.toList());
+
+        List<EntrustSampleItem> listCheckOk = super.list(Condition.create().in("entrust_sample_id",sampleIds).ne("status",EntrustSampleItemStatusEnum.END));
+
+        List<Long> sampleNotOkList = listCheckOk.stream().map(i->{
+            return i.getEntrustSampleId();
+        }).collect(Collectors.toList());
+
+        List<Long> sampleOkIdsList = new ArrayList<>();
+
+        for (Long sampleId:sampleIds) {
+            if (!sampleNotOkList.contains(sampleId)){
+                sampleOkIdsList.add(sampleId);
+            }
+        }
+
+        if (CollectionUtils.isNotEmpty(sampleOkIdsList)){
+            EntrustSample sample = new EntrustSample();
+            sample.setStatus(EntrustSampleStatusEnum.REPORT_MAKE);
+            sample.setProgress(EntrustSampleStatusEnum.REPORT_MAKE);
+            entrustSampleService.update(sample,Condition.create().in("id",sampleOkIdsList));
+        }
         return true;
     }
 

src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

@@ -25,6 +25,7 @@
              status,
              standard,
              group_name,
+             test_value,
              group_id
          FROM
             entrust_sample_item