Skip to content

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

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

修复中海油服相关bug;
parent 90dc3ccc
Showing with 60 additions and 47 deletions
src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilReportController.java
......@@ -52,7 +52,6 @@ public class SoilReportController extends ServiceController {
}
@ApiOperation(value = "汇总报告待审核分页列表", notes = "分页查询数据列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -67,7 +66,6 @@ public class SoilReportController extends ServiceController {
}
@ApiOperation(value = "汇总报告待签发分页列表", notes = "汇总报告待签发分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -82,7 +80,6 @@ public class SoilReportController extends ServiceController {
}
@ApiOperation(value = "汇总报告已批准分页列表", notes = "汇总报告已批准分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -97,7 +94,6 @@ public class SoilReportController extends ServiceController {
}
@ApiOperation(value = "查询列表", notes = "查询数据列表")
@PostMapping("/list")
public RestResult<List<SoilReport>> getList(SoilReport soilReport) {
......@@ -146,19 +142,17 @@ public class SoilReportController extends ServiceController {
@ApiOperation(value = "添加", notes = "添加一条数据")
@PostMapping("/make_report")
public RestResult<Boolean> makeReport(@RequestBody SoilReportDTO dto) {
return success(soilReportService.makeReport(dto,response,getAccount()));
return success(soilReportService.makeReport(dto, response, getAccount()));
}
@ApiOperation(value = "报告上传", notes = "报告上传")
@PostMapping("/upload/{id}")
public RestResult<Boolean> uploadReport(@PathVariable("id") Long id,@RequestParam("reason")String reason, MultipartFile file) {
return success(soilReportService.uploadReport(file, id,reason,getAccount()));
public RestResult<Boolean> uploadReport(@PathVariable("id") Long id, @RequestParam("reason") String reason, MultipartFile file) {
return success(soilReportService.uploadReport(file, id, reason, getAccount()));
}
@ApiOperation(value = "获取报告", notes = "获取报告")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
......@@ -169,26 +163,30 @@ public class SoilReportController extends ServiceController {
}
@ApiOperation(value = "汇总报告提交至审核", notes = "汇总报告提交至审核")
@PostMapping("/summary_report_submit")
public RestResult<Boolean> summaryReportSubmit(@RequestParam("ids") Long [] ids) {
return success(soilReportService.summaryReportSubmit(ids,getAccount()));
public RestResult<Boolean> summaryReportSubmit(@RequestParam("ids") Long[] ids) {
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 = "汇总报告审核提交")
@PostMapping("/summary_report_check_submit")
public RestResult<Boolean> summaryReportCheckSubmit(@RequestParam("ids") Long [] ids) {
return success(soilReportService.summaryReportCheckSubmit(ids,getAccount()));
public RestResult<Boolean> summaryReportCheckSubmit(@RequestParam("ids") Long[] ids) {
return success(soilReportService.summaryReportCheckSubmit(ids, getAccount()));
}
@ApiOperation(value = "汇总报告签发提交", notes = "汇总报告签发提交")
@PostMapping("/summary_report_issue_submit")
public RestResult<Boolean> summaryReportIssueSubmit(@RequestParam("ids") Long [] ids) {
return success(soilReportService.summaryReportIssueSubmit(ids,getAccount()));
public RestResult<Boolean> summaryReportIssueSubmit(@RequestParam("ids") Long[] ids) {
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;
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.dto.SoilReportDTO;
import com.patzn.cloud.service.soil.entity.SoilReport;
import com.patzn.cloud.service.soil.enums.SoilReportStatusEnum;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* <p>
......@@ -38,4 +38,6 @@ public interface ISoilReportService extends IBaseService<SoilReport> {
boolean summaryReportCheckSubmit(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;
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.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.IdWorker;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.controller.LoginHelper;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.commons.toolkit.DateUtils;
import com.patzn.cloud.commons.toolkit.StringHandleUtils;
import com.patzn.cloud.feign.lims.base.client.LmsCodeRuleClient;
......@@ -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.service.IExportService;
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.summary.KeyValueEntity;
import com.patzn.cloud.service.lims.summary.SoilEntrustSummaryDTO;
......@@ -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.SoilSampleDTO;
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.SoilExpStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum;
......@@ -53,13 +52,14 @@ import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.*;
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;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/**
* <p>
......@@ -515,7 +515,6 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
@Override
public Page<SoilEntrustVO> pageReportMake(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust) {
List<SoilEntrustVO> entrustList= baseMapper.selectVOList(page,soilEntrust);
if (CollectionUtils.isEmpty(entrustList)){
return page;
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java
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.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.ArrayUtils;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.toolkit.IdWorker;
......@@ -13,6 +11,7 @@ import com.google.common.collect.Lists;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.controller.LoginHelper;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.commons.toolkit.DateUtils;
import com.patzn.cloud.commons.toolkit.FileUtils;
import com.patzn.cloud.feign.base.client.SysOrgClient;
......@@ -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.vo.LmsUserRelGroupVO;
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.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.Operation;
import com.patzn.cloud.service.lims.original.OriginalOperationFactory;
import com.patzn.cloud.service.lims.report.MoreSheetReportOperation;
import com.patzn.cloud.service.lims.report.ReportUtil;
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.soil.dto.SoilExperimentQueryDTO;
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.SoilExpStatusEnum;
import com.patzn.cloud.service.soil.enums.SoilSampleStatusEnum;
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 net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.collections4.ListUtils;
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.xddf.usermodel.PresetColor;
import org.apache.poi.xddf.usermodel.chart.ChartTypes;
import org.apache.poi.xssf.usermodel.*;
import org.openxmlformats.schemas.drawingml.x2006.chart.*;
import org.openxmlformats.schemas.drawingml.x2006.main.*;
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;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
/**
* <p>
* 土工-样品试验表 服务实现类
......@@ -1110,7 +1110,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
shortNameSet.add(soilExperiment.getShortName());
}
}
sampleVO.setExperimentShortNames(StringHandleUtils.join(shortNameSet));
sampleVO.setExperimentShortNames(String.join("、",shortNameSet));
}
Map<String,String> mapReplace=new HashMap<>();
......
src/main/resources/mapper/soil/SoilEntrustMapper.xml
......@@ -93,6 +93,20 @@
JOIN soil_entrust_operation o ON e.id = o.entrust_id
WHERE e.deleted = 0
<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"/>
</select>
<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