土工平台修改

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilEntrustController.java

@@ -254,6 +254,7 @@ public class SoilEntrustController extends ServiceController  {
         soilEntrust.setSampleStatusList(Lists.newArrayList(
                 SoilSampleStatusEnum.TAKE,
                 SoilSampleStatusEnum.TEST,
+                SoilSampleStatusEnum.CHECK_PREPARE,
                 SoilSampleStatusEnum.END
         ));
         return success(soilEntrustService.pageVOBySample(getPage(), soilEntrust));
@@ -263,6 +264,65 @@ public class SoilEntrustController extends ServiceController  {
 
 
 
+
+
+
+
+
+
+
+
+
+
+    @ApiOperation(value = "开土制备审核样品委托分页列表", notes = "开土制备样品委托分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_sample_prepare_check")
+    public RestResult<Page<SoilEntrustVO>> getPageSamplePrepareCheck(SoilEntrustVO soilEntrust) {
+        soilEntrust.setSampleStatusList(Lists.newArrayList(
+                SoilSampleStatusEnum.CHECK_PREPARE
+        ));
+        return success(soilEntrustService.pageVOBySample(getPage(), soilEntrust));
+    }
+
+
+
+
+
+
+
+    @ApiOperation(value = "开土制备样品委托历史分页列表", notes = "开土制备样品委托历史分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_sample_prepare_check_his")
+    public RestResult<Page<SoilEntrustVO>> getPageSamplePrepareCheckHis(SoilEntrustVO soilEntrust) {
+        soilEntrust.setSampleStatusList(Lists.newArrayList(
+                SoilSampleStatusEnum.TAKE,
+                SoilSampleStatusEnum.TEST,
+                SoilSampleStatusEnum.END
+        ));
+        return success(soilEntrustService.pageVOBySample(getPage(), soilEntrust));
+    }
+
+
+
+
+
+
+
+
+
+
+
+
     @ApiOperation(value = "试验任务分配委托分页列表", notes = "试验任务分配委托分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilSampleController.java

@@ -157,6 +157,20 @@ public class SoilSampleController extends ServiceController  {
     }
 
 
+    @ApiOperation(value = "待开土制备样品分页列表", notes = "待开土制备样品分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_prepare_check")
+    public RestResult<Page<SoilSampleVO>> getPagePrepareCheck(SoilSampleVO soilSample) {
+        soilSample.setStatus(SoilSampleStatusEnum.CHECK_PREPARE);
+        return success(soilSampleService.pageVO(getPage(), soilSample));
+    }
+
+
     @ApiOperation(value = "开土制备样品历史分页列表", notes = "开土制备样品历史分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
@@ -425,6 +439,24 @@ public class SoilSampleController extends ServiceController  {
     }
 
 
+
+    @ApiOperation(value = "样品开土制备审核通过", notes = "样品开土制备审核通过")
+    @PostMapping("/prepare_check_ok")
+    public RestResult<Boolean> prepareCheckOk(@RequestParam("ids") Long [] ids) {
+        return success(soilSampleService.prepareCheckOk(ids,getAccount()));
+    }
+
+
+
+    @ApiOperation(value = "样品开土制备审核退回", notes = "样品开土制备审核退回")
+    @PostMapping("/prepare_check_back")
+    public RestResult<Boolean> prepareCheckBack(@RequestParam("ids") Long [] ids,@RequestParam("remark") String remark) {
+        return success(soilSampleService.prepareCheckBack(ids,remark,getAccount()));
+    }
+
+
+
+
     @ApiOperation(value = "试验实领样样品操作", notes = "收样室发放样品")
     @PostMapping("/take_sample")
     public RestResult<Boolean> takeSample(@RequestParam("ids")Long [] ids) {

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilSampleService.java

@@ -72,4 +72,8 @@ public interface ISoilSampleService extends IBaseService<SoilSample> {
     Map<String, Object> originalRecordDataBind(Long entrustId,Long[] expIds, Long modelId, Account account);
 
     boolean removeSampleFromLocation(Long[] ids, Account account);
+
+    boolean prepareCheckOk(Long[] ids, Account account);
+
+    boolean prepareCheckBack(Long[] ids, String remark, Account account);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilEntrustServiceImpl.java

@@ -116,7 +116,7 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
     @Override
     public Page<SoilEntrust> page(Page<SoilEntrust> page, SoilEntrust soilEntrust) {
         Wrapper wrapper = new EntityWrapper<>(soilEntrust);
-
+        wrapper.orderBy("entrust_code",false);
         return this.page(page, wrapper);
     }
 
@@ -1093,7 +1093,7 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
             XSSFSheet sheet= workbook.getSheetAt(0);
            int num= sheet.getLastRowNum();
            Map<Integer,String> itemIndexMap = new HashMap<>();
-           Map<String,Map<String,String>> sampleInfoMap = new TreeMap<>(new MyComparator());
+           Map<String,Map<String,String>> sampleInfoMap = new LinkedHashMap<>();
 
             String gch="";
             String client= "";

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilSampleServiceImpl.java

 package com.patzn.cloud.service.lims.soil.service.impl;
-
-import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.controller.LoginHelper;
 import com.patzn.cloud.commons.toolkit.StringHandleUtils;
 import com.patzn.cloud.feign.lims.base.client.LmsUserGroupClient;
 import com.patzn.cloud.service.lims.base.entity.LmsUserGroup;
-import com.patzn.cloud.service.lims.common.ExcelReader;
-import com.patzn.cloud.service.lims.common.StringStaticDataUtils;
 import com.patzn.cloud.service.lims.soil.service.*;
 import com.patzn.cloud.service.soil.dto.SoilPrepareDTO;
 import com.patzn.cloud.service.soil.entity.*;
@@ -38,7 +32,6 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-
 /**
  * <p>
  * 土工试验试样表 服务实现类
@@ -216,6 +209,50 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean prepareCheckOk(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要审核通过的样品");
+        int count = super.count(Condition.create().in("id",ids).ne("status",SoilSampleStatusEnum.CHECK_PREPARE));
+        RestAssert.fail(count>0,"请选择待制备审核的样品");
+        SoilSample sample = new SoilSample();
+        sample.setStatus(SoilSampleStatusEnum.TAKE);
+        sample.setProgress(SoilSampleStatusEnum.TAKE);
+
+        if (super.update(sample,Condition.create().in("id",ids))){
+            SoilPrepare prepare = new SoilPrepare();
+            prepare.setStatus(SoilPrepareStatusEnum.PREPARED);
+            prepare.setProgress(SoilPrepareStatusEnum.PREPARED);
+            soilPrepareService.update(prepare,Condition.create().in("sample_id",ids));
+
+            soilSampleRecordService.record(SoilSampleStatusEnum.CHECK_PREPARE,SoilSampleStatusEnum.TAKE,ids,0,account,"样品开土制备审核完成");
+            return true;
+        }
+        return false;
+    }
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean prepareCheckBack(Long[] ids, String remark, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要审核驳回的样品");
+        int count = super.count(Condition.create().in("id",ids).ne("status",SoilSampleStatusEnum.CHECK_PREPARE));
+        RestAssert.fail(count>0,"请选择待制备审核的样品");
+        SoilSample sample = new SoilSample();
+        sample.setStatus(SoilSampleStatusEnum.SOIL_PREPARE);
+        sample.setProgress(SoilSampleStatusEnum.SOIL_PREPARE);
+        if (super.update(sample,Condition.create().in("id",ids))){
+            soilSampleRecordService.record(SoilSampleStatusEnum.CHECK_PREPARE,SoilSampleStatusEnum.SOIL_PREPARE,ids,1,account,remark);
+            soilPrepareService.remove(Condition.create().in("sample_id",ids));
+            return true;
+        }
+
+
+        return false;
+    }
+
+
     @Override
     public boolean checkEntrustHaveSample(Long[] entrustIds) {
         if (ArrayUtils.isEmpty(entrustIds)){
@@ -516,19 +553,19 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
             int count = super.count(Condition.create().in("id",sampleIdSet).ne("status",SoilSampleStatusEnum.SOIL_PREPARE));
             RestAssert.fail(count>0,"请制备待制备的样品");
             SoilSample sample = new SoilSample();
-            sample.setStatus(SoilSampleStatusEnum.TAKE);
-            sample.setProgress(SoilSampleStatusEnum.TAKE);
+            sample.setStatus(SoilSampleStatusEnum.CHECK_PREPARE);
+            sample.setProgress(SoilSampleStatusEnum.CHECK_PREPARE);
 
             if (super.update(sample,Condition.create().in("id",sampleIdSet))){
                 soilSampleOperationService.recordMakerInfo(sampleIdSet,account);
-                soilSampleRecordService.record(SoilSampleStatusEnum.SEND,SoilSampleStatusEnum.SOIL_PREPARE,sampleIdSet,0,account,"样品开土制备完成");
+                soilSampleRecordService.record(SoilSampleStatusEnum.SEND,SoilSampleStatusEnum.CHECK_PREPARE,sampleIdSet,0,account,"样品开土制备完成");
                 List<SoilPrepare> saveList = new ArrayList<>();
                 for (Long sampleId:sampleIdSet) {
                     SoilPrepare prepare = new SoilPrepare();
                     //2代表是副样
                     prepare.setType(2);
-                    prepare.setStatus(SoilPrepareStatusEnum.PREPARED);
-                    prepare.setProgress(SoilPrepareStatusEnum.PREPARED);
+                    prepare.setStatus(SoilPrepareStatusEnum.CHECK_PREPARED);
+                    prepare.setProgress(SoilPrepareStatusEnum.CHECK_PREPARED);
                     prepare.setSampleId(sampleId);
                     saveList.add(prepare);
                 }
@@ -538,8 +575,8 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
             }
 
             for (SoilPrepare prepare:prepareList) {
-                prepare.setStatus(SoilPrepareStatusEnum.PREPARED);
-                prepare.setProgress(SoilPrepareStatusEnum.PREPARED);
+                prepare.setStatus(SoilPrepareStatusEnum.CHECK_PREPARED);
+                prepare.setProgress(SoilPrepareStatusEnum.CHECK_PREPARED);
             }
            return  soilPrepareService.saveBatch(prepareList);
         }