土工平台修改

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
+import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -50,6 +51,39 @@ public class ContractSampleController extends ServiceController {
         return success(contractSampleService.page(getPage(), contractSample));
 	}
 
+
+
+    @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_store_transport")
+    public RestResult<Page<ContractSample>> getPageStoreTransport(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.STORE_TRANSPORT);
+        return success(contractSampleService.page(getPage(), contractSample));
+    }
+
+
+
+
+    @ApiOperation("根据ID查询列表分页列表")
+    @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_by_ids")
+    public RestResult<Page<ContractSample>> getPageByIds(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.pageByIds(getPage(), ids));
+    }
+
+
+
+
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
@@ -75,6 +109,16 @@ public class ContractSampleController extends ServiceController {
         return success(contractSampleService.save(contractSample));
 	}
 
+
+
+    @ApiOperation("提交至储运登记")
+    @PostMapping("/submit_to_store_transport")
+    public RestResult<Boolean> submitToStoreTransport(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.submitToStoreTransport(ids,getAccount()));
+    }
+
+
+
     @ApiOperation("根据 ids 删除")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),

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

 package com.patzn.cloud.service.lims.hmhj.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 
@@ -16,5 +17,9 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
 
     Page<ContractSample> page(Page<ContractSample> page, ContractSample contractSample);
 
+    Page<ContractSample> pageByIds(Page<ContractSample> page, Long[] ids);
+
     boolean removeByIds(List<Long> ids);
+
+    boolean submitToStoreTransport(Long[] ids, Account account);
 }

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

 package com.patzn.cloud.service.lims.hmhj.service.impl;
 
 import com.baomidou.mybatisplus.mapper.Condition;
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
+import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
 import com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IContractSampleService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -28,8 +33,26 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         return this.page(page, wrapper);
     }
 
+
+    @Override
+    public Page<ContractSample> pageByIds(Page<ContractSample> page, Long [] ids) {
+        Wrapper wrapper = new EntityWrapper<>();
+        wrapper.in("id",ids);
+        return this.page(page, wrapper);
+    }
+
     @Override
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitToStoreTransport(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.STORE_TRANSPORT);
+        contractSample.setProgress(ContractSampleStatusEnum.STORE_TRANSPORT);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
 }