Skip to content

P
patzn-cloud-service-soil
Commit cdbb52cb by wangweidong
Options

中海油服土工试验

parent 22221e78
Showing with 1551 additions and 8 deletions
src/main/java/com/patzn/cloud/service/lims/common/MyComparator.java 0 → 100644
package com.patzn.cloud.service.lims.common;
import java.util.Comparator;
public class MyComparator implements Comparator<String> {
@Override
public int compare(String o1, String o2) {
int a= Integer.parseInt(o1)-Integer.parseInt(o2);
return a ;
}
@Override
public boolean equals(Object obj) {
return false;
}
}
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilAptitudeExpController.java
......@@ -79,14 +79,14 @@ public class SoilAptitudeExpController extends ServiceController {
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, SoilAptitudeExp soilAptitudeExp) {
soilAptitudeExp.setId(id);
return success(soilAptitudeExpService.updateById(soilAptitudeExp));
return success(soilAptitudeExpService.updateAptExpById(soilAptitudeExp));
}
@ApiOperation(value = "添加", notes = "添加一条数据")
@PostMapping("/")
public RestResult<Boolean> add(SoilAptitudeExp soilAptitudeExp) {
return success(soilAptitudeExpService.save(soilAptitudeExp));
return success(soilAptitudeExpService.saveAptExp(soilAptitudeExp));
}
......
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilEntrustController.java
......@@ -25,6 +25,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.multipart.MultipartFile;
/**
* <p>
......@@ -58,6 +59,67 @@ 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_reg_his")
public RestResult<Page<SoilEntrustVO>> getPageRegHis(SoilEntrustVO soilEntrust) {
soilEntrust.setStatusList(Lists.newArrayList(
SoilEntrustStatusEnum.REVIEW,
SoilEntrustStatusEnum.RECEIVE,
SoilEntrustStatusEnum.REPORT,
SoilEntrustStatusEnum.REPORT_CHECK,
SoilEntrustStatusEnum.REPORT_ISSUE
));
return success(soilEntrustService.pageVO(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_report_make")
public RestResult<Page<SoilEntrust>> getPageReportMake(SoilEntrust soilEntrust) {
soilEntrust.setStatus(SoilEntrustStatusEnum.REPORT);
return success(soilEntrustService.page(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_report_check")
public RestResult<Page<SoilEntrust>> getPageReportCheck(SoilEntrust soilEntrust) {
soilEntrust.setStatus(SoilEntrustStatusEnum.REPORT_CHECK);
return success(soilEntrustService.page(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_report_issue")
public RestResult<Page<SoilEntrust>> getPageReportIssue(SoilEntrust soilEntrust) {
soilEntrust.setStatus(SoilEntrustStatusEnum.REPORT_ISSUE);
return success(soilEntrustService.page(getPage(), soilEntrust));
}
@ApiOperation(value = "样品接收委托分页列表", notes = "分页查询数据列表")
@ApiImplicitParams({
......@@ -75,6 +137,30 @@ public class SoilEntrustController extends ServiceController {
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_receive_his")
public RestResult<Page<SoilEntrustVO>> getPageSampleReceiveHis(SoilEntrustVO soilEntrust) {
soilEntrust.setSampleStatusList(Lists.newArrayList(
SoilSampleStatusEnum.RECEIVE,
SoilSampleStatusEnum.SEND,
SoilSampleStatusEnum.SOIL_PREPARE,
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"),
......@@ -94,6 +180,29 @@ 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_his")
public RestResult<Page<SoilEntrustVO>> getPageSamplePrepareHis(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"),
......@@ -257,4 +366,12 @@ public class SoilEntrustController extends ServiceController {
return success(soilEntrustService.reviewBack(ids,reason,getAccount()));
}
@ApiOperation(value = "导入试验委托单 EXCEL", notes = "导入导入试验委托单 EXCEL 的数据内容")
@PostMapping("/import_entrust/")
public RestResult<Boolean> importEntrust(MultipartFile file) {
return success(soilEntrustService.importEntrust(file,getAccount()));
}
}
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilPrepareController.java
......@@ -2,6 +2,9 @@ package com.patzn.cloud.service.lims.soil.controller;
import java.util.List;
import com.google.common.collect.Lists;
import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum;
import com.patzn.cloud.service.soil.vo.SoilPrepareVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -55,6 +58,45 @@ public class SoilPrepareController 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_surplus")
public RestResult<Page<SoilPrepareVO>> getPageSurplus(SoilPrepareVO soilPrepare) {
soilPrepare.setType(1);
soilPrepare.setStatusList(Lists.newArrayList(
SoilPrepareStatusEnum.PREPARED,
SoilPrepareStatusEnum.DISPOSAL_CHECK,
SoilPrepareStatusEnum.DISPOSAL_OK,
SoilPrepareStatusEnum.DISPOSAL_FAIL
));
return success(soilPrepareService.pagePrepareVO(getPage(), soilPrepare));
}
@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_surplus_handle_check")
public RestResult<Page<SoilPrepareVO>> getPageSurplusHandleCheck(SoilPrepareVO soilPrepare) {
soilPrepare.setType(1);
soilPrepare.setStatusList(Lists.newArrayList(
SoilPrepareStatusEnum.DISPOSAL_CHECK
));
return success(soilPrepareService.pagePrepareVO(getPage(), soilPrepare));
}
@ApiOperation(value = "查询列表", notes = "查询数据列表")
@PostMapping("/list")
public RestResult<List<SoilPrepare>> getList(SoilPrepare soilPrepare) {
......@@ -99,4 +141,34 @@ public class SoilPrepareController extends ServiceController {
return success(soilPrepareService.remove(Condition.create().in("id", ids)));
}
@ApiOperation(value = "余样申请处理", notes = "备样申请处理")
@PostMapping("/apply_handle")
public RestResult<Boolean> applyHandle(@RequestParam("ids")Long [] ids, SoilPrepare soilSampleBackup) {
return success(soilPrepareService.applyHandle(ids,soilSampleBackup,getAccount()));
}
@ApiOperation(value = "余样处理审批驳回", notes = "备样处理审批驳回")
@PostMapping("/disposal_fail")
public RestResult<Boolean> disposalFail(@RequestParam("ids")Long [] ids,@RequestParam("reason")String reason) {
return success(soilPrepareService.disposalFail(ids,reason,getAccount()));
}
@ApiOperation(value = "余样处理审批通过", notes = "备样申请处理")
@PostMapping("/disposal_ok")
public RestResult<Boolean> disposalOk(@RequestParam("ids")Long [] ids) {
return success(soilPrepareService.disposalOk(ids,getAccount()));
}
@ApiOperation(value = "余样处理", notes = "备样处理")
@PostMapping("/handle_ok")
public RestResult<Boolean> handleOk(@RequestParam("ids")Long [] ids) {
return success(soilPrepareService.handleOk(ids,getAccount()));
}
}
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilPrepareRecordController.java 0 → 100644
package com.patzn.cloud.service.lims.soil.controller;
import java.util.List;
import com.patzn.cloud.service.soil.entity.SoilPrepareRecord;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.lims.soil.service.ISoilPrepareRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
/**
* <p>
* ${table.comment} 前端控制器
* </p>
*
* @author wwd
* @since 2020-10-19
*/
@Api(tags = "${table.comment}")
@RestController
@RequestMapping("/v1/prepare_record")
public class SoilPrepareRecordController extends ServiceController {
@Autowired
private ISoilPrepareRecordService soilPrepareRecordService;
@ApiOperation(value = "分页列表", notes = "分页查询数据列表")
@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")
public RestResult<Page<SoilPrepareRecord>> getPage(SoilPrepareRecord soilPrepareRecord) {
return success(soilPrepareRecordService.page(getPage(), soilPrepareRecord));
}
@ApiOperation(value = "查询列表", notes = "查询数据列表")
@PostMapping("/list")
public RestResult<List<SoilPrepareRecord>> getList(SoilPrepareRecord soilPrepareRecord) {
return success(soilPrepareRecordService.list(soilPrepareRecord));
}
@ApiOperation(value = "查询 id 信息", notes = "查询指定 id 的数据内容")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<SoilPrepareRecord> get(@PathVariable("id") Long id) {
return success(soilPrepareRecordService.getById(id));
}
@ApiOperation(value = "根据 id 修改信息", notes = "根据指定 id 修改该条数据内容")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, SoilPrepareRecord soilPrepareRecord) {
soilPrepareRecord.setId(id);
return success(soilPrepareRecordService.updateById(soilPrepareRecord));
}
@ApiOperation(value = "添加", notes = "添加一条数据")
@PostMapping("/")
public RestResult<Boolean> add(SoilPrepareRecord soilPrepareRecord) {
return success(soilPrepareRecordService.save(soilPrepareRecord));
}
@ApiOperation(value = "根据 ids 删除", notes = "根据 id 数组删除指定的数据内容")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键数组", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") Long[] ids) {
return success(soilPrepareRecordService.remove(Condition.create().in("id", ids)));
}
}
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilSampleBackupController.java
......@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.soil.controller;
import java.util.List;
import com.google.common.collect.Lists;
import com.patzn.cloud.service.soil.entity.SoilSampleBackup;
import com.patzn.cloud.service.soil.enums.SoilBackupStatusEnum;
import com.patzn.cloud.service.soil.vo.SoilSampleBackupVO;
......@@ -67,7 +68,12 @@ public class SoilSampleBackupController extends ServiceController {
})
@PostMapping("/page_backup")
public RestResult<Page<SoilSampleBackupVO>> getPageBackup(SoilSampleBackupVO soilSampleBackup) {
soilSampleBackup.setStatus(SoilBackupStatusEnum.DRAFT);
soilSampleBackup.setStatusList(Lists.newArrayList(
SoilBackupStatusEnum.DRAFT,
SoilBackupStatusEnum.DISPOSAL_CHECK,
SoilBackupStatusEnum.DISPOSAL_OK,
SoilBackupStatusEnum.DISPOSAL_FAIL
));
return success(soilSampleBackupService.pageVO(getPage(), soilSampleBackup));
}
......@@ -107,6 +113,29 @@ public class SoilSampleBackupController extends ServiceController {
}
@ApiOperation(value = "备样申请处理", notes = "备样申请处理")
@PostMapping("/apply_handle")
public RestResult<Boolean> applyHandle(@RequestParam("ids")Long [] ids, SoilSampleBackup soilSampleBackup) {
return success(soilSampleBackupService.applyHandle(ids,soilSampleBackup,getAccount()));
}
@ApiOperation(value = "备样处理审批中分页列表", notes = "备样分页查询数据列表")
@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_backup_handle_check")
public RestResult<Page<SoilSampleBackupVO>> getPageBackupHandleCheck(SoilSampleBackupVO soilSampleBackup) {
soilSampleBackup.setStatus(SoilBackupStatusEnum.DISPOSAL_CHECK);
return success(soilSampleBackupService.pageVO(getPage(), soilSampleBackup));
}
@ApiOperation(value = "根据 ids 删除", notes = "根据 id 数组删除指定的数据内容")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键数组", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
......@@ -116,4 +145,27 @@ public class SoilSampleBackupController extends ServiceController {
return success(soilSampleBackupService.remove(Condition.create().in("id", ids)));
}
@ApiOperation(value = "备样处理审批驳回", notes = "备样处理审批驳回")
@PostMapping("/disposal_fail")
public RestResult<Boolean> disposalFail(@RequestParam("ids")Long [] ids,@RequestParam("reason")String reason) {
return success(soilSampleBackupService.disposalFail(ids,reason,getAccount()));
}
@ApiOperation(value = "备样处理审批通过", notes = "备样申请处理")
@PostMapping("/disposal_ok")
public RestResult<Boolean> disposalOk(@RequestParam("ids")Long [] ids) {
return success(soilSampleBackupService.disposalOk(ids,getAccount()));
}
@ApiOperation(value = "备样处理", notes = "备样处理")
@PostMapping("/handle_ok")
public RestResult<Boolean> handleOk(@RequestParam("ids")Long [] ids) {
return success(soilSampleBackupService.handleOk(ids,getAccount()));
}
}
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilSampleBackupRecordController.java 0 → 100644
package com.patzn.cloud.service.lims.soil.controller;
import java.util.List;
import com.patzn.cloud.service.soil.entity.SoilSampleBackupRecord;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.lims.soil.service.ISoilSampleBackupRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
/**
* <p>
* 土工试验委托操作日志表 前端控制器
* </p>
*
* @author wwd
* @since 2020-10-19
*/
@Api(tags = "土工试验备样操作日志表")
@RestController
@RequestMapping("/v1/sample_backup_record")
public class SoilSampleBackupRecordController extends ServiceController {
@Autowired
private ISoilSampleBackupRecordService soilSampleBackupRecordService;
@ApiOperation(value = "分页列表", notes = "分页查询数据列表")
@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")
public RestResult<Page<SoilSampleBackupRecord>> getPage(SoilSampleBackupRecord soilSampleBackupRecord) {
return success(soilSampleBackupRecordService.page(getPage(), soilSampleBackupRecord));
}
@ApiOperation(value = "查询列表", notes = "查询数据列表")
@PostMapping("/list")
public RestResult<List<SoilSampleBackupRecord>> getList(SoilSampleBackupRecord soilSampleBackupRecord) {
return success(soilSampleBackupRecordService.list(soilSampleBackupRecord));
}
@ApiOperation(value = "查询 id 信息", notes = "查询指定 id 的数据内容")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<SoilSampleBackupRecord> get(@PathVariable("id") Long id) {
return success(soilSampleBackupRecordService.getById(id));
}
@ApiOperation(value = "根据 id 修改信息", notes = "根据指定 id 修改该条数据内容")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, SoilSampleBackupRecord soilSampleBackupRecord) {
soilSampleBackupRecord.setId(id);
return success(soilSampleBackupRecordService.updateById(soilSampleBackupRecord));
}
@ApiOperation(value = "添加", notes = "添加一条数据")
@PostMapping("/")
public RestResult<Boolean> add(SoilSampleBackupRecord soilSampleBackupRecord) {
return success(soilSampleBackupRecordService.save(soilSampleBackupRecord));
}
@ApiOperation(value = "根据 ids 删除", notes = "根据 id 数组删除指定的数据内容")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键数组", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") Long[] ids) {
return success(soilSampleBackupRecordService.remove(Condition.create().in("id", ids)));
}
}
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilSampleController.java
......@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.soil.controller;
import java.util.List;
import com.google.common.collect.Lists;
import com.patzn.cloud.service.soil.dto.SoilPrepareDTO;
import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum;
......@@ -49,8 +50,8 @@ public class SoilSampleController extends ServiceController {
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
})
@PostMapping("/page")
public RestResult<Page<SoilSample>> getPage(SoilSample soilSample) {
return success(soilSampleService.page(getPage(), soilSample));
public RestResult<Page<SoilSampleVO>> getPage(SoilSampleVO soilSample) {
return success(soilSampleService.pageVO(getPage(), soilSample));
}
......@@ -70,6 +71,26 @@ 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_receive_his")
public RestResult<Page<SoilSampleVO>> getPageReceiveHis(SoilSampleVO soilSample) {
soilSample.setStatusList(Lists.newArrayList(
SoilSampleStatusEnum.SEND,
SoilSampleStatusEnum.SOIL_PREPARE,
SoilSampleStatusEnum.TAKE,
SoilSampleStatusEnum.TEST,
SoilSampleStatusEnum.END
));
return success(soilSampleService.pageVO(getPage(), soilSample));
}
@ApiOperation(value = "待收样室发放样品分页列表", notes = "待收样室发放样品分页列表")
@ApiImplicitParams({
......@@ -85,6 +106,25 @@ 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_send_his")
public RestResult<Page<SoilSampleVO>> getPageSendHis(SoilSampleVO soilSample) {
soilSample.setStatusList(Lists.newArrayList(
SoilSampleStatusEnum.SOIL_PREPARE,
SoilSampleStatusEnum.TAKE,
SoilSampleStatusEnum.TEST,
SoilSampleStatusEnum.END
));
return success(soilSampleService.pageVO(getPage(), soilSample));
}
@ApiOperation(value = "待开土制备样品分页列表", notes = "待开土制备样品分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
......@@ -99,6 +139,24 @@ 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_his")
public RestResult<Page<SoilSampleVO>> getPagePrepareHis(SoilSampleVO soilSample) {
soilSample.setStatusList(Lists.newArrayList(
SoilSampleStatusEnum.TAKE,
SoilSampleStatusEnum.TEST,
SoilSampleStatusEnum.END
));
return success(soilSampleService.pageVO(getPage(), soilSample));
}
@ApiOperation(value = "试验实领样样品分页列表", notes = "试验实领样样品分页列表")
@ApiImplicitParams({
......
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilStatisticsController.java 0 → 100644
package com.patzn.cloud.service.lims.soil.controller;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page;
import com.google.common.collect.Lists;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.lims.soil.service.ISoilEntrustService;
import com.patzn.cloud.service.lims.soil.service.ISoilStandardService;
import com.patzn.cloud.service.soil.entity.SoilStandard;
import com.patzn.cloud.service.soil.enums.SoilEntrustStatusEnum;
import com.patzn.cloud.service.soil.statistics.SoilAnnualEntrustVO;
import com.patzn.cloud.service.soil.statistics.SoilCustomerEntrustVO;
import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* <p>
* 土工试验-试验依据 前端控制器
* </p>
*
* @author wwd
* @since 2020-09-11
*/
@Api(description = "土工试验-统计查询")
@RestController
@RequestMapping("/v1/statistics")
public class SoilStatisticsController extends ServiceController {
@Autowired
private ISoilEntrustService soilEntrustService;
@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_annual_entrust_statistics")
public RestResult<List<SoilAnnualEntrustVO>> getPageAnnualEntrustStatistics(SoilAnnualEntrustVO annualEntrustVO) {
return success(soilEntrustService.pageAnnualEntrustStatistics(annualEntrustVO));
}
@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_customer_entrust_statistics")
public RestResult<List<SoilCustomerEntrustVO>> getPageCustomerEntrustStatistics(SoilCustomerEntrustVO customerEntrustVO) {
return success(soilEntrustService.pageCustomerEntrustStatistics(customerEntrustVO));
}
@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_coordinate_statistics")
public RestResult<Page<SoilEntrustVO>> getPageCoordinateStatistics(SoilEntrustVO soilEntrust) {
return success(soilEntrustService.pageCoordinateVO(getPage(), soilEntrust));
}
@ApiOperation(value = "委托登记历史分页列表", notes = "委托登记历史分页列表")
@PostMapping("/list_coordinate_statistics")
public RestResult<List<SoilEntrustVO>> listCoordinateStatistics(SoilEntrustVO soilEntrust) {
return success(soilEntrustService.listCoordinateVO(soilEntrust));
}
}
src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilEntrustMapper.java
......@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.service.soil.dto.SoilSampleDTO;
import com.patzn.cloud.service.soil.entity.SoilEntrust;
import com.patzn.cloud.service.soil.entity.SoilSample;
import com.patzn.cloud.service.soil.statistics.SoilAnnualEntrustVO;
import com.patzn.cloud.service.soil.statistics.SoilCustomerEntrustVO;
import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
......@@ -25,5 +27,15 @@ public interface SoilEntrustMapper extends BaseMapper<SoilEntrust> {
List<SoilEntrustVO> selectVOListBySample(RowBounds rowBounds, @Param("vo")SoilEntrustVO soilEntrust);
List<SoilEntrustVO> selectVOList(RowBounds rowBounds, @Param("vo")SoilEntrustVO soilEntrust);
List<SoilEntrustVO> selectCoordinateVOList(RowBounds rowBounds, @Param("vo")SoilEntrustVO soilEntrust);
List<SoilEntrustVO> selectCoordinateVOList(@Param("vo")SoilEntrustVO soilEntrust);
List<SoilEntrustVO> selectVOListByExp(RowBounds rowBounds, @Param("vo")SoilEntrustVO soilEntrust);
List<SoilAnnualEntrustVO> selectAnnualEntrustStatistics(@Param("vo")SoilAnnualEntrustVO annualEntrustVO);
List<SoilCustomerEntrustVO> selectCustomerEntrustStatistics(@Param("vo")SoilCustomerEntrustVO customerEntrustVO);
}
src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilPrepareMapper.java
......@@ -20,4 +20,6 @@ import java.util.List;
public interface SoilPrepareMapper extends BaseMapper<SoilPrepare> {
List<SoilPrepareVO> selectTakeVOList(RowBounds rowBounds, @Param("vo") SoilPrepareVO soilSample, @Param("groupIds")List<Long> groupIds);
List<SoilPrepareVO> selectVOList(RowBounds rowBounds, @Param("vo")SoilPrepareVO soilPrepare);
}
src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilPrepareRecordMapper.java 0 → 100644
package com.patzn.cloud.service.lims.soil.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.patzn.cloud.service.soil.entity.SoilPrepareRecord;
/**
* <p>
* Mapper 接口
* </p>
*
* @author wwd
* @since 2020-10-19
*/
public interface SoilPrepareRecordMapper extends BaseMapper<SoilPrepareRecord> {
}
src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilSampleBackupRecordMapper.java 0 → 100644
package com.patzn.cloud.service.lims.soil.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.patzn.cloud.service.soil.entity.SoilSampleBackupRecord;
/**
* <p>
* 土工试验委托操作日志表 Mapper 接口
* </p>
*
* @author wwd
* @since 2020-10-19
*/
public interface SoilSampleBackupRecordMapper extends BaseMapper<SoilSampleBackupRecord> {
}
src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilAptitudeExpService.java
......@@ -21,4 +21,8 @@ public interface ISoilAptitudeExpService extends IBaseService<SoilAptitudeExp> {
List<SoilAptitudeExp> list(SoilAptitudeExp soilAptitudeExp);
boolean saveAptExp(SoilAptitudeExp soilAptitudeExp);
boolean updateAptExpById(SoilAptitudeExp soilAptitudeExp);
}
src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilEntrustService.java
......@@ -7,7 +7,10 @@ import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.IBaseService;
import com.patzn.cloud.service.soil.dto.SoilEntrustDTO;
import com.patzn.cloud.service.soil.entity.SoilEntrust;
import com.patzn.cloud.service.soil.statistics.SoilAnnualEntrustVO;
import com.patzn.cloud.service.soil.statistics.SoilCustomerEntrustVO;
import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
import org.springframework.web.multipart.MultipartFile;
/**
* <p>
......@@ -42,4 +45,17 @@ public interface ISoilEntrustService extends IBaseService<SoilEntrust> {
Page<SoilEntrustVO> pageVOBySample(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust);
Page<SoilEntrustVO> pageVOByExperiment(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust);
List<SoilAnnualEntrustVO> pageAnnualEntrustStatistics(SoilAnnualEntrustVO annualEntrustVO);
List<SoilCustomerEntrustVO> pageCustomerEntrustStatistics(SoilCustomerEntrustVO customerEntrustVO);
Page<SoilEntrustVO> pageVO(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust);
Page<SoilEntrustVO> pageCoordinateVO(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust);
boolean importEntrust(MultipartFile file, Account account);
List<SoilEntrustVO> listCoordinateVO(SoilEntrustVO soilEntrust);
}
src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilPrepareRecordService.java 0 → 100644
package com.patzn.cloud.service.lims.soil.service;
import java.util.List;
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.soil.entity.SoilPrepareRecord;
import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum;
/**
* <p>
* 服务类
* </p>
*
* @author wwd
* @since 2020-10-19
*/
public interface ISoilPrepareRecordService extends IBaseService<SoilPrepareRecord> {
Page<SoilPrepareRecord> page(Page<SoilPrepareRecord> page, SoilPrepareRecord soilPrepareRecord);
List<SoilPrepareRecord> list(SoilPrepareRecord soilPrepareRecord);
boolean record(SoilPrepareStatusEnum from, SoilPrepareStatusEnum to, Long[] ids, int type, Account account, String remark);
}
src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilPrepareService.java
......@@ -3,6 +3,7 @@ package com.patzn.cloud.service.lims.soil.service;
import java.util.List;
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.soil.entity.SoilPrepare;
import com.patzn.cloud.service.soil.vo.SoilPrepareVO;
......@@ -24,4 +25,18 @@ public interface ISoilPrepareService extends IBaseService<SoilPrepare> {
List<SoilPrepare> list(SoilPrepare soilPrepare);
List<SoilPrepareVO> pageVOTake(Page<SoilPrepareVO> page, SoilPrepareVO soilSample, List<Long> groupIds);
boolean applyHandle(Long[] ids, SoilPrepare soilPrepare, Account account);
Page<SoilPrepare> pagePrepare(Page<SoilPrepare> page, SoilPrepare soilPrepare);
boolean disposalOk(Long[] ids, Account account);
boolean disposalFail(Long[] ids,String reason, Account account);
boolean handleOk(Long[] ids, Account account);
Page<SoilPrepareVO> pagePrepareVO(Page<SoilPrepareVO> page, SoilPrepareVO soilPrepare);
}
src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilSampleBackupRecordService.java 0 → 100644
package com.patzn.cloud.service.lims.soil.service;
import java.util.List;
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.soil.entity.SoilSampleBackupRecord;
import com.patzn.cloud.service.soil.enums.SoilBackupStatusEnum;
/**
* <p>
* 土工试验委托操作日志表 服务类
* </p>
*
* @author wwd
* @since 2020-10-19
*/
public interface ISoilSampleBackupRecordService extends IBaseService<SoilSampleBackupRecord> {
Page<SoilSampleBackupRecord> page(Page<SoilSampleBackupRecord> page, SoilSampleBackupRecord soilSampleBackupRecord);
List<SoilSampleBackupRecord> list(SoilSampleBackupRecord soilSampleBackupRecord);
boolean record(SoilBackupStatusEnum from, SoilBackupStatusEnum to, Long[] ids, int type, Account account, String remark);
}
src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilSampleBackupService.java
......@@ -27,4 +27,12 @@ public interface ISoilSampleBackupService extends IBaseService<SoilSampleBackup>
boolean initBackup(Long[] ids, Account account);
Page<SoilSampleBackupVO> pageVO(Page<SoilSampleBackupVO> page, SoilSampleBackupVO soilSampleBackup);
boolean applyHandle(Long[] ids, SoilSampleBackup soilSampleBackup, Account account);
boolean disposalOk(Long[] ids, Account account);
boolean disposalFail(Long[] ids,String reason, Account account);
boolean handleOk(Long[] ids, Account account);
}
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilAptitudeExpServiceImpl.java
package com.patzn.cloud.service.lims.soil.service.impl;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.lims.soil.mapper.SoilAptitudeExpMapper;
import com.patzn.cloud.service.lims.soil.service.ISoilAptitudeExpService;
import com.patzn.cloud.service.soil.entity.SoilAptitudeExp;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
......@@ -36,4 +38,36 @@ public class SoilAptitudeExpServiceImpl extends BaseServiceImpl<SoilAptitudeExpM
public List<SoilAptitudeExp> list(SoilAptitudeExp soilAptitudeExp) {
return this.list(new EntityWrapper<>(soilAptitudeExp));
}
@Override
public boolean saveAptExp(SoilAptitudeExp soilAptitudeExp) {
RestAssert.fail(StringUtils.isBlank(soilAptitudeExp.getShortName()),"英文简写不能为空");
RestAssert.fail(!is_alpha(soilAptitudeExp.getShortName()),"英文简写请填写字母");
return save(soilAptitudeExp);
}
@Override
public boolean updateAptExpById(SoilAptitudeExp soilAptitudeExp) {
RestAssert.fail(StringUtils.isBlank(soilAptitudeExp.getShortName()),"英文简写不能为空");
RestAssert.fail(!is_alpha(soilAptitudeExp.getShortName()),"英文简写请填写字母");
return updateById(soilAptitudeExp);
}
/**
* 判断是否是字母
* @param str 传入字符串
* @return 是字母返回true，否则返回false
*/
public boolean is_alpha(String str) {
if(str==null) return false;
return str.matches("[a-zA-Z]+");
}
}
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilEntrustServiceImpl.java
package com.patzn.cloud.service.lims.soil.service.impl;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.toolkit.IdWorker;
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.toolkit.StringHandleUtils;
import com.patzn.cloud.feign.lims.base.client.LmsCodeRuleClient;
import com.patzn.cloud.service.lims.base.dto.CodeTypeDTO;
import com.patzn.cloud.service.lims.base.enums.CodeTypeEnum;
import com.patzn.cloud.service.lims.common.MyComparator;
import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
import com.patzn.cloud.service.lims.soil.service.*;
import com.patzn.cloud.service.meter.entity.MeterSampleQuote;
......@@ -21,17 +25,26 @@ import com.patzn.cloud.service.lims.soil.mapper.SoilEntrustMapper;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.enums.SoilEntrustStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
import com.patzn.cloud.service.soil.statistics.SoilAnnualEntrustVO;
import com.patzn.cloud.service.soil.statistics.SoilCustomerEntrustVO;
import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
import com.patzn.poibox.xwpf.HSSFWorkbookUtil;
import org.apache.bcel.generic.IF_ACMPEQ;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Autowired;
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 org.springframework.web.multipart.MultipartFile;
/**
* <p>
......@@ -122,6 +135,9 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
soilEntrust.setProgress(SoilEntrustStatusEnum.DRAFT);
List<SoilSampleDTO> sampleDTOList = dto.getSampleList();
if (null == soilEntrust.getEntrustDate()){
soilEntrust.setEntrustDate(new Date());
}
if (saveEntrust(soilEntrust)){
SoilEntrustOperation operation = new SoilEntrustOperation();
operation.setEntrustId(soilEntrust.getId());
......@@ -304,7 +320,7 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
//验证委托是否添加样品
RestAssert.fail(soilSampleService.checkEntrustHaveSample(ids),"委托下含有未添加样品的，请您确认！");
RestAssert.fail(!soilExperimentService.checkSampleHaveExperiment(ids),"试验委托下含有未添加试验项目的试样，请您确认！");
//RestAssert.fail(!soilExperimentService.checkSampleHaveExperiment(ids),"试验委托下含有未添加试验项目的试样，请您确认！");
SoilEntrust entrust = new SoilEntrust();
entrust.setStatus(SoilEntrustStatusEnum.REVIEW);
......@@ -377,10 +393,236 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
}
@Override
public Page<SoilEntrustVO> pageVO(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust) {
return page.setRecords(baseMapper.selectVOList(page,soilEntrust));
}
@Override
public Page<SoilEntrustVO> pageCoordinateVO(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust) {
return page.setRecords(baseMapper.selectCoordinateVOList(page,soilEntrust));
}
@Override
public List<SoilEntrustVO> listCoordinateVO(SoilEntrustVO soilEntrust) {
return baseMapper.selectCoordinateVOList(soilEntrust);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean importEntrust(MultipartFile file, Account account) {
InputStream is= null;
XSSFWorkbook workbook = null;
try {
is= file.getInputStream();
workbook= new XSSFWorkbook(is);
}catch (Exception e){
e.printStackTrace();
}
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());
String gch="";
String client= "";
String zkmc= "";
String zkwz="";
String ss="";
boolean endEn=false;
for (int i = 0; i < num; i++) {
XSSFRow row= sheet.getRow(i);
short lastCellNum= row.getLastCellNum();
XSSFCell cell0= row.getCell(0);
String cellValue0 = HSSFWorkbookUtil.getJavaValue(cell0).toString();
if (!"样品编号".equals(cellValue0.replace("\n",""))){
for (int j = 0; j < lastCellNum; j++) {
XSSFCell cell= row.getCell(j);
String cellValue = HSSFWorkbookUtil.getJavaValue(cell).toString();
if ("工程号".equals(cellValue)){
for (int m = j+1; m < lastCellNum; m++) {
String value= HSSFWorkbookUtil.getJavaValue(row.getCell(m)).toString();
if (StringUtils.isNotBlank(value)){
gch = value;
break;
}
}
}else if ("委托商".equals(cellValue)){
for (int m = j+1; m < lastCellNum; m++) {
String value= HSSFWorkbookUtil.getJavaValue(row.getCell(m)).toString();
if (StringUtils.isNotBlank(value)){
client = value;
break;
}
}
}else if ("钻孔名称".equals(cellValue)){
for (int m = j+1; m < lastCellNum; m++) {
String value= HSSFWorkbookUtil.getJavaValue(row.getCell(m)).toString();
if (StringUtils.isNotBlank(value)){
zkmc = value;
break;
}
}
}else if ("钻孔位置".equals(cellValue)){
for (int m = j+1; m < lastCellNum; m++) {
String value= HSSFWorkbookUtil.getJavaValue(row.getCell(m)).toString();
if (StringUtils.isNotBlank(value)){
zkwz = value;
break;
}
}
}else if ("水 深, m".equals(cellValue)){
for (int m = j+1; m < lastCellNum; m++) {
String value= HSSFWorkbookUtil.getJavaValue(row.getCell(m)).toString();
if (StringUtils.isNotBlank(value)){
ss = value;
if (StringUtils.isNotBlank(ss)){
try {
new BigDecimal(ss);
}catch (Exception e){
RestAssert.fail("水深请填写数字");
}
}
endEn=true;
break;
}
}
}
if (endEn){
break;
}
}
if (endEn){
break;
}
}
}
for (int i = 0; i < num; i++) {
XSSFRow row= sheet.getRow(i);
short lastCellNum= row.getLastCellNum();
XSSFCell cell0= row.getCell(0);
String cellValue0 = HSSFWorkbookUtil.getJavaValue(cell0).toString();
if (StringUtils.isBlank(cellValue0)){
continue;
}
if ("样品编号".equals(cellValue0.replace("\n",""))){
if (itemIndexMap.size()==0){
for (int j = 0; j < lastCellNum; j++) {
XSSFCell cell= row.getCell(j);
String cellValue = HSSFWorkbookUtil.getJavaValue(cell).toString().replace("\n","").replace(" ","").trim();
itemIndexMap.put(j,cellValue);
}
}
}
if (itemIndexMap.size()>0){
if (StringHandleUtils.isNumeric(cellValue0)){
sampleInfoMap.put(cellValue0, Maps.newHashMap());
Map<String,String> mapInfo = sampleInfoMap.get(cellValue0);
for (int j = 0; j < lastCellNum; j++) {
String key= itemIndexMap.get(j);
if (StringUtils.isBlank(key)){
continue;
}
XSSFCell cell= row.getCell(j);
String cellValue = HSSFWorkbookUtil.getJavaValue(cell).toString().trim();
if (StringUtils.isBlank(cellValue)){
continue;
}
mapInfo.put(key,cellValue);
}
sampleInfoMap.put(cellValue0, mapInfo);
}
}
}
System.out.println(sampleInfoMap.toString());
SoilEntrust entrust = new SoilEntrust();
entrust.setClient(client);
entrust.setEntrustDate(new Date());
entrust.setWaterDepth(new BigDecimal(ss));
entrust.setBoreholeLocation(zkwz);
entrust.setBoreholeName(zkmc);
entrust.setProjectNo(gch);
SoilEntrustDTO dto = entrust.convert(SoilEntrustDTO.class);
List<SoilSampleDTO> sampleDTOS = new ArrayList<>();
for (Map.Entry<String,Map<String,String>> e: sampleInfoMap.entrySet()) {
String eKey= e.getKey();
if ("0".equals(eKey)){
continue;
}
Map<String,String> itemMap=e.getValue();
SoilSampleDTO sampleDTO = new SoilSampleDTO();
sampleDTO.setSiteNo("S-"+e.getKey());
sampleDTO.setSampleDepth(itemMap.get("深度（m）"));
sampleDTO.setSamplePack(itemMap.get("样品包装类型"));
sampleDTO.setSampleDescribe(itemMap.get("土质描述"));
List<SoilExperiment> experimentList = new ArrayList<>();
for (Map.Entry<String,String> s: itemMap.entrySet()) {
String key = s.getKey();
String value = s.getValue();
if ("深度（m）".equals(key)){
continue;
}else if ("样品包装类型".equals(key)){
continue;
}else if ("土质描述".equals(key)){
continue;
}else if ("样品编号".equals(key)){
continue;
}else if ("C".equals(value)){
continue;
}else if ("".equals(value)){
continue;
}else if ("Ö".equals(value)){
SoilExperiment experiment = new SoilExperiment();
experiment.setName(key);
experimentList.add(experiment);
}
}
sampleDTO.setExperimentList(experimentList);
sampleDTOS.add(sampleDTO);
}
dto.setSampleList(sampleDTOS);
if (saveEntrustDTO(dto,account)){
return true;
}
return false;
}
@Override
public Page<SoilEntrustVO> pageVOByExperiment(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust) {
return page.setRecords(baseMapper.selectVOListByExp(page,soilEntrust));
}
@Override
public List<SoilAnnualEntrustVO> pageAnnualEntrustStatistics(SoilAnnualEntrustVO annualEntrustVO) {
return baseMapper.selectAnnualEntrustStatistics(annualEntrustVO);
}
@Override
public List<SoilCustomerEntrustVO> pageCustomerEntrustStatistics(SoilCustomerEntrustVO customerEntrustVO) {
return baseMapper.selectCustomerEntrustStatistics(customerEntrustVO);
}
public Map<Long,List<SoilExpItem>> getExpItemMap( Set<Long> aptitudeExpIdList){
Map<Long,List<SoilExpItem>> expItemMap= new HashMap<>();
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java
package com.patzn.cloud.service.lims.soil.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -12,12 +13,15 @@ import com.google.common.collect.Lists;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.service.lims.soil.service.*;
import com.patzn.cloud.service.soil.entity.SoilEntrust;
import com.patzn.cloud.service.soil.entity.SoilExpRelOriginalRecord;
import com.patzn.cloud.service.soil.entity.SoilExperiment;
import com.patzn.cloud.service.lims.soil.mapper.SoilExperimentMapper;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.entity.SoilSample;
import com.patzn.cloud.service.soil.enums.SoilEntrustStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilSampleStatusEnum;
import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -42,6 +46,9 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
private ISoilSampleService soilSampleService;
@Autowired
private ISoilEntrustService soilEntrustService;
@Autowired
private ISoilExperimentOperationService soilExperimentOperationService;
@Autowired
private ISoilExperimentRecordService soilExperimentRecordService;
......@@ -174,9 +181,64 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
soilExperimentOperationService.recordAuditorInfo(ids,account);
soilExperimentRecordService.record(ids,SoilExpStatusEnum.AUDIT,SoilExpStatusEnum.END,0,account,"试验项目审核完成");
}
sampleStatusChange(ids);
return true;
}
public boolean sampleStatusChange(Long[] ids){
List<SoilExperiment> experimentList = super.list(Condition.create().setSqlSelect("id,sample_id").in("id",ids));
List<Long> sampleIds = experimentList.stream().map(e->{
return e.getSampleId();
}).collect(Collectors.toList());
List<SoilExperiment> notOkSample = super.list(Condition.create().setSqlSelect("sample_id").in("sample_id",sampleIds).ne("status",SoilExpStatusEnum.END).groupBy("sample_id"));
List<Long> notOkSampleIds = notOkSample.stream().map(e->{
return e.getSampleId();
}).collect(Collectors.toList());
List<Long> okSampleIds = new ArrayList<>();
for (Long sampleId:sampleIds) {
if (!notOkSampleIds.contains(sampleId)){
okSampleIds.add(sampleId);
}
}
if (CollectionUtils.isNotEmpty(okSampleIds)){
SoilSample sample = new SoilSample();
sample.setProgress(SoilSampleStatusEnum.END);
sample.setStatus(SoilSampleStatusEnum.END);
soilSampleService.update(sample,Condition.create().in("id",okSampleIds));
entrustStatusChange(okSampleIds);
}
return false;
}
public boolean entrustStatusChange(List<Long> sampleIds){
List<SoilSample> sampleList = soilSampleService.list(Condition.create().setSqlSelect("id,entrust_id").in("id",sampleIds));
List<Long> entrustIds = sampleList.stream().map(e->{
return e.getEntrustId();
}).collect(Collectors.toList());
List<SoilSample> notOkEntrust = soilSampleService.list(Condition.create().setSqlSelect("entrust_id").in("entrust_id",entrustIds).ne("status",SoilSampleStatusEnum.END).groupBy("entrust_id"));
List<Long> notOkEntrustIds = notOkEntrust.stream().map(e->{
return e.getEntrustId();
}).collect(Collectors.toList());
List<Long> okEntrustIds = new ArrayList<>();
for (Long entrustId:entrustIds) {
if (!notOkEntrustIds.contains(entrustId)){
okEntrustIds.add(entrustId);
}
}
if (CollectionUtils.isNotEmpty(okEntrustIds)){
SoilEntrust entrust = new SoilEntrust();
entrust.setProgress(SoilEntrustStatusEnum.REPORT);
entrust.setStatus(SoilEntrustStatusEnum.REPORT);
soilEntrustService.update(entrust,Condition.create().in("id",okEntrustIds));
}
return true;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean expCheckBack(Long[] ids, String remark, Account account) {
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilPrepareRecordServiceImpl.java 0 → 100644
package com.patzn.cloud.service.lims.soil.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.service.lims.soil.mapper.SoilPrepareRecordMapper;
import com.patzn.cloud.service.lims.soil.service.ISoilPrepareRecordService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.entity.SoilPrepareRecord;
import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum;
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;
/**
* <p>
* 服务实现类
* </p>
*
* @author wwd
* @since 2020-10-19
*/
@Service
public class SoilPrepareRecordServiceImpl extends BaseServiceImpl<SoilPrepareRecordMapper, SoilPrepareRecord> implements ISoilPrepareRecordService {
@Override
public Page<SoilPrepareRecord> page(Page<SoilPrepareRecord> page, SoilPrepareRecord soilPrepareRecord) {
Wrapper wrapper = new EntityWrapper<>(soilPrepareRecord);
return this.page(page, wrapper);
}
@Override
public List<SoilPrepareRecord> list(SoilPrepareRecord soilPrepareRecord) {
return this.list(new EntityWrapper<>(soilPrepareRecord));
}
@Override
public boolean record(SoilPrepareStatusEnum from, SoilPrepareStatusEnum to, Long[] ids, int type, Account account, String remark) {
if (ArrayUtils.isEmpty(ids)){
return false;
}
List<SoilPrepareRecord> saveRecordList = new ArrayList<>();
for (Long id:ids) {
SoilPrepareRecord record = new SoilPrepareRecord();
record.setSamplePrepareId(id);
record.setOperator(account.getUserName());
record.setOperatorId(account.getUserId());
record.setOrigin(from.getDisplay());
record.setTarget(to.getDisplay());
record.setType(type);
record.setRemark(remark);
saveRecordList.add(record);
}
if (CollectionUtils.isNotEmpty(saveRecordList)){
return saveBatch(saveRecordList);
}
return false;
}
}
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilPrepareServiceImpl.java
package com.patzn.cloud.service.lims.soil.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.toolkit.ArrayUtils;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.service.lims.soil.service.ISoilPrepareRecordService;
import com.patzn.cloud.service.soil.entity.SoilPrepare;
import com.patzn.cloud.service.lims.soil.mapper.SoilPrepareMapper;
import com.patzn.cloud.service.lims.soil.service.ISoilPrepareService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum;
import com.patzn.cloud.service.soil.vo.SoilPrepareVO;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
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;
/**
* <p>
......@@ -24,6 +36,9 @@ import com.baomidou.mybatisplus.plugins.Page;
public class SoilPrepareServiceImpl extends BaseServiceImpl<SoilPrepareMapper, SoilPrepare> implements ISoilPrepareService {
@Autowired
private ISoilPrepareRecordService soilPrepareRecordService;
@Override
public Page<SoilPrepare> page(Page<SoilPrepare> page, SoilPrepare soilPrepare) {
Wrapper wrapper = new EntityWrapper<>(soilPrepare);
......@@ -41,4 +56,99 @@ public class SoilPrepareServiceImpl extends BaseServiceImpl<SoilPrepareMapper, S
public List<SoilPrepareVO> pageVOTake(Page<SoilPrepareVO> page, SoilPrepareVO soilSample, List<Long> groupIds) {
return baseMapper.selectTakeVOList(page,soilSample,groupIds);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean applyHandle(Long[] ids, SoilPrepare soilPrepare, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要申请处理的样品");
RestAssert.fail(StringUtils.isBlank(soilPrepare.getApplyHandler()),"请选择处理人");
RestAssert.fail(null==soilPrepare.getApplyHandlerId(),"请选择处理人");
RestAssert.fail(null==soilPrepare.getApplyHandleTime(),"请选择处理时间");
RestAssert.fail(StringUtils.isBlank(soilPrepare.getHandleWay()),"请选择处理方式");
List<SoilPrepare> updateList = new ArrayList<>();
for (Long id:ids) {
SoilPrepare backupUpdate = soilPrepare.convert(SoilPrepare.class);
backupUpdate.setId(id);
backupUpdate.setStatus(SoilPrepareStatusEnum.DISPOSAL_CHECK);
backupUpdate.setProgress(SoilPrepareStatusEnum.DISPOSAL_CHECK);
updateList.add(backupUpdate);
}
return super.updateBatchById(updateList);
}
@Override
public Page<SoilPrepare> pagePrepare(Page<SoilPrepare> page, SoilPrepare soilPrepare) {
Wrapper wrapper = new EntityWrapper<>(soilPrepare);
List<SoilPrepare> list= baseMapper.selectPage(page,wrapper);
if (CollectionUtils.isEmpty(list)){
return page;
}
for (SoilPrepare prepare:list) {
prepare.setProgress(SoilPrepareStatusEnum.REMAIN);
prepare.setStatus(SoilPrepareStatusEnum.REMAIN);
}
return page.setRecords(list);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean disposalOk(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择审批通过的余样处理任务");
soilPrepareRecordService.record(SoilPrepareStatusEnum.DISPOSAL_CHECK,SoilPrepareStatusEnum.DISPOSAL_OK,ids,0,account,"余样处理任务审批通过");
SoilPrepare backup = new SoilPrepare();
backup.setStatus(SoilPrepareStatusEnum.DISPOSAL_OK);
backup.setProgress(SoilPrepareStatusEnum.DISPOSAL_OK);
backup.setHandler(account.getUserName());
backup.setHandlerId(account.getUserId());
backup.setHandleTime(new Date());
return super.update(backup, Condition.create().in("id",ids));
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean disposalFail(Long[] ids, String reason, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择审批驳回的余样处理任务");
soilPrepareRecordService.record(SoilPrepareStatusEnum.DISPOSAL_CHECK,SoilPrepareStatusEnum.DISPOSAL_FAIL,ids,1,account,"余样处理任务审批驳回，原因："+reason);
SoilPrepare backup = new SoilPrepare();
backup.setStatus(SoilPrepareStatusEnum.DISPOSAL_FAIL);
backup.setProgress(SoilPrepareStatusEnum.DISPOSAL_FAIL);
backup.setHandler(account.getUserName());
backup.setHandlerId(account.getUserId());
backup.setHandleTime(new Date());
return super.update(backup, Condition.create().in("id",ids));
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean handleOk(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要处理的余样样品");
int count = super.count(Condition.create().in("id",ids).eq("status",SoilPrepareStatusEnum.DISPOSAL_OK));
if (count!=ids.length){
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择审批通过的数据");
}
SoilPrepare backup = new SoilPrepare();
backup.setStatus(SoilPrepareStatusEnum.HANDLE_END);
backup.setProgress(SoilPrepareStatusEnum.HANDLE_END);
super.update(backup,Condition.create().in("id",ids));
return soilPrepareRecordService.record(SoilPrepareStatusEnum.DISPOSAL_OK,SoilPrepareStatusEnum.HANDLE_END,ids,0,account,"余样处理完成");
}
@Override
public Page<SoilPrepareVO> pagePrepareVO(Page<SoilPrepareVO> page, SoilPrepareVO soilPrepare) {
List<SoilPrepareVO> list=baseMapper.selectVOList(page,soilPrepare);
if (CollectionUtils.isEmpty(list)){
return page;
}
for (SoilPrepareVO prepare:list) {
if (prepare.getStatus().equals(SoilPrepareStatusEnum.PREPARED)){
prepare.setProgress(SoilPrepareStatusEnum.REMAIN);
prepare.setStatus(SoilPrepareStatusEnum.REMAIN);
}
}
return page.setRecords(list);
}
}
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilSampleBackupRecordServiceImpl.java 0 → 100644
package com.patzn.cloud.service.lims.soil.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.service.lims.soil.mapper.SoilSampleBackupRecordMapper;
import com.patzn.cloud.service.lims.soil.service.ISoilSampleBackupRecordService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.entity.SoilSampleBackupRecord;
import com.patzn.cloud.service.soil.enums.SoilBackupStatusEnum;
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;
/**
* <p>
* 土工试验委托操作日志表 服务实现类
* </p>
*
* @author wwd
* @since 2020-10-19
*/
@Service
public class SoilSampleBackupRecordServiceImpl extends BaseServiceImpl<SoilSampleBackupRecordMapper, SoilSampleBackupRecord> implements ISoilSampleBackupRecordService {
@Override
public Page<SoilSampleBackupRecord> page(Page<SoilSampleBackupRecord> page, SoilSampleBackupRecord soilSampleBackupRecord) {
Wrapper wrapper = new EntityWrapper<>(soilSampleBackupRecord);
return this.page(page, wrapper);
}
@Override
public List<SoilSampleBackupRecord> list(SoilSampleBackupRecord soilSampleBackupRecord) {
return this.list(new EntityWrapper<>(soilSampleBackupRecord));
}
@Override
public boolean record(SoilBackupStatusEnum from, SoilBackupStatusEnum to, Long[] ids, int type, Account account, String remark) {
if (ArrayUtils.isEmpty(ids)){
return false;
}
List<SoilSampleBackupRecord> saveRecordList = new ArrayList<>();
for (Long id:ids) {
SoilSampleBackupRecord record = new SoilSampleBackupRecord();
record.setSampleBackupId(id);
record.setOperator(account.getUserName());
record.setOperatorId(account.getUserId());
record.setOrigin(from.getDisplay());
record.setTarget(to.getDisplay());
record.setType(type);
record.setRemark(remark);
saveRecordList.add(record);
}
if (CollectionUtils.isNotEmpty(saveRecordList)){
return saveBatch(saveRecordList);
}
return false;
}
}
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilSampleBackupServiceImpl.java
package com.patzn.cloud.service.lims.soil.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.toolkit.ArrayUtils;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.service.lims.soil.mapper.SoilSampleBackupMapper;
import com.patzn.cloud.service.lims.soil.service.ISoilSampleBackupRecordService;
import com.patzn.cloud.service.lims.soil.service.ISoilSampleBackupService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.entity.SoilSampleBackup;
import com.patzn.cloud.service.soil.entity.SoilSampleBackupRecord;
import com.patzn.cloud.service.soil.enums.SoilBackupStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilSampleStatusEnum;
import com.patzn.cloud.service.soil.vo.SoilSampleBackupVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
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;
/**
* <p>
......@@ -28,6 +37,8 @@ import com.baomidou.mybatisplus.plugins.Page;
@Service
public class SoilSampleBackupServiceImpl extends BaseServiceImpl<SoilSampleBackupMapper, SoilSampleBackup> implements ISoilSampleBackupService {
@Autowired
private ISoilSampleBackupRecordService soilSampleBackupRecordService;
@Override
public Page<SoilSampleBackup> page(Page<SoilSampleBackup> page, SoilSampleBackup soilSampleBackup) {
......@@ -63,4 +74,69 @@ public class SoilSampleBackupServiceImpl extends BaseServiceImpl<SoilSampleBacku
public Page<SoilSampleBackupVO> pageVO(Page<SoilSampleBackupVO> page, SoilSampleBackupVO soilSampleBackup) {
return page.setRecords(baseMapper.selectVOList(page,soilSampleBackup));
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean applyHandle(Long[] ids, SoilSampleBackup soilSampleBackup, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要申请处理的样品");
RestAssert.fail(StringUtils.isBlank(soilSampleBackup.getApplyHandler()),"请选择处理人");
RestAssert.fail(null==soilSampleBackup.getApplyHandlerId(),"请选择处理人");
RestAssert.fail(null==soilSampleBackup.getApplyHandleTime(),"请选择处理时间");
RestAssert.fail(StringUtils.isBlank(soilSampleBackup.getHandleWay()),"请选择处理方式");
List<SoilSampleBackup> updateList = new ArrayList<>();
for (Long id:ids) {
SoilSampleBackup backupUpdate = soilSampleBackup.convert(SoilSampleBackup.class);
backupUpdate.setId(id);
backupUpdate.setStatus(SoilBackupStatusEnum.DISPOSAL_CHECK);
backupUpdate.setProgress(SoilBackupStatusEnum.DISPOSAL_CHECK);
updateList.add(backupUpdate);
}
return super.updateBatchById(updateList);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean disposalOk(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择审批通过的备样处理任务");
soilSampleBackupRecordService.record(SoilBackupStatusEnum.DISPOSAL_CHECK,SoilBackupStatusEnum.DISPOSAL_OK,ids,0,account,"备样处理任务审批通过");
SoilSampleBackup backup = new SoilSampleBackup();
backup.setStatus(SoilBackupStatusEnum.DISPOSAL_OK);
backup.setProgress(SoilBackupStatusEnum.DISPOSAL_OK);
backup.setHandler(account.getUserName());
backup.setHandlerId(account.getUserId());
backup.setHandleTime(new Date());
return super.update(backup, Condition.create().in("id",ids));
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean disposalFail(Long[] ids,String reason, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择审批驳回的备样处理任务");
soilSampleBackupRecordService.record(SoilBackupStatusEnum.DISPOSAL_CHECK,SoilBackupStatusEnum.DISPOSAL_FAIL,ids,1,account,"备样处理任务审批驳回，原因："+reason);
SoilSampleBackup backup = new SoilSampleBackup();
backup.setStatus(SoilBackupStatusEnum.DISPOSAL_FAIL);
backup.setProgress(SoilBackupStatusEnum.DISPOSAL_FAIL);
backup.setHandler(account.getUserName());
backup.setHandlerId(account.getUserId());
backup.setHandleTime(new Date());
return super.update(backup, Condition.create().in("id",ids));
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean handleOk(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要处理的备样样品");
int count = super.count(Condition.create().in("id",ids).eq("status",SoilBackupStatusEnum.DISPOSAL_OK));
if (count!=ids.length){
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择审批通过的数据");
}
SoilSampleBackup backup = new SoilSampleBackup();
backup.setStatus(SoilBackupStatusEnum.HANDLE_END);
backup.setProgress(SoilBackupStatusEnum.HANDLE_END);
super.update(backup,Condition.create().in("id",ids));
return soilSampleBackupRecordService.record(SoilBackupStatusEnum.DISPOSAL_OK,SoilBackupStatusEnum.HANDLE_END,ids,0,account,"备样处理完成");
}
}
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilSampleServiceImpl.java
......@@ -66,7 +66,15 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
@Override
public Page<SoilSample> page(Page<SoilSample> page, SoilSample soilSample) {
Wrapper wrapper = new EntityWrapper<>(soilSample);
wrapper.orderBy("sample_code",true);
if (StringUtils.isNotBlank(soilSample.getSampleCode())){
wrapper.like("sample_code",soilSample.getSampleCode());
soilSample.setSampleCode(null);
}
if (StringUtils.isNotBlank(soilSample.getSiteNo())){
wrapper.like("site_no",soilSample.getSiteNo());
soilSample.setSiteNo(null);
}
return this.page(page, wrapper);
}
......@@ -152,7 +160,7 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
Set<String> nameSet = nameMap.get(soilSampleVO.getId());
Set<String> shortNameSet = shortNameMap.get(soilSampleVO.getId());
if (null != nameSet){
soilSampleVO.setExperimentNames(StringHandleUtils.join(nameSet," "));
soilSampleVO.setExperimentNames(StringHandleUtils.join(nameSet,"、"));
}
......
src/main/resources/mapper/soil/SoilEntrustMapper.xml
......@@ -15,6 +15,8 @@
e.water_depth,
e.entrust_code,
e.entrust_date,
e.latitude,
e.longitude,
e.test_type,
e.report_code,
e.tabulate_date,
......@@ -32,6 +34,13 @@
AND e.status != #{vo.noStatus}
</if>
<if test="null!=vo.statusList">
AND e.status IN
<foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
#{status}
</foreach>
</if>
<if test="null!=vo.client">
AND e.client LIKE CONCAT('%',#{vo.client},'%')
</if>
......@@ -69,6 +78,22 @@
<include refid="sqlWhere"/>
</select>
<select id="selectVOList" resultType="com.patzn.cloud.service.soil.vo.SoilEntrustVO">
SELECT <include refid="column"/> FROM soil_entrust e
JOIN soil_entrust_operation o ON e.id = o.entrust_id
WHERE e.deleted = 0
<include refid="sqlWhere"/>
</select>
<select id="selectCoordinateVOList" resultType="com.patzn.cloud.service.soil.vo.SoilEntrustVO">
SELECT <include refid="column"/> FROM soil_entrust e
JOIN soil_entrust_operation o ON e.id = o.entrust_id
WHERE e.deleted = 0
<include refid="sqlWhere"/>
AND latitude IS NOT NULL
AND longitude IS NOT NULL
</select>
......@@ -110,4 +135,32 @@
WHERE e.deleted = 0
</select>
<select id="selectAnnualEntrustStatistics" resultType="com.patzn.cloud.service.soil.statistics.SoilAnnualEntrustVO">
SELECT TO_CHAR(e.entrust_date, 'yyyy-MM') AS "entrust_date",count(1) AS "quantity" FROM soil_entrust e
JOIN soil_entrust_operation o ON e.id =o.entrust_id
WHERE e.deleted = 0
<if test="null!=vo.entrustDate">
AND TO_CHAR(e.entrust_date, 'yyyy') = #{vo.entrustDate}
</if>
AND e.entrust_date IS NOT NULL
GROUP BY entrust_date ORDER BY entrust_date
</select>
<select id="selectCustomerEntrustStatistics" resultType="com.patzn.cloud.service.soil.statistics.SoilCustomerEntrustVO">
SELECT e.client,count(1) AS "quantity" FROM soil_entrust e
JOIN soil_entrust_operation o ON e.id =o.entrust_id
WHERE e.deleted = 0
<if test="null!=vo.edateBegin">
AND e.entrust_date >= #{vo.edateBegin}
</if>
<if test="null!=vo.edateEnd">
AND e.entrust_date <![CDATA[<=]]> #{vo.edateEnd}
</if>
AND e.client IS NOT NULL
GROUP BY e.client ORDER BY e.client
</select>
</mapper>
src/main/resources/mapper/soil/SoilPrepareMapper.xml
......@@ -38,4 +38,45 @@
</select>
<select id="selectVOList" resultType="com.patzn.cloud.service.soil.vo.SoilPrepareVO">
SELECT
p.id,
p.group_name,
p.group_id,
p.quantity,
p.unit,
p.status,
p.progress,
s.sample_code,
s.sample_pack,
s.sample_describe,
s.describe_detail
FROM
soil_prepare p
JOIN soil_sample s ON p.sample_id = s.id
WHERE
p.deleted = 0
AND s.deleted = 0
<if test="vo.type!=null">
AND p.type = #{vo.type}
</if>
<if test="vo.status!=null">
AND p.status = #{vo.status}
</if>
<if test="vo.statusList!=null">
AND p.status IN
<foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
#{status}
</foreach>
</if>
<if test="vo.sampleCode!=null">
AND s.sample_code LIKE CONCAT('%',#{vo.sampleCode},'%')
</if>
</select>
</mapper>
src/main/resources/mapper/soil/SoilPrepareRecordMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.soil.mapper.SoilPrepareRecordMapper">
</mapper>
src/main/resources/mapper/soil/SoilSampleBackupMapper.xml
......@@ -46,6 +46,15 @@
<if test="null!=vo.status">
AND b.status = #{vo.status}
</if>
<if test="null!=vo.statusList">
AND b.status IN
<foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
#{status}
</foreach>
</if>
<if test="null!=vo.client">
AND e.client LIKE CONCAT('%',#{vo.client},'%')
</if>
......@@ -69,5 +78,6 @@
JOIN soil_entrust e ON s.entrust_id = e.id
WHERE b.deleted = 0 AND s.deleted = 0 AND e.deleted = 0
<include refid="sWhere"/>
ORDER BY e.entrust_code ,s.sample_code
</select>
</mapper>
src/main/resources/mapper/soil/SoilSampleBackupRecordMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.soil.mapper.SoilSampleBackupRecordMapper">
</mapper>
src/main/resources/mapper/soil/SoilSampleMapper.xml
......@@ -43,6 +43,14 @@
<if test="null!=vo.status">
AND s.status = #{vo.status}
</if>
<if test="null!=vo.statusList">
AND s.status IN
<foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
#{status}
</foreach>
</if>
<if test="null!=vo.siteNo">
AND s.site_no LIKE CONCAT('%',#{vo.siteNo},'%')
</if>
......@@ -58,6 +66,7 @@
JOIN soil_entrust e ON s.entrust_id = e.id
WHERE s.deleted = 0 AND e.deleted = 0
<include refid="sWhere"/>
ORDER BY s.sample_code
</select>
......
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