Skip to content

P
patzn-cloud-service-soil
Commit 1a6d38d6 by lijingjing
Options

修改同事错误提交的记录； 

修复中海油服相关bug;
parent 90dc3ccc
Showing with 264 additions and 298 deletions
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilEntrustController.java
package com.patzn.cloud.service.lims.soil.controller; package com.patzn.cloud.service.lims.soil.controller;
import java.util.List;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page;
import com.google.common.collect.Lists; 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.ISoilEntrustService;
import com.patzn.cloud.service.lims.summary.SoilEntrustSummaryDTO; import com.patzn.cloud.service.lims.summary.SoilEntrustSummaryDTO;
import com.patzn.cloud.service.soil.dto.SoilEntrustDTO; import com.patzn.cloud.service.soil.dto.SoilEntrustDTO;
import com.patzn.cloud.service.soil.entity.SoilEntrust; import com.patzn.cloud.service.soil.entity.SoilEntrust;
import com.patzn.cloud.service.soil.enums.*; import com.patzn.cloud.service.soil.enums.*;
import com.patzn.cloud.service.soil.vo.SoilEntrustVO; import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
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 io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/** /**
* <p> * <p>
* 土工试验委托表 前端控制器 * 土工试验委托表 前端控制器
...@@ -30,7 +33,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -30,7 +33,7 @@ import org.springframework.web.multipart.MultipartFile;
@Api(tags = "土工试验委托表") @Api(tags = "土工试验委托表")
@RestController @RestController
@RequestMapping("/v1/entrust") @RequestMapping("/v1/entrust")
public class SoilEntrustController extends ServiceController { public class SoilEntrustController extends ServiceController {
@Autowired @Autowired
private ISoilEntrustService soilEntrustService; private ISoilEntrustService soilEntrustService;
...@@ -44,11 +47,10 @@ public class SoilEntrustController extends ServiceController { ...@@ -44,11 +47,10 @@ public class SoilEntrustController extends ServiceController {
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"), @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
}) })
@PostMapping("/page") @PostMapping("/page")
public RestResult<Page<SoilEntrustVO>> getPage(SoilEntrustVO soilEntrust) { public RestResult<Page<SoilEntrustVO>> getPage(SoilEntrustVO soilEntrust) {
soilEntrust.setStatus(SoilEntrustStatusEnum.DRAFT); soilEntrust.setStatus(SoilEntrustStatusEnum.DRAFT);
return success(soilEntrustService.pageVO(getPage(), soilEntrust)); return success(soilEntrustService.pageVO(getPage(), soilEntrust));
} }
@ApiOperation(value = "委托登记历史分页列表", notes = "委托登记历史分页列表") @ApiOperation(value = "委托登记历史分页列表", notes = "委托登记历史分页列表")
...@@ -87,7 +89,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -87,7 +89,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "报告编制分页列表", notes = "分页查询数据列表") @ApiOperation(value = "报告编制分页列表", notes = "分页查询数据列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -111,17 +112,20 @@ public class SoilEntrustController extends ServiceController { ...@@ -111,17 +112,20 @@ public class SoilEntrustController extends ServiceController {
}) })
@PostMapping("/page_report_make_his") @PostMapping("/page_report_make_his")
public RestResult<Page<SoilEntrustVO>> getPageReportMakeHis(SoilEntrustVO soilEntrust) { public RestResult<Page<SoilEntrustVO>> getPageReportMakeHis(SoilEntrustVO soilEntrust) {
soilEntrust.setStatusList(Lists.newArrayList( // soilEntrust.setStatusList(Lists.newArrayList(
SoilEntrustStatusEnum.REPORT_CHECK, // SoilEntrustStatusEnum.REPORT_CHECK,
SoilEntrustStatusEnum.REPORT_ISSUE, // SoilEntrustStatusEnum.REPORT_ISSUE,
SoilEntrustStatusEnum.END // SoilEntrustStatusEnum.END
// ));
soilEntrust.setReportStatusList(Lists.newArrayList(
SoilReportStatusEnum.ISSUE,
SoilReportStatusEnum.CHECK,
SoilReportStatusEnum.END
)); ));
return success(soilEntrustService.pageReportMake(getPage(), soilEntrust)); return success(soilEntrustService.pageReportMake(getPage(), soilEntrust));
} }
@ApiOperation(value = "报告审核分页列表", notes = "报告审核分页查询数据列表") @ApiOperation(value = "报告审核分页列表", notes = "报告审核分页查询数据列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -136,7 +140,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -136,7 +140,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "报告审核分页列表", notes = "分页查询数据列表") @ApiOperation(value = "报告审核分页列表", notes = "分页查询数据列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -151,8 +154,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -151,8 +154,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "报告签发分页列表", notes = "报告签发分页列表") @ApiOperation(value = "报告签发分页列表", notes = "报告签发分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -189,9 +190,13 @@ public class SoilEntrustController extends ServiceController { ...@@ -189,9 +190,13 @@ public class SoilEntrustController extends ServiceController {
}) })
@PostMapping("/page_report_check_his") @PostMapping("/page_report_check_his")
public RestResult<Page<SoilEntrustVO>> getPageReportCheckHis(SoilEntrustVO soilEntrust) { public RestResult<Page<SoilEntrustVO>> getPageReportCheckHis(SoilEntrustVO soilEntrust) {
soilEntrust.setStatusList(Lists.newArrayList( // soilEntrust.setStatusList(Lists.newArrayList(
SoilEntrustStatusEnum.REPORT_ISSUE, // SoilEntrustStatusEnum.REPORT_ISSUE,
SoilEntrustStatusEnum.END // SoilEntrustStatusEnum.END
// ));
soilEntrust.setReportStatusList(Lists.newArrayList(
SoilReportStatusEnum.ISSUE,
SoilReportStatusEnum.END
)); ));
return success(soilEntrustService.pageReportMake(getPage(), soilEntrust)); return success(soilEntrustService.pageReportMake(getPage(), soilEntrust));
} }
...@@ -220,7 +225,8 @@ public class SoilEntrustController extends ServiceController { ...@@ -220,7 +225,8 @@ public class SoilEntrustController extends ServiceController {
}) })
@PostMapping("/page_report_issue_his") @PostMapping("/page_report_issue_his")
public RestResult<Page<SoilEntrustVO>> getPageReportIssueHis(SoilEntrustVO soilEntrust) { public RestResult<Page<SoilEntrustVO>> getPageReportIssueHis(SoilEntrustVO soilEntrust) {
soilEntrust.setStatus(SoilEntrustStatusEnum.END); // soilEntrust.setStatus(SoilEntrustStatusEnum.END);
soilEntrust.setReportStatusEnum(SoilReportStatusEnum.END);
return success(soilEntrustService.pageReportMake(getPage(), soilEntrust)); return success(soilEntrustService.pageReportMake(getPage(), soilEntrust));
} }
...@@ -242,7 +248,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -242,7 +248,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "样品接收委托分页列表", notes = "分页查询数据列表") @ApiOperation(value = "样品接收委托分页列表", notes = "分页查询数据列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -256,8 +261,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -256,8 +261,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "样品接收发放委托历史分页列表", notes = "样品接收发放委托历史分页列表") @ApiOperation(value = "样品接收发放委托历史分页列表", notes = "样品接收发放委托历史分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -279,7 +282,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -279,7 +282,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "开土制备样品委托分页列表", notes = "开土制备样品委托分页列表") @ApiOperation(value = "开土制备样品委托分页列表", notes = "开土制备样品委托分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -296,7 +298,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -296,7 +298,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "样品独立留存样品委托分页列表", notes = "开土制备样品委托分页列表") @ApiOperation(value = "样品独立留存样品委托分页列表", notes = "开土制备样品委托分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -313,11 +314,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -313,11 +314,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "开土制备样品委托历史分页列表", notes = "开土制备样品委托历史分页列表") @ApiOperation(value = "开土制备样品委托历史分页列表", notes = "开土制备样品委托历史分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -337,19 +333,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -337,19 +333,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "开土制备审核样品委托分页列表", notes = "开土制备样品委托分页列表") @ApiOperation(value = "开土制备审核样品委托分页列表", notes = "开土制备样品委托分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -366,11 +349,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -366,11 +349,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "开土制备样品委托历史分页列表", notes = "开土制备样品委托历史分页列表") @ApiOperation(value = "开土制备样品委托历史分页列表", notes = "开土制备样品委托历史分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -389,16 +367,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -389,16 +367,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "试验任务分配委托分页列表", notes = "试验任务分配委托分页列表") @ApiOperation(value = "试验任务分配委托分页列表", notes = "试验任务分配委托分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -432,8 +400,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -432,8 +400,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "试验项目检测委托分页列表", notes = "试验任务分配委托分页列表") @ApiOperation(value = "试验项目检测委托分页列表", notes = "试验任务分配委托分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -449,7 +415,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -449,7 +415,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "试验项目检测委托分页列表", notes = "试验任务分配委托分页列表") @ApiOperation(value = "试验项目检测委托分页列表", notes = "试验任务分配委托分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -469,8 +434,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -469,8 +434,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "试验项目复核委托分页列表", notes = "试验项目复核委托分页列表") @ApiOperation(value = "试验项目复核委托分页列表", notes = "试验项目复核委托分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -485,7 +448,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -485,7 +448,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "试验项目复核历史委托分页列表", notes = "试验项目复核历史委托分页列表") @ApiOperation(value = "试验项目复核历史委托分页列表", notes = "试验项目复核历史委托分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -503,8 +465,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -503,8 +465,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "试验项目审核委托分页列表", notes = "试验项目审核委托分页列表") @ApiOperation(value = "试验项目审核委托分页列表", notes = "试验项目审核委托分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -533,7 +493,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -533,7 +493,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "分页列表", notes = "分页查询数据列表") @ApiOperation(value = "分页列表", notes = "分页查询数据列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -569,31 +528,30 @@ public class SoilEntrustController extends ServiceController { ...@@ -569,31 +528,30 @@ public class SoilEntrustController extends ServiceController {
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataType = "long"), @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataType = "long"),
}) })
@PutMapping("/{id}") @PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, SoilEntrust soilEntrust) { public RestResult<Boolean> edit(@PathVariable("id") Long id, SoilEntrust soilEntrust) {
soilEntrust.setId(id); soilEntrust.setId(id);
return success(soilEntrustService.updateById(soilEntrust)); return success(soilEntrustService.updateById(soilEntrust));
} }
@ApiOperation(value = "添加", notes = "添加一条数据") @ApiOperation(value = "添加", notes = "添加一条数据")
@PostMapping("/") @PostMapping("/")
public RestResult<Boolean> add(SoilEntrust soilEntrust) { public RestResult<Boolean> add(SoilEntrust soilEntrust) {
return success(soilEntrustService.saveEntrust(soilEntrust)); return success(soilEntrustService.saveEntrust(soilEntrust));
} }
@ApiOperation(value = "添加委托单", notes = "添加委托单") @ApiOperation(value = "添加委托单", notes = "添加委托单")
@PostMapping("/add_entrust") @PostMapping("/add_entrust")
public RestResult<Boolean> addEntrust(@RequestBody SoilEntrustDTO dto) { public RestResult<Boolean> addEntrust(@RequestBody SoilEntrustDTO dto) {
return success(soilEntrustService.saveEntrustDTO(dto,getAccount())); return success(soilEntrustService.saveEntrustDTO(dto, getAccount()));
} }
@ApiOperation(value = "编辑委托单", notes = "编辑报价单") @ApiOperation(value = "编辑委托单", notes = "编辑报价单")
@PostMapping("/edit_entrust") @PostMapping("/edit_entrust")
public RestResult<Boolean> editEntrust(@RequestBody SoilEntrustDTO entrustDTO) { public RestResult<Boolean> editEntrust(@RequestBody SoilEntrustDTO entrustDTO) {
return success(soilEntrustService.editEntrust(entrustDTO,getAccount())); return success(soilEntrustService.editEntrust(entrustDTO, getAccount()));
} }
...@@ -607,103 +565,92 @@ public class SoilEntrustController extends ServiceController { ...@@ -607,103 +565,92 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "根据 ids 删除", notes = "根据 id 数组删除指定的数据内容") @ApiOperation(value = "根据 ids 删除", notes = "根据 id 数组删除指定的数据内容")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键数组", required = true, paramType = "query", dataType = "array"), @ApiImplicitParam(name = "ids", value = "主键数组", required = true, paramType = "query", dataType = "array"),
}) })
@DeleteMapping("/") @DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") Long[] ids) { public RestResult<Boolean> delete(@RequestParam("ids") Long[] ids) {
return success(soilEntrustService.remove(Condition.create().in("id", ids))); return success(soilEntrustService.remove(Condition.create().in("id", ids)));
} }
@ApiOperation(value = "委托单提交评审", notes = "委托单提交评审") @ApiOperation(value = "委托单提交评审", notes = "委托单提交评审")
@PostMapping("/submit_to_review") @PostMapping("/submit_to_review")
public RestResult<Boolean> submitToReview(@RequestParam("ids")Long [] ids) { public RestResult<Boolean> submitToReview(@RequestParam("ids") Long[] ids) {
return success(soilEntrustService.submitToReview(ids,getAccount())); return success(soilEntrustService.submitToReview(ids, getAccount()));
} }
@ApiOperation(value = "试验委托单评审通过", notes = "委托单提交评审") @ApiOperation(value = "试验委托单评审通过", notes = "委托单提交评审")
@PostMapping("/review_pass") @PostMapping("/review_pass")
public RestResult<Boolean> reviewPass(@RequestParam("ids")Long [] ids) { public RestResult<Boolean> reviewPass(@RequestParam("ids") Long[] ids) {
return success(soilEntrustService.reviewPass(ids,getAccount())); return success(soilEntrustService.reviewPass(ids, getAccount()));
} }
@ApiOperation(value = "委托单评审驳回", notes = "委托单评审驳回") @ApiOperation(value = "委托单评审驳回", notes = "委托单评审驳回")
@PostMapping("/review_back") @PostMapping("/review_back")
public RestResult<Boolean> reviewBack(@RequestParam("ids")Long [] ids,@RequestParam("reason") String reason) { public RestResult<Boolean> reviewBack(@RequestParam("ids") Long[] ids, @RequestParam("reason") String reason) {
return success(soilEntrustService.reviewBack(ids,reason,getAccount())); return success(soilEntrustService.reviewBack(ids, reason, getAccount()));
} }
@ApiOperation(value = "导入试验委托单 EXCEL", notes = "导入导入试验委托单 EXCEL 的数据内容") @ApiOperation(value = "导入试验委托单 EXCEL", notes = "导入导入试验委托单 EXCEL 的数据内容")
@PostMapping("/import_entrust/") @PostMapping("/import_entrust/")
public RestResult<Boolean> importEntrust(MultipartFile file) { public RestResult<Boolean> importEntrust(MultipartFile file) {
return success(soilEntrustService.importEntrust(file,getAccount())); return success(soilEntrustService.importEntrust(file, getAccount()));
} }
@ApiOperation(value = "报告编制提交", notes = "报告编制提交") @ApiOperation(value = "报告编制提交", notes = "报告编制提交")
@PostMapping("/report_make_submit") @PostMapping("/report_make_submit")
public RestResult<Boolean> reportMakeSubmit(@RequestParam("ids")Long [] ids) { public RestResult<Boolean> reportMakeSubmit(@RequestParam("ids") Long[] ids) {
return success(soilEntrustService.reportMakeSubmit(ids,getAccount())); return success(soilEntrustService.reportMakeSubmit(ids, getAccount()));
} }
@ApiOperation(value = "报告审核提交", notes = "报告审核提交") @ApiOperation(value = "报告审核提交", notes = "报告审核提交")
@PostMapping("/report_check_submit") @PostMapping("/report_check_submit")
public RestResult<Boolean> reportCheckSubmit(@RequestParam("ids")Long [] ids) { public RestResult<Boolean> reportCheckSubmit(@RequestParam("ids") Long[] ids) {
return success(soilEntrustService.reportCheckSubmit(ids,getAccount())); return success(soilEntrustService.reportCheckSubmit(ids, getAccount()));
} }
@ApiOperation(value = "报告签发提交", notes = "报告签发提交") @ApiOperation(value = "报告签发提交", notes = "报告签发提交")
@PostMapping("/report_issue_submit") @PostMapping("/report_issue_submit")
public RestResult<Boolean> reportIssueSubmit(@RequestParam("ids")Long [] ids) { public RestResult<Boolean> reportIssueSubmit(@RequestParam("ids") Long[] ids) {
return success(soilEntrustService.reportIssueSubmit(ids,getAccount())); return success(soilEntrustService.reportIssueSubmit(ids, getAccount()));
} }
@ApiOperation(value = "报告审核退回", notes = "报告审核退回") @ApiOperation(value = "报告审核退回", notes = "报告审核退回")
@PostMapping("/report_check_back") @PostMapping("/report_check_back")
public RestResult<Boolean> reportCheckBack(@RequestParam("ids")Long [] ids,@RequestParam("reason") String reason) { public RestResult<Boolean> reportCheckBack(@RequestParam("ids") Long[] ids, @RequestParam("reason") String reason) {
return success(soilEntrustService.reportCheckBack(ids,reason,getAccount())); return success(soilEntrustService.reportCheckBack(ids, reason, getAccount()));
} }
@ApiOperation(value = "报告签发退回", notes = "报告签发退回") @ApiOperation(value = "报告签发退回", notes = "报告签发退回")
@PostMapping("/report_issue_back") @PostMapping("/report_issue_back")
public RestResult<Boolean> reportIssueBack(@RequestParam("ids")Long [] ids,@RequestParam("reason") String reason) { public RestResult<Boolean> reportIssueBack(@RequestParam("ids") Long[] ids, @RequestParam("reason") String reason) {
return success(soilEntrustService.reportIssueBack(ids,reason,getAccount())); return success(soilEntrustService.reportIssueBack(ids, reason, getAccount()));
} }
@ApiOperation(value = "编辑导入试验委托单 EXCEL", notes = "导入导入试验委托单 EXCEL 的数据内容") @ApiOperation(value = "编辑导入试验委托单 EXCEL", notes = "导入导入试验委托单 EXCEL 的数据内容")
@PostMapping("/edit_import_entrust/") @PostMapping("/edit_import_entrust/")
public RestResult<Boolean> editImportEntrust(@RequestParam("id")Long id, MultipartFile file) { public RestResult<Boolean> editImportEntrust(@RequestParam("id") Long id, MultipartFile file) {
return success(soilEntrustService.editImportEntrust(id,file,getAccount())); return success(soilEntrustService.editImportEntrust(id, file, getAccount()));
} }
@ApiOperation(value = "导出开土制备记录", notes = "导出开土制备记录") @ApiOperation(value = "导出开土制备记录", notes = "导出开土制备记录")
@GetMapping("/export_soil_prepare_record") @GetMapping("/export_soil_prepare_record")
public void exportSoilPrepareRecord(@RequestParam("ids")Long [] ids) { public void exportSoilPrepareRecord(@RequestParam("ids") Long[] ids) {
soilEntrustService.exportSoilPrepareRecord(ids,response,getAccount()); soilEntrustService.exportSoilPrepareRecord(ids, response, getAccount());
} }
@ApiOperation(value = "收样位置委托分页列表", notes = "收样位置委托分页列表") @ApiOperation(value = "收样位置委托分页列表", notes = "收样位置委托分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -717,8 +664,6 @@ public class SoilEntrustController extends ServiceController { ...@@ -717,8 +664,6 @@ public class SoilEntrustController extends ServiceController {
} }
@ApiOperation(value = "试验项目报告编制分页列表", notes = "试验项目报告编制分页列表") @ApiOperation(value = "试验项目报告编制分页列表", notes = "试验项目报告编制分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
...@@ -728,7 +673,7 @@ public class SoilEntrustController extends ServiceController { ...@@ -728,7 +673,7 @@ public class SoilEntrustController extends ServiceController {
}) })
@PostMapping("/page_exp_report_make") @PostMapping("/page_exp_report_make")
public RestResult<Page<SoilEntrustVO>> getPageExpReportMake(SoilEntrustVO soilEntrust) { public RestResult<Page<SoilEntrustVO>> getPageExpReportMake(SoilEntrustVO soilEntrust) {
return success(soilEntrustService.pageExpReport(getPage(), soilEntrust, (Integer) SoilExpReportStatusEnum.MAKE.getValue(),getAccount())); return success(soilEntrustService.pageExpReport(getPage(), soilEntrust, (Integer) SoilExpReportStatusEnum.MAKE.getValue(), getAccount()));
} }
...@@ -741,7 +686,7 @@ public class SoilEntrustController extends ServiceController { ...@@ -741,7 +686,7 @@ public class SoilEntrustController extends ServiceController {
}) })
@PostMapping("/page_exp_report_check") @PostMapping("/page_exp_report_check")
public RestResult<Page<SoilEntrustVO>> getPageExpReportCheck(SoilEntrustVO soilEntrust) { public RestResult<Page<SoilEntrustVO>> getPageExpReportCheck(SoilEntrustVO soilEntrust) {
return success(soilEntrustService.pageExpReport(getPage(), soilEntrust,(Integer) SoilExpReportStatusEnum.CHECK.getValue(),getAccount())); return success(soilEntrustService.pageExpReport(getPage(), soilEntrust, (Integer) SoilExpReportStatusEnum.CHECK.getValue(), getAccount()));
} }
...@@ -754,7 +699,7 @@ public class SoilEntrustController extends ServiceController { ...@@ -754,7 +699,7 @@ public class SoilEntrustController extends ServiceController {
}) })
@PostMapping("/page_exp_report_issue") @PostMapping("/page_exp_report_issue")
public RestResult<Page<SoilEntrustVO>> getPageExpReportIssue(SoilEntrustVO soilEntrust) { public RestResult<Page<SoilEntrustVO>> getPageExpReportIssue(SoilEntrustVO soilEntrust) {
return success(soilEntrustService.pageExpReport(getPage(), soilEntrust,(Integer) SoilExpReportStatusEnum.ISSUE.getValue(),getAccount())); return success(soilEntrustService.pageExpReport(getPage(), soilEntrust, (Integer) SoilExpReportStatusEnum.ISSUE.getValue(), getAccount()));
} }
...@@ -767,19 +712,15 @@ public class SoilEntrustController extends ServiceController { ...@@ -767,19 +712,15 @@ public class SoilEntrustController extends ServiceController {
}) })
@PostMapping("/page_exp_report_end") @PostMapping("/page_exp_report_end")
public RestResult<Page<SoilEntrustVO>> getPageExpReportEnd(SoilEntrustVO soilEntrust) { public RestResult<Page<SoilEntrustVO>> getPageExpReportEnd(SoilEntrustVO soilEntrust) {
return success(soilEntrustService.pageExpReport(getPage(), soilEntrust,(Integer) SoilExpReportStatusEnum.END.getValue(),getAccount())); return success(soilEntrustService.pageExpReport(getPage(), soilEntrust, (Integer) SoilExpReportStatusEnum.END.getValue(), getAccount()));
} }
@ApiOperation(value = "查询列表", notes = "查询数据列表") @ApiOperation(value = "查询列表", notes = "查询数据列表")
@PostMapping("/list_summary_query") @PostMapping("/list_summary_query")
public RestResult<Page<SoilEntrustSummaryDTO>> listSummaryQuery(SoilEntrustVO soilEntrust) { public RestResult<Page<SoilEntrustSummaryDTO>> listSummaryQuery(SoilEntrustVO soilEntrust) {
return success(soilEntrustService.listSummaryQuery(getPage(),soilEntrust)); return success(soilEntrustService.listSummaryQuery(getPage(), soilEntrust));
} }
} }
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilReportController.java
...@@ -46,11 +46,10 @@ public class SoilReportController extends ServiceController { ...@@ -46,11 +46,10 @@ public class SoilReportController extends ServiceController {
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class), @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
}) })
@PostMapping("/page") @PostMapping("/page")
public RestResult<Page<SoilReport>> getPage(SoilReport soilReport) { public RestResult<Page<SoilReport>> getPage(SoilReport soilReport) {
soilReport.setStatus(SoilReportStatusEnum.DRAFT); soilReport.setStatus(SoilReportStatusEnum.DRAFT);
return success(soilReportService.page(getPage(), soilReport)); return success(soilReportService.page(getPage(), soilReport));
} }
@ApiOperation(value = "汇总报告待审核分页列表", notes = "分页查询数据列表") @ApiOperation(value = "汇总报告待审核分页列表", notes = "分页查询数据列表")
...@@ -67,7 +66,6 @@ public class SoilReportController extends ServiceController { ...@@ -67,7 +66,6 @@ public class SoilReportController extends ServiceController {
} }
@ApiOperation(value = "汇总报告待签发分页列表", notes = "汇总报告待签发分页列表") @ApiOperation(value = "汇总报告待签发分页列表", notes = "汇总报告待签发分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
...@@ -82,7 +80,6 @@ public class SoilReportController extends ServiceController { ...@@ -82,7 +80,6 @@ public class SoilReportController extends ServiceController {
} }
@ApiOperation(value = "汇总报告已批准分页列表", notes = "汇总报告已批准分页列表") @ApiOperation(value = "汇总报告已批准分页列表", notes = "汇总报告已批准分页列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
...@@ -97,7 +94,6 @@ public class SoilReportController extends ServiceController { ...@@ -97,7 +94,6 @@ public class SoilReportController extends ServiceController {
} }
@ApiOperation(value = "查询列表", notes = "查询数据列表") @ApiOperation(value = "查询列表", notes = "查询数据列表")
@PostMapping("/list") @PostMapping("/list")
public RestResult<List<SoilReport>> getList(SoilReport soilReport) { public RestResult<List<SoilReport>> getList(SoilReport soilReport) {
...@@ -120,45 +116,43 @@ public class SoilReportController extends ServiceController { ...@@ -120,45 +116,43 @@ public class SoilReportController extends ServiceController {
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class), @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
}) })
@PutMapping("/{id}") @PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, SoilReport soilReport) { public RestResult<Boolean> edit(@PathVariable("id") Long id, SoilReport soilReport) {
soilReport.setId(id); soilReport.setId(id);
return success(soilReportService.updateById(soilReport)); return success(soilReportService.updateById(soilReport));
} }
@ApiOperation(value = "添加", notes = "添加一条数据") @ApiOperation(value = "添加", notes = "添加一条数据")
@PostMapping("/") @PostMapping("/")
public RestResult<Boolean> add(SoilReport soilReport) { public RestResult<Boolean> add(SoilReport soilReport) {
return success(soilReportService.save(soilReport)); return success(soilReportService.save(soilReport));
} }
@ApiOperation(value = "根据 ids 删除", notes = "根据 id 数组删除指定的数据内容") @ApiOperation(value = "根据 ids 删除", notes = "根据 id 数组删除指定的数据内容")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键数组", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class), @ApiImplicitParam(name = "ids", value = "主键数组", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
}) })
@DeleteMapping("/") @DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") Long[] ids) { public RestResult<Boolean> delete(@RequestParam("ids") Long[] ids) {
return success(soilReportService.remove(Condition.create().in("id", ids))); return success(soilReportService.remove(Condition.create().in("id", ids)));
} }
@ApiOperation(value = "添加", notes = "添加一条数据") @ApiOperation(value = "添加", notes = "添加一条数据")
@PostMapping("/make_report") @PostMapping("/make_report")
public RestResult<Boolean> makeReport(@RequestBody SoilReportDTO dto) { public RestResult<Boolean> makeReport(@RequestBody SoilReportDTO dto) {
return success(soilReportService.makeReport(dto,response,getAccount())); return success(soilReportService.makeReport(dto, response, getAccount()));
} }
@ApiOperation(value = "报告上传", notes = "报告上传") @ApiOperation(value = "报告上传", notes = "报告上传")
@PostMapping("/upload/{id}") @PostMapping("/upload/{id}")
public RestResult<Boolean> uploadReport(@PathVariable("id") Long id,@RequestParam("reason")String reason, MultipartFile file) { public RestResult<Boolean> uploadReport(@PathVariable("id") Long id, @RequestParam("reason") String reason, MultipartFile file) {
return success(soilReportService.uploadReport(file, id,reason,getAccount())); return success(soilReportService.uploadReport(file, id, reason, getAccount()));
} }
@ApiOperation(value = "获取报告", notes = "获取报告") @ApiOperation(value = "获取报告", notes = "获取报告")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class), @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
...@@ -169,26 +163,30 @@ public class SoilReportController extends ServiceController { ...@@ -169,26 +163,30 @@ public class SoilReportController extends ServiceController {
} }
@ApiOperation(value = "汇总报告提交至审核", notes = "汇总报告提交至审核") @ApiOperation(value = "汇总报告提交至审核", notes = "汇总报告提交至审核")
@PostMapping("/summary_report_submit") @PostMapping("/summary_report_submit")
public RestResult<Boolean> summaryReportSubmit(@RequestParam("ids") Long [] ids) { public RestResult<Boolean> summaryReportSubmit(@RequestParam("ids") Long[] ids) {
return success(soilReportService.summaryReportSubmit(ids,getAccount())); return success(soilReportService.summaryReportSubmit(ids, getAccount()));
} }
@ApiOperation(value = "汇总报告退回至编制", notes = "汇总报告退回至编制【只退回审核中的报告】")
@PostMapping("/summary_report_back_from_check")
public RestResult<Boolean> summaryReportBack(@RequestParam("ids") Long[] ids, @RequestParam("remark") String remark) {
return success(soilReportService.summaryReportBack(ids, SoilReportStatusEnum.CHECK, remark, getAccount()));
}
@ApiOperation(value = "汇总报告审核提交", notes = "汇总报告审核提交") @ApiOperation(value = "汇总报告审核提交", notes = "汇总报告审核提交")
@PostMapping("/summary_report_check_submit") @PostMapping("/summary_report_check_submit")
public RestResult<Boolean> summaryReportCheckSubmit(@RequestParam("ids") Long [] ids) { public RestResult<Boolean> summaryReportCheckSubmit(@RequestParam("ids") Long[] ids) {
return success(soilReportService.summaryReportCheckSubmit(ids,getAccount())); return success(soilReportService.summaryReportCheckSubmit(ids, getAccount()));
} }
@ApiOperation(value = "汇总报告签发提交", notes = "汇总报告签发提交") @ApiOperation(value = "汇总报告签发提交", notes = "汇总报告签发提交")
@PostMapping("/summary_report_issue_submit") @PostMapping("/summary_report_issue_submit")
public RestResult<Boolean> summaryReportIssueSubmit(@RequestParam("ids") Long [] ids) { public RestResult<Boolean> summaryReportIssueSubmit(@RequestParam("ids") Long[] ids) {
return success(soilReportService.summaryReportIssueSubmit(ids,getAccount())); return success(soilReportService.summaryReportIssueSubmit(ids, getAccount()));
} }
......
src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilReportService.java
package com.patzn.cloud.service.lims.soil.service; package com.patzn.cloud.service.lims.soil.service;
import java.util.List;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.controller.Account; import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.IBaseService; import com.patzn.cloud.commons.service.IBaseService;
import com.patzn.cloud.service.soil.dto.SoilReportDTO; import com.patzn.cloud.service.soil.dto.SoilReportDTO;
import com.patzn.cloud.service.soil.entity.SoilReport; import com.patzn.cloud.service.soil.entity.SoilReport;
import com.patzn.cloud.service.soil.enums.SoilReportStatusEnum;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List;
/** /**
* <p> * <p>
...@@ -38,4 +38,6 @@ public interface ISoilReportService extends IBaseService<SoilReport> { ...@@ -38,4 +38,6 @@ public interface ISoilReportService extends IBaseService<SoilReport> {
boolean summaryReportCheckSubmit(Long[] ids, Account account); boolean summaryReportCheckSubmit(Long[] ids, Account account);
boolean summaryReportIssueSubmit(Long[] ids, Account account); boolean summaryReportIssueSubmit(Long[] ids, Account account);
boolean summaryReportBack(Long[] ids, SoilReportStatusEnum from, String remark, Account account);
} }
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilEntrustServiceImpl.java
package com.patzn.cloud.service.lims.soil.service.impl; 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.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.IdWorker; import com.baomidou.mybatisplus.toolkit.IdWorker;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.patzn.cloud.commons.api.RestAssert; import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account; import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.controller.LoginHelper; import com.patzn.cloud.commons.controller.LoginHelper;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.commons.toolkit.DateUtils; import com.patzn.cloud.commons.toolkit.DateUtils;
import com.patzn.cloud.commons.toolkit.StringHandleUtils; import com.patzn.cloud.commons.toolkit.StringHandleUtils;
import com.patzn.cloud.feign.lims.base.client.LmsCodeRuleClient; import com.patzn.cloud.feign.lims.base.client.LmsCodeRuleClient;
...@@ -23,6 +23,7 @@ import com.patzn.cloud.service.lims.common.MyComparator; ...@@ -23,6 +23,7 @@ import com.patzn.cloud.service.lims.common.MyComparator;
import com.patzn.cloud.service.lims.common.StringStaticDataUtils; import com.patzn.cloud.service.lims.common.StringStaticDataUtils;
import com.patzn.cloud.service.lims.common.service.IExportService; import com.patzn.cloud.service.lims.common.service.IExportService;
import com.patzn.cloud.service.lims.common.service.ILmsMsgService; import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
import com.patzn.cloud.service.lims.soil.mapper.SoilEntrustMapper;
import com.patzn.cloud.service.lims.soil.service.*; import com.patzn.cloud.service.lims.soil.service.*;
import com.patzn.cloud.service.lims.summary.KeyValueEntity; import com.patzn.cloud.service.lims.summary.KeyValueEntity;
import com.patzn.cloud.service.lims.summary.SoilEntrustSummaryDTO; import com.patzn.cloud.service.lims.summary.SoilEntrustSummaryDTO;
...@@ -30,8 +31,6 @@ import com.patzn.cloud.service.lims.summary.SoilSummaryDTO; ...@@ -30,8 +31,6 @@ import com.patzn.cloud.service.lims.summary.SoilSummaryDTO;
import com.patzn.cloud.service.soil.dto.SoilEntrustDTO; import com.patzn.cloud.service.soil.dto.SoilEntrustDTO;
import com.patzn.cloud.service.soil.dto.SoilSampleDTO; import com.patzn.cloud.service.soil.dto.SoilSampleDTO;
import com.patzn.cloud.service.soil.entity.*; import com.patzn.cloud.service.soil.entity.*;
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.SoilEntrustStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum; import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum; import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum;
...@@ -53,13 +52,14 @@ import org.apache.poi.ss.util.CellRangeAddress; ...@@ -53,13 +52,14 @@ import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.*; import org.apache.poi.xssf.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; 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.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* <p> * <p>
...@@ -515,7 +515,6 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S ...@@ -515,7 +515,6 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
@Override @Override
public Page<SoilEntrustVO> pageReportMake(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust) { public Page<SoilEntrustVO> pageReportMake(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust) {
List<SoilEntrustVO> entrustList= baseMapper.selectVOList(page,soilEntrust); List<SoilEntrustVO> entrustList= baseMapper.selectVOList(page,soilEntrust);
if (CollectionUtils.isEmpty(entrustList)){ if (CollectionUtils.isEmpty(entrustList)){
return page; return page;
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java
package com.patzn.cloud.service.lims.soil.service.impl; package com.patzn.cloud.service.lims.soil.service.impl;
import java.io.*;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.ArrayUtils; import com.baomidou.mybatisplus.toolkit.ArrayUtils;
import com.baomidou.mybatisplus.toolkit.CollectionUtils; import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.toolkit.IdWorker; import com.baomidou.mybatisplus.toolkit.IdWorker;
...@@ -13,6 +11,7 @@ import com.google.common.collect.Lists; ...@@ -13,6 +11,7 @@ import com.google.common.collect.Lists;
import com.patzn.cloud.commons.api.RestAssert; import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account; import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.controller.LoginHelper; import com.patzn.cloud.commons.controller.LoginHelper;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.commons.toolkit.DateUtils; import com.patzn.cloud.commons.toolkit.DateUtils;
import com.patzn.cloud.commons.toolkit.FileUtils; import com.patzn.cloud.commons.toolkit.FileUtils;
import com.patzn.cloud.feign.base.client.SysOrgClient; import com.patzn.cloud.feign.base.client.SysOrgClient;
...@@ -24,47 +23,48 @@ import com.patzn.cloud.service.base.entity.SysFileSignature; ...@@ -24,47 +23,48 @@ import com.patzn.cloud.service.base.entity.SysFileSignature;
import com.patzn.cloud.service.lims.base.entity.LmsUserRelGroup; import com.patzn.cloud.service.lims.base.entity.LmsUserRelGroup;
import com.patzn.cloud.service.lims.base.vo.LmsUserRelGroupVO; import com.patzn.cloud.service.lims.base.vo.LmsUserRelGroupVO;
import com.patzn.cloud.service.lims.collect.core.CollectDataType; import com.patzn.cloud.service.lims.collect.core.CollectDataType;
import com.patzn.cloud.service.lims.common.*; import com.patzn.cloud.service.lims.common.CollectUtil;
import com.patzn.cloud.service.lims.common.HSSFWorkbookUtil;
import com.patzn.cloud.service.lims.common.StringHandleUtils;
import com.patzn.cloud.service.lims.common.StringStaticDataUtils;
import com.patzn.cloud.service.lims.common.service.IExportService; import com.patzn.cloud.service.lims.common.service.IExportService;
import com.patzn.cloud.service.lims.common.service.ILmsMsgService; import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
import com.patzn.cloud.service.lims.gideon.utils.ApachePoiLineChart4;
import com.patzn.cloud.service.lims.gideon.utils.DrawXlsxUtil;
import com.patzn.cloud.service.lims.original.InitMapReplace; import com.patzn.cloud.service.lims.original.InitMapReplace;
import com.patzn.cloud.service.lims.original.Operation; import com.patzn.cloud.service.lims.original.Operation;
import com.patzn.cloud.service.lims.original.OriginalOperationFactory; import com.patzn.cloud.service.lims.original.OriginalOperationFactory;
import com.patzn.cloud.service.lims.report.MoreSheetReportOperation; import com.patzn.cloud.service.lims.report.MoreSheetReportOperation;
import com.patzn.cloud.service.lims.report.ReportUtil; import com.patzn.cloud.service.lims.report.ReportUtil;
import com.patzn.cloud.service.lims.report.SingleSheetReportOperation; import com.patzn.cloud.service.lims.report.SingleSheetReportOperation;
import com.patzn.cloud.service.lims.soil.mapper.SoilExperimentMapper;
import com.patzn.cloud.service.lims.soil.service.*; import com.patzn.cloud.service.lims.soil.service.*;
import com.patzn.cloud.service.soil.dto.SoilExperimentQueryDTO; import com.patzn.cloud.service.soil.dto.SoilExperimentQueryDTO;
import com.patzn.cloud.service.soil.entity.*; import com.patzn.cloud.service.soil.entity.*;
import com.patzn.cloud.service.lims.soil.mapper.SoilExperimentMapper;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.enums.SoilEntrustStatusEnum; import com.patzn.cloud.service.soil.enums.SoilEntrustStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum; import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilSampleStatusEnum; import com.patzn.cloud.service.soil.enums.SoilSampleStatusEnum;
import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO; import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO;
import com.patzn.cloud.service.soil.vo.*; import com.patzn.cloud.service.soil.vo.SoilExperimentCollectDataVO;
import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
import com.patzn.cloud.service.soil.vo.SoilItemVO;
import com.patzn.cloud.service.soil.vo.SoilSampleVO;
import jcifs.smb.SmbFile; import jcifs.smb.SmbFile;
import net.coobird.thumbnailator.Thumbnails; import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.ClientAnchor;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xddf.usermodel.PresetColor;
import org.apache.poi.xddf.usermodel.chart.ChartTypes;
import org.apache.poi.xssf.usermodel.*; import org.apache.poi.xssf.usermodel.*;
import org.openxmlformats.schemas.drawingml.x2006.chart.*; import org.openxmlformats.schemas.drawingml.x2006.chart.*;
import org.openxmlformats.schemas.drawingml.x2006.main.*; import org.openxmlformats.schemas.drawingml.x2006.main.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; 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.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* <p> * <p>
* 土工-样品试验表 服务实现类 * 土工-样品试验表 服务实现类
...@@ -1110,7 +1110,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -1110,7 +1110,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
shortNameSet.add(soilExperiment.getShortName()); shortNameSet.add(soilExperiment.getShortName());
} }
} }
sampleVO.setExperimentShortNames(StringHandleUtils.join(shortNameSet)); sampleVO.setExperimentShortNames(String.join("、",shortNameSet));
} }
Map<String,String> mapReplace=new HashMap<>(); Map<String,String> mapReplace=new HashMap<>();
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilReportServiceImpl.java
package com.patzn.cloud.service.lims.soil.service.impl; package com.patzn.cloud.service.lims.soil.service.impl;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.util.*;
import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.CollectionUtils; import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.api.RestAssert; import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account; import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.toolkit.DateUtils; import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.commons.toolkit.FileUtils; import com.patzn.cloud.commons.toolkit.FileUtils;
import com.patzn.cloud.feign.base.client.SysUserClient; import com.patzn.cloud.feign.base.client.SysUserClient;
import com.patzn.cloud.feign.lims.print.client.ElnFormClient; import com.patzn.cloud.feign.lims.print.client.ElnFormClient;
...@@ -22,12 +20,9 @@ import com.patzn.cloud.service.lims.common.service.IExportService; ...@@ -22,12 +20,9 @@ import com.patzn.cloud.service.lims.common.service.IExportService;
import com.patzn.cloud.service.lims.soil.mapper.SoilReportMapper; import com.patzn.cloud.service.lims.soil.mapper.SoilReportMapper;
import com.patzn.cloud.service.lims.soil.service.ISoilOriginalRecordService; import com.patzn.cloud.service.lims.soil.service.ISoilOriginalRecordService;
import com.patzn.cloud.service.lims.soil.service.ISoilReportService; import com.patzn.cloud.service.lims.soil.service.ISoilReportService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.dto.SoilReportDTO; import com.patzn.cloud.service.soil.dto.SoilReportDTO;
import com.patzn.cloud.service.soil.entity.SoilExpReport;
import com.patzn.cloud.service.soil.entity.SoilOriginalRecord; import com.patzn.cloud.service.soil.entity.SoilOriginalRecord;
import com.patzn.cloud.service.soil.entity.SoilReport; import com.patzn.cloud.service.soil.entity.SoilReport;
import com.patzn.cloud.service.soil.enums.SoilExpReportStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilReportStatusEnum; import com.patzn.cloud.service.soil.enums.SoilReportStatusEnum;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -37,17 +32,18 @@ import org.apache.poi.ss.util.CellRangeAddress; ...@@ -37,17 +32,18 @@ import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.*; import org.apache.poi.xssf.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; 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.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.util.*;
/** /**
* <p> * <p>
* 服务实现类 * 服务实现类
* </p> * </p>
* *
* @author wwd * @author wwd
...@@ -88,71 +84,70 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi ...@@ -88,71 +84,70 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean makeReport(SoilReportDTO dto, HttpServletResponse response, Account account) { public boolean makeReport(SoilReportDTO dto, HttpServletResponse response, Account account) {
RestAssert.fail(null == dto,"数据有误"); RestAssert.fail(null == dto, "数据有误");
RestAssert.fail(null == dto.getEntrustId(),"委托单ID不能为空！"); RestAssert.fail(null == dto.getEntrustId(), "委托单ID不能为空！");
RestAssert.fail(CollectionUtils.isEmpty(dto.getOriginalList()),"请选择原始记录！"); RestAssert.fail(CollectionUtils.isEmpty(dto.getOriginalList()), "请选择原始记录！");
List<SoilOriginalRecord> originalRecordList= soilOriginalRecordService.list(Condition.create().in("id",dto.getOriginalList())); List<SoilOriginalRecord> originalRecordList = soilOriginalRecordService.list(Condition.create().in("id", dto.getOriginalList()));
try { try {
XSSFWorkbook reportBook = new XSSFWorkbook(); XSSFWorkbook reportBook = new XSSFWorkbook();
Map<String,Integer> map = new HashMap<>(); Map<String, Integer> map = new HashMap<>();
for (SoilOriginalRecord record:originalRecordList) { for (SoilOriginalRecord record : originalRecordList) {
ElnForm form= elnFormClient.getExcelById(record.getOriginalRecordId()).serviceData(); ElnForm form = elnFormClient.getExcelById(record.getOriginalRecordId()).serviceData();
String excelKey= form.getExcelObjectKey(); String excelKey = form.getExcelObjectKey();
InputStream io = ossClient.download(excelKey); InputStream io = ossClient.download(excelKey);
XSSFWorkbook workbook = new XSSFWorkbook(io); XSSFWorkbook workbook = new XSSFWorkbook(io);
XSSFSheet sheet= workbook.getSheetAt(0); XSSFSheet sheet = workbook.getSheetAt(0);
if (!map.containsKey(sheet.getSheetName())){ if (!map.containsKey(sheet.getSheetName())) {
map.put(sheet.getSheetName(),1); map.put(sheet.getSheetName(), 1);
XSSFSheet xssfSheet= reportBook.createSheet(sheet.getSheetName()); XSSFSheet xssfSheet = reportBook.createSheet(sheet.getSheetName());
copySheet(reportBook,sheet,xssfSheet); copySheet(reportBook, sheet, xssfSheet);
}else{ } else {
XSSFSheet xssfSheet= reportBook.createSheet(sheet.getSheetName()+(map.get(sheet.getSheetName())+1)); XSSFSheet xssfSheet = reportBook.createSheet(sheet.getSheetName() + (map.get(sheet.getSheetName()) + 1));
map.put(sheet.getSheetName(),map.get(sheet.getSheetName())+1); map.put(sheet.getSheetName(), map.get(sheet.getSheetName()) + 1);
copySheet(reportBook,sheet,xssfSheet); copySheet(reportBook, sheet, xssfSheet);
} }
io.close(); io.close();
} }
List<File> deleteList = new ArrayList<>(); List<File> deleteList = new ArrayList<>();
File fileNew = null; File fileNew = null;
FileOutputStream os; FileOutputStream os;
fileNew = File.createTempFile(dto.getEntrustId()+"", ".xlsx"); fileNew = File.createTempFile(dto.getEntrustId() + "", ".xlsx");
os = new FileOutputStream(fileNew); os = new FileOutputStream(fileNew);
reportBook.write(os); reportBook.write(os);
os.flush(); os.flush();
os.close(); os.close();
reportBook.close(); reportBook.close();
deleteList.add(fileNew); deleteList.add(fileNew);
OssFileResult result = ossClient.upload(fileNew);
OssFileResult result= ossClient.upload(fileNew);
int count = super.count(Condition.create().eq("entrust_id", dto.getEntrustId()));
int count = super.count(Condition.create().eq("entrust_id",dto.getEntrustId()));
SoilReport report = new SoilReport();
SoilReport report = new SoilReport();
report.setEntrustId(dto.getEntrustId()); report.setEntrustId(dto.getEntrustId());
report.setUname(account.getUserName()); report.setUname(account.getUserName());
report.setVersion(1+count); report.setVersion(1 + count);
report.setBucketName(result.getBucketName()); report.setBucketName(result.getBucketName());
report.setObjectKey(result.getObjectKey()); report.setObjectKey(result.getObjectKey());
report.setUri(result.getUri()); report.setUri(result.getUri());
report.setVersionId(result.getVersionId()); report.setVersionId(result.getVersionId());
save(report); save(report);
FileUtils.deleteFiles(deleteList); FileUtils.deleteFiles(deleteList);
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
return true; return true;
} }
@Override @Override
public SoilReport getReport(Long id) { public SoilReport getReport(Long id) {
SoilReport report= super.getOne(Condition.create().setSqlSelect("object_key","version_id").eq("entrust_id",id).orderBy("version",false).last("LIMIT 1")); SoilReport report = super.getOne(Condition.create().setSqlSelect("object_key", "version_id").eq("entrust_id", id).orderBy("version", false).last("LIMIT 1"));
if (null == report){ if (null == report) {
RestAssert.fail("报告暂未生成"); RestAssert.fail("报告暂未生成");
} }
return report; return report;
...@@ -161,17 +156,17 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi ...@@ -161,17 +156,17 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi
@Override @Override
public boolean uploadReport(MultipartFile file, Long id, String reason, Account account) { public boolean uploadReport(MultipartFile file, Long id, String reason, Account account) {
if (!file.getOriginalFilename().contains(".xlsx")){ if (!file.getOriginalFilename().contains(".xlsx")) {
RestAssert.fail("请上传 .xlsx 格式的报告"); RestAssert.fail("请上传 .xlsx 格式的报告");
} }
RestAssert.fail(StringUtils.isBlank(reason),"请填写上传备注"); RestAssert.fail(StringUtils.isBlank(reason), "请填写上传备注");
OssFileResult result= ossClient.upload(file); OssFileResult result = ossClient.upload(file);
int count = super.count(Condition.create().eq("entrust_id",id)); int count = super.count(Condition.create().eq("entrust_id", id));
SoilReport report = new SoilReport(); SoilReport report = new SoilReport();
report.setRemark(reason); report.setRemark(reason);
report.setEntrustId(id); report.setEntrustId(id);
report.setUname(account.getUserName()); report.setUname(account.getUserName());
report.setVersion(1+count); report.setVersion(1 + count);
report.setBucketName(result.getBucketName()); report.setBucketName(result.getBucketName());
report.setObjectKey(result.getObjectKey()); report.setObjectKey(result.getObjectKey());
report.setUri(result.getUri()); report.setUri(result.getUri());
...@@ -182,37 +177,37 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi ...@@ -182,37 +177,37 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean summaryReportSubmit(Long[] ids, Account account) { public boolean summaryReportSubmit(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的汇总报告"); RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要提交的汇总报告");
SysFileSignature signature =sysUserClient.signature(account.getUserId()).serviceData(); SysFileSignature signature = sysUserClient.signature(account.getUserId()).serviceData();
if (null == signature){ if (null == signature) {
return true; return true;
} }
List<SoilReport> reportList = super.list(Condition.create().in("id",ids)); List<SoilReport> reportList = super.list(Condition.create().in("id", ids));
try { try {
List<File> deletedList = new ArrayList<>(); List<File> deletedList = new ArrayList<>();
List<SoilReport> updateReportList = new ArrayList<>(); List<SoilReport> updateReportList = new ArrayList<>();
Date date = new Date(); Date date = new Date();
for (SoilReport soilReport:reportList) { for (SoilReport soilReport : reportList) {
XSSFWorkbook xssfWorkbook = HSSFWorkbookUtil.getWorkbookByIO(ossClient.download(soilReport.getObjectKey())); XSSFWorkbook xssfWorkbook = HSSFWorkbookUtil.getWorkbookByIO(ossClient.download(soilReport.getObjectKey()));
Map<String,InputStream> inputStreamMap = new HashMap<>(); Map<String, InputStream> inputStreamMap = new HashMap<>();
int sheetNum = xssfWorkbook.getNumberOfSheets(); int sheetNum = xssfWorkbook.getNumberOfSheets();
for (int i = 0; i < sheetNum; i++) { for (int i = 0; i < sheetNum; i++) {
inputStreamMap.put("#{imgTabulator}",ossClient.download(signature.getObjectKey())); inputStreamMap.put("#{imgTabulator}", ossClient.download(signature.getObjectKey()));
HSSFWorkbookUtil.insertImageByIO(xssfWorkbook,inputStreamMap,false,i); HSSFWorkbookUtil.insertImageByIO(xssfWorkbook, inputStreamMap, false, i);
} }
FileOutputStream os = null; FileOutputStream os = null;
File file = null; File file = null;
String generated="汇总项目报告审核"+soilReport.getId(); String generated = "汇总项目报告审核" + soilReport.getId();
file = File.createTempFile(generated, ".xlsx"); file = File.createTempFile(generated, ".xlsx");
os = new FileOutputStream(file); os = new FileOutputStream(file);
xssfWorkbook.write(os); xssfWorkbook.write(os);
os.flush(); os.flush();
OssFileResult ossFileResult = ossClient.upload(file); OssFileResult ossFileResult = ossClient.upload(file);
deletedList.add(file); deletedList.add(file);
os.close(); os.close();
...@@ -227,53 +222,52 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi ...@@ -227,53 +222,52 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi
expReport.setProgress(SoilReportStatusEnum.CHECK); expReport.setProgress(SoilReportStatusEnum.CHECK);
updateReportList.add(expReport); updateReportList.add(expReport);
} }
if (CollectionUtils.isNotEmpty(updateReportList)){ if (CollectionUtils.isNotEmpty(updateReportList)) {
super.updateBatchById(updateReportList); super.updateBatchById(updateReportList);
} }
FileUtils.deleteFiles(deletedList); FileUtils.deleteFiles(deletedList);
}catch (Exception e){ } catch (Exception e) {
logger.error("汇总试验报告插入电子签名失败"+e.getMessage()); logger.error("汇总试验报告插入电子签名失败" + e.getMessage());
} }
return true; return true;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean summaryReportCheckSubmit(Long[] ids, Account account) { public boolean summaryReportCheckSubmit(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要审核提交的汇总报告"); RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要审核提交的汇总报告");
SysFileSignature signature =sysUserClient.signature(account.getUserId()).serviceData(); SysFileSignature signature = sysUserClient.signature(account.getUserId()).serviceData();
if (null == signature){ if (null == signature) {
return true; return true;
} }
List<SoilReport> reportList = super.list(Condition.create().in("id",ids)); List<SoilReport> reportList = super.list(Condition.create().in("id", ids));
try { try {
List<File> deletedList = new ArrayList<>(); List<File> deletedList = new ArrayList<>();
List<SoilReport> updateReportList = new ArrayList<>(); List<SoilReport> updateReportList = new ArrayList<>();
for (SoilReport soilReport:reportList) { for (SoilReport soilReport : reportList) {
XSSFWorkbook xssfWorkbook = HSSFWorkbookUtil.getWorkbookByIO(ossClient.download(soilReport.getObjectKey())); XSSFWorkbook xssfWorkbook = HSSFWorkbookUtil.getWorkbookByIO(ossClient.download(soilReport.getObjectKey()));
Map<String,InputStream> inputStreamMap = new HashMap<>(); Map<String, InputStream> inputStreamMap = new HashMap<>();
int sheetNum = xssfWorkbook.getNumberOfSheets(); int sheetNum = xssfWorkbook.getNumberOfSheets();
for (int i = 0; i < sheetNum; i++) { for (int i = 0; i < sheetNum; i++) {
inputStreamMap.put("#{imgChecker}",ossClient.download(signature.getObjectKey())); inputStreamMap.put("#{imgChecker}", ossClient.download(signature.getObjectKey()));
HSSFWorkbookUtil.insertImageByIO(xssfWorkbook,inputStreamMap,false,i); HSSFWorkbookUtil.insertImageByIO(xssfWorkbook, inputStreamMap, false, i);
} }
FileOutputStream os = null; FileOutputStream os = null;
File file = null; File file = null;
String generated="汇总项目报告"+soilReport.getId(); String generated = "汇总项目报告" + soilReport.getId();
file = File.createTempFile(generated, ".xlsx"); file = File.createTempFile(generated, ".xlsx");
os = new FileOutputStream(file); os = new FileOutputStream(file);
xssfWorkbook.write(os); xssfWorkbook.write(os);
os.flush(); os.flush();
OssFileResult ossFileResult = ossClient.upload(file); OssFileResult ossFileResult = ossClient.upload(file);
deletedList.add(file); deletedList.add(file);
os.close(); os.close();
...@@ -288,12 +282,12 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi ...@@ -288,12 +282,12 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi
expReport.setProgress(SoilReportStatusEnum.ISSUE); expReport.setProgress(SoilReportStatusEnum.ISSUE);
updateReportList.add(expReport); updateReportList.add(expReport);
} }
if (CollectionUtils.isNotEmpty(updateReportList)){ if (CollectionUtils.isNotEmpty(updateReportList)) {
super.updateBatchById(updateReportList); super.updateBatchById(updateReportList);
} }
}catch (Exception e){ } catch (Exception e) {
logger.error("汇总试验报告审核插入电子签名失败"+e.getMessage()); logger.error("汇总试验报告审核插入电子签名失败" + e.getMessage());
} }
return true; return true;
...@@ -303,34 +297,34 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi ...@@ -303,34 +297,34 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean summaryReportIssueSubmit(Long[] ids, Account account) { public boolean summaryReportIssueSubmit(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要签发提交的汇总报告"); RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要签发提交的汇总报告");
SysFileSignature signature =sysUserClient.signature(account.getUserId()).serviceData(); SysFileSignature signature = sysUserClient.signature(account.getUserId()).serviceData();
if (null == signature){ if (null == signature) {
return true; return true;
} }
List<SoilReport> reportList = super.list(Condition.create().in("id",ids)); List<SoilReport> reportList = super.list(Condition.create().in("id", ids));
try { try {
List<File> deletedList = new ArrayList<>(); List<File> deletedList = new ArrayList<>();
List<SoilReport> updateReportList = new ArrayList<>(); List<SoilReport> updateReportList = new ArrayList<>();
for (SoilReport soilReport:reportList) { for (SoilReport soilReport : reportList) {
XSSFWorkbook xssfWorkbook = HSSFWorkbookUtil.getWorkbookByIO(ossClient.download(soilReport.getObjectKey())); XSSFWorkbook xssfWorkbook = HSSFWorkbookUtil.getWorkbookByIO(ossClient.download(soilReport.getObjectKey()));
Map<String,InputStream> inputStreamMap = new HashMap<>(); Map<String, InputStream> inputStreamMap = new HashMap<>();
int sheetNum = xssfWorkbook.getNumberOfSheets(); int sheetNum = xssfWorkbook.getNumberOfSheets();
for (int i = 0; i < sheetNum; i++) { for (int i = 0; i < sheetNum; i++) {
inputStreamMap.put("#{imgIssuer}",ossClient.download(signature.getObjectKey())); inputStreamMap.put("#{imgIssuer}", ossClient.download(signature.getObjectKey()));
HSSFWorkbookUtil.insertImageByIO(xssfWorkbook,inputStreamMap,false,i); HSSFWorkbookUtil.insertImageByIO(xssfWorkbook, inputStreamMap, false, i);
} }
FileOutputStream os = null; FileOutputStream os = null;
File file = null; File file = null;
String generated="汇总项目报告"+soilReport.getId(); String generated = "汇总项目报告" + soilReport.getId();
file = File.createTempFile(generated, ".xlsx"); file = File.createTempFile(generated, ".xlsx");
os = new FileOutputStream(file); os = new FileOutputStream(file);
xssfWorkbook.write(os); xssfWorkbook.write(os);
os.flush(); os.flush();
OssFileResult ossFileResult = ossClient.upload(file); OssFileResult ossFileResult = ossClient.upload(file);
deletedList.add(file); deletedList.add(file);
os.close(); os.close();
...@@ -345,17 +339,35 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi ...@@ -345,17 +339,35 @@ public class SoilReportServiceImpl extends BaseServiceImpl<SoilReportMapper, Soi
expReport.setProgress(SoilReportStatusEnum.END); expReport.setProgress(SoilReportStatusEnum.END);
updateReportList.add(expReport); updateReportList.add(expReport);
} }
if (CollectionUtils.isNotEmpty(updateReportList)){ if (CollectionUtils.isNotEmpty(updateReportList)) {
super.updateBatchById(updateReportList); super.updateBatchById(updateReportList);
} }
}catch (Exception e){ } catch (Exception e) {
logger.error("汇总试验报告签发插入电子签名失败"+e.getMessage()); logger.error("汇总试验报告签发插入电子签名失败" + e.getMessage());
} }
return true; return true;
} }
@Override
public boolean summaryReportBack(Long[] entrustIds, SoilReportStatusEnum from, String remark, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(entrustIds), "请选择要驳回的任务");
RestAssert.fail(StringUtils.isBlank(remark), "请填写驳回的原因");
Wrapper wrapper = Condition.wrapper().in("entrust_id", entrustIds);
if (null != from) {
wrapper.eq("status", from.getValue());
}
// 查询出处理
List<SoilReport> reportList = list(wrapper);
for (SoilReport report : reportList) {
report.setStatus(SoilReportStatusEnum.DRAFT);
report.setProgress(SoilReportStatusEnum.DRAFT);
report.setRemark(report.getRemark() + " " + remark);
}
return updateBatchById(reportList);
}
private static void copySheet(XSSFWorkbook wb, XSSFSheet fromSheet, XSSFSheet toSheet) { private static void copySheet(XSSFWorkbook wb, XSSFSheet fromSheet, XSSFSheet toSheet) {
mergeSheetAllRegion(fromSheet, toSheet); mergeSheetAllRegion(fromSheet, toSheet);
// 设置列宽 // 设置列宽
......
src/main/resources/mapper/soil/SoilEntrustMapper.xml
...@@ -93,6 +93,20 @@ ...@@ -93,6 +93,20 @@
JOIN soil_entrust_operation o ON e.id = o.entrust_id JOIN soil_entrust_operation o ON e.id = o.entrust_id
WHERE e.deleted = 0 WHERE e.deleted = 0
<include refid="sqlWhere"/> <include refid="sqlWhere"/>
<if test="null != vo.reportStatusEnum or null != vo.reportStatusList">
and exists (
select 1 from soil_report sr where sr.deleted = 0 and sr.entrust_id = e.id
<if test="null != vo.reportStatusEnum">
and sr.status = #{vo.reportStatusEnum}
</if>
<if test="null != vo.reportStatusList">
and sr.status in
<foreach collection="vo.reportStatusList" item="rs" open="(" separator="," close=")">
#{rs}
</foreach>
</if>
)
</if>
<include refid="sqlOrderBy"/> <include refid="sqlOrderBy"/>
</select> </select>
<sql id="sqlOrderBy"> <sql id="sqlOrderBy">
......
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