Skip to content

P
patzn-cloud-service-hmhj
Commit 04371dfb by lijingjing
Options

添加检测标准模糊模糊搜索； 

修改储运检测类型，非空验证；
合同登记创建时间排序；
添加会审结论；
修改数据录入-样品-检测人不显示问题；
parent 1d5fcc17
Showing with 185 additions and 99 deletions
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSampleController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.google.common.collect.Lists;
import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
import com.patzn.cloud.service.hmhj.dto.ContractSampleVODTO;
......@@ -20,6 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.List;
/**
* 合同物资 前端控制器
*
......@@ -43,11 +45,10 @@ public class ContractSampleController extends ServiceController {
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page")
public RestResult<Page<ContractSample>> getPage(ContractSample contractSample) {
public RestResult<Page<ContractSample>> getPage(ContractSample contractSample) {
contractSample.setStatus(ContractSampleStatusEnum.DRAFT);
return success(contractSampleService.page(getPage(), contractSample));
}
}
@ApiOperation("合同登记历史分页列表")
......@@ -74,7 +75,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("储运登记分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -89,8 +89,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("储运登记历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -112,7 +110,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("生技部审核分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -127,8 +124,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("外委登记分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -174,7 +169,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("委托登记分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -189,7 +183,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("生技部审核历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -209,7 +202,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("验收任务登记登记分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -243,7 +235,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("验收任务登记登记历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -262,7 +253,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("验收组织分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -277,7 +267,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("验收组织历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -320,7 +309,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("验收结果录入分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -354,8 +342,6 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("根据ID查询列表分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -364,13 +350,11 @@ public class ContractSampleController extends ServiceController {
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_by_ids")
public RestResult<Page<ContractSample>> getPageByIds(@RequestParam("ids") Long [] ids) {
public RestResult<Page<ContractSample>> getPageByIds(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.pageByIds(getPage(), ids));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
......@@ -385,17 +369,16 @@ public class ContractSampleController extends ServiceController {
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, ContractSample contractSample) {
public RestResult<Boolean> edit(@PathVariable("id") Long id, ContractSample contractSample) {
contractSample.setId(id);
return success(contractSampleService.updateById(contractSample));
}
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(ContractSample contractSample) {
public RestResult<Boolean> add(ContractSample contractSample) {
return success(contractSampleService.save(contractSample));
}
}
@ApiOperation("添加")
......@@ -405,118 +388,107 @@ public class ContractSampleController extends ServiceController {
}
@ApiOperation("提交至储运登记")
@PostMapping("/submit_to_store_transport")
public RestResult<Boolean> submitToStoreTransport(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.submitToStoreTransport(ids,getAccount()));
public RestResult<Boolean> submitToStoreTransport(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.submitToStoreTransport(ids, getAccount()));
}
@ApiOperation("提交至验收任务登记")
@PostMapping("/submit_to_check_accept_reg")
public RestResult<Boolean> submitToCheckAcceptReg(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.submitToCheckAcceptReg(ids,getAccount()));
public RestResult<Boolean> submitToCheckAcceptReg(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.submitToCheckAcceptReg(ids, getAccount()));
}
@ApiOperation("验收任务登记提交至验收组织")
@PostMapping("/submit_to_check_accept_org")
public RestResult<Boolean> submitToCheckAcceptOrg(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.submitToCheckAcceptOrg(ids,getAccount()));
public RestResult<Boolean> submitToCheckAcceptOrg(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.submitToCheckAcceptOrg(ids, getAccount()));
}
@ApiOperation("验收任务登记提交至委托登记")
@PostMapping("/submit_to_entrust_org")
public RestResult<Boolean> submitToEntrustOrg(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.submitToEntrustOrg(ids,getAccount()));
public RestResult<Boolean> submitToEntrustOrg(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.submitToEntrustOrg(ids, getAccount()));
}
@ApiOperation("验收任务登记提交至外委登记")
@PostMapping("/submit_to_out_reg")
public RestResult<Boolean> submitToOutReg(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.submitToOutReg(ids,getAccount()));
public RestResult<Boolean> submitToOutReg(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.submitToOutReg(ids, getAccount()));
}
@ApiOperation("外委登记提交至验收结果录入")
@PostMapping("/out_reg_pass_to_check_result")
public RestResult<Boolean> outRegPassToCheckResult(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.outRegPassToCheckResult(ids,getAccount()));
public RestResult<Boolean> outRegPassToCheckResult(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.outRegPassToCheckResult(ids, getAccount()));
}
@ApiOperation("外委登记提交至外委数据录入")
@PostMapping("/submit_to_out_data_input")
public RestResult<Boolean> submitToOutDataInput(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.submitToOutDataInput(ids,getAccount()));
public RestResult<Boolean> submitToOutDataInput(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.submitToOutDataInput(ids, getAccount()));
}
@ApiOperation("验收组织提交至专家会审")
@PostMapping("/submit_to_expert_review")
public RestResult<Boolean> submitToExpertReviewFromOrg(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.submitToExpertReviewFromOrg(ids,getAccount()));
public RestResult<Boolean> submitToExpertReviewFromOrg(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.submitToExpertReviewFromOrg(ids, getAccount()));
}
@ApiOperation("专家会审提交至验收结果录入")
@PostMapping("/submit_check_result_input")
public RestResult<Boolean> submitCheckResultInput(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.submitCheckResultInput(ids,getAccount()));
public RestResult<Boolean> submitCheckResultInput(@RequestParam("ids") Long[] ids, @RequestParam("result") String result) {
return success(contractSampleService.submitCheckResultInput(ids, result, getAccount()));
}
@ApiOperation("提交至生技部审核")
@PostMapping("/submit_to_pro_tech_check")
public RestResult<Boolean> submitToProTechCheck(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.submitToProTechCheck(ids,getAccount()));
public RestResult<Boolean> submitToProTechCheck(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.submitToProTechCheck(ids, getAccount()));
}
@ApiOperation("生技部审核通过接口")
@PostMapping("/pro_tech_check_pass")
public RestResult<Boolean> proTechCheckPass(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.proTechCheckPass(ids,getAccount()));
public RestResult<Boolean> proTechCheckPass(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.proTechCheckPass(ids, getAccount()));
}
@ApiOperation("生技部审核退回")
@PostMapping("/back_pro_tech_check")
public RestResult<Boolean> backProTechCheck(@RequestParam("ids") Long [] ids,@RequestParam("reason") String reason) {
return success(contractSampleService.backProTechCheck(ids,reason,getAccount()));
public RestResult<Boolean> backProTechCheck(@RequestParam("ids") Long[] ids, @RequestParam("reason") String reason) {
return success(contractSampleService.backProTechCheck(ids, reason, getAccount()));
}
@ApiOperation("根据 ids 删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(contractSampleService.removeByIds(ids));
}
}
@ApiOperation("验收结果录入提交至验收结果发布")
@PostMapping("/submit_to_acceptance_check_publish")
public RestResult<Boolean> submitToAcceptanceCheckPublish(@RequestParam("ids") Long [] ids) {
return success(contractSampleService.submitToAcceptanceCheckPublish(ids,getAccount()));
public RestResult<Boolean> submitToAcceptanceCheckPublish(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.submitToAcceptanceCheckPublish(ids, getAccount()));
}
@ApiOperation("验收结果发布历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......@@ -562,44 +534,40 @@ public class ContractSampleController extends ServiceController {
@ApiOperation("二次判定申请")
@PostMapping("/submit_second_judge_apply")
public RestResult<Boolean> submitSecondJudgeApply(ContractSample sample) {
return success(contractSampleService.submitSecondJudgeApply(sample,getAccount()));
return success(contractSampleService.submitSecondJudgeApply(sample, getAccount()));
}
@ApiOperation("二次判定维护提交审核")
@PostMapping("/submit_to_second_judge_check")
public RestResult<Boolean> submitToSecondJudgeCheck(@RequestParam("ids")Long [] ids) {
return success(contractSampleService.submitToSecondJudgeCheck(ids,getAccount()));
public RestResult<Boolean> submitToSecondJudgeCheck(@RequestParam("ids") Long[] ids) {
return success(contractSampleService.submitToSecondJudgeCheck(ids, getAccount()));
}
@ApiOperation("二次判定审核驳回")
@PostMapping("/back_second_judge_check")
public RestResult<Boolean> backSecondJudgeCheck(@RequestParam("ids")Long [] ids,@RequestParam("reason") String reason) {
return success(contractSampleService.backSecondJudgeCheck(ids,reason,getAccount()));
public RestResult<Boolean> backSecondJudgeCheck(@RequestParam("ids") Long[] ids, @RequestParam("reason") String reason) {
return success(contractSampleService.backSecondJudgeCheck(ids, reason, getAccount()));
}
@ApiOperation("二次判定审核通过")
@PostMapping("/pass_second_judge_check")
public RestResult<Boolean> passToSecondJudgeCheck(@RequestBody ContractSampleVODTO dto) {
return success(contractSampleService.passToSecondJudgeCheck(dto,getAccount()));
return success(contractSampleService.passToSecondJudgeCheck(dto, getAccount()));
}
@ApiOperation("任务判定增加")
@PostMapping("/add_judgement_type")
public RestResult<Boolean> addJudgementType(@RequestParam("ids")Long[] ids, @RequestParam("judgement") String judgement) {
return success(contractSampleService.addJudgementType(ids,judgement,getAccount()));
public RestResult<Boolean> addJudgementType(@RequestParam("ids") Long[] ids, @RequestParam("judgement") String judgement) {
return success(contractSampleService.addJudgementType(ids, judgement, getAccount()));
}
@ApiOperation("批量导入报检单")
@PostMapping("/batch_import")
public RestResult<Boolean> batchImport(@RequestPart MultipartFile file) {
return success(contractSampleService.batchImport(file,getAccount()));
return success(contractSampleService.batchImport(file, getAccount()));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleItemController.java
......@@ -662,6 +662,12 @@ public class EntrustSampleItemController extends ServiceController {
}
@ApiOperation("委托检测项目填写进度查询")
@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("/item_fill_progress_query")
public RestResult<Page<EntrustSampleItemVO>> getItemFillProgressQuery(EntrustSampleItemVO itemVO) {
RestAssert.fail(null == itemVO.getEntrustId(), "委托ID为空");
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemMapper.java
......@@ -77,5 +77,5 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
@SqlParser(filter = true)
boolean updateForRevokeRemovedItems(@Param("ids") Long[] ids);
List<EntrustSampleItemVO> selectItemFillProgress(@Param("vo") EntrustSampleItemVO itemVO);
List<EntrustSampleItemVO> selectItemFillProgress(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO itemVO);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IContractSampleService.java
......@@ -47,7 +47,7 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
boolean submitToExpertReviewFromOrg(Long[] ids, Account account);
boolean submitCheckResultInput(Long[] ids, Account account);
boolean submitCheckResultInput(Long[] ids,String result, Account account);
Page<ContractSampleVO> pageVO(Page<ContractSampleVO> page, ContractSampleVO contractSample);
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ClientInfoServiceImpl.java
......@@ -43,8 +43,13 @@ public class ClientInfoServiceImpl extends BaseServiceImpl<ClientInfoMapper, Cli
@Override
public Page<ClientInfo> page(Page<ClientInfo> page, ClientInfo clientInfo) {
String client = clientInfo.getClient();
clientInfo.setClient(null);
Wrapper wrapper = new EntityWrapper<>(clientInfo);
if (StringUtils.isNotBlank(client)) {
wrapper.like("client", client);
}
wrapper.orderBy("ctime",false);
return this.page(page, wrapper);
}
......@@ -98,6 +103,9 @@ public class ClientInfoServiceImpl extends BaseServiceImpl<ClientInfoMapper, Cli
RestAssert.fail(StringUtils.isBlank(clientJson), "委托单位信息为空");
try {
List<ClientInfo> clientInfoList = JSONArray.parseArray(clientJson, ClientInfo.class);
if (CollectionUtils.isEmpty(clientInfoList)) {
return true;
}
this.saveBatch(clientInfoList);
} catch (Exception e) {
logger.error(e.getMessage(), e.getCause());
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ClientTestSideServiceImpl.java
......@@ -5,6 +5,7 @@ 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.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.exception.PatznException;
......@@ -49,6 +50,9 @@ public class ClientTestSideServiceImpl extends BaseServiceImpl<ClientTestSideMap
RestAssert.fail(StringUtils.isBlank(testSideJson), "检测单位信息为空");
try {
List<ClientTestSide> clientTestSideList = JSONArray.parseArray(testSideJson, ClientTestSide.class);
if (CollectionUtils.isEmpty(clientTestSideList)) {
return true;
}
this.saveOrUpdateBatch(clientTestSideList);
} catch (Exception e) {
logger.error(e.getMessage(), e.getCause());
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleServiceImpl.java
......@@ -118,6 +118,8 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
@Override
public boolean submitToProTechCheck(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要提交的合同！");
List<ContractSample> contractSamples = getBatchIds(Arrays.asList(ids));
RestAssert.fail(contractSamples.stream().anyMatch(t -> null == t.getType()), "检测类型为空");
ContractSample contractSample = new ContractSample();
contractSample.setStatus(ContractSampleStatusEnum.PRO_TEC_CHECK);
contractSample.setProgress(ContractSampleStatusEnum.PRO_TEC_CHECK);
......@@ -163,6 +165,8 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
@Override
public boolean submitToCheckAcceptReg(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要提交的合同！");
List<ContractSample> contractSamples = getBatchIds(Arrays.asList(ids));
RestAssert.fail(contractSamples.stream().anyMatch(t -> null == t.getType()), "检测类型为空");
ContractSample contractSample = new ContractSample();
contractSample.setStatus(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
contractSample.setProgress(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
......@@ -253,9 +257,11 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
@Transactional(rollbackFor = Exception.class)
@Override
public boolean submitCheckResultInput(Long[] ids, Account account) {
public boolean submitCheckResultInput(Long[] ids,String result, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要提交的合同！");
ContractSample contractSample = new ContractSample();
// 会审结论录入
contractSample.setTrialConclusion(result);
contractSample.setStatus(ContractSampleStatusEnum.CHECK_RESULT_INPUT);
contractSample.setProgress(ContractSampleStatusEnum.CHECK_RESULT_INPUT);
contractSampleRecordService.record(ids, ContractSampleStatusEnum.EXPERT_REVIEW, ContractSampleStatusEnum.CHECK_RESULT_INPUT, 0, "专家会审提交至验收结果录入", account);
......@@ -457,7 +463,7 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
continue;
}
// 固定开始行和开始列
int beginRowNum = 5,beginColumnNum = 1;
int beginRowNum = 5, beginColumnNum = 1;
// 最后一行
int lastRowNum = sheet.getLastRowNum();
if (lastRowNum < beginRowNum) {
......@@ -498,7 +504,7 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
continue;
}
if (sheet.getRow(beginRowNum - 1).getCell(k).getStringCellValue().equals("数量")) {
sample.setArrivalQuantity(((Double)row.getCell(k).getNumericCellValue()).toString());
sample.setArrivalQuantity(((Double) row.getCell(k).getNumericCellValue()).toString());
continue;
}
if (sheet.getRow(beginRowNum - 1).getCell(k).getStringCellValue().equals("货位")) {
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java
......@@ -1336,7 +1336,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
@Override
public Page<EntrustSampleItemVO> getItemFillProgressQuery(Page<EntrustSampleItemVO> page, EntrustSampleItemVO itemVO) {
return page.setRecords(baseMapper.selectItemFillProgress(itemVO));
return page.setRecords(baseMapper.selectItemFillProgress(page, itemVO));
}
/**
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/StandardServiceImpl.java
......@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
......@@ -32,8 +33,16 @@ public class StandardServiceImpl extends BaseServiceImpl<StandardMapper, Standar
@Override
public Page<Standard> page(Page<Standard> page, Standard standard) {
String code = standard.getCode(), name = standard.getName();
standard.setCode(null).setName(null);
Wrapper wrapper = new EntityWrapper<>(standard);
if (StringUtils.isNotBlank(code)) {
wrapper.like("code", code);
}
if (StringUtils.isNotBlank(name)) {
wrapper.like("name", name);
}
wrapper.orderBy("ctime", false);
return this.page(page, wrapper);
}
......@@ -44,12 +53,12 @@ public class StandardServiceImpl extends BaseServiceImpl<StandardMapper, Standar
@Override
public boolean abolish(Long[] ids, String reason, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择需要作废的检测标准");
RestAssert.fail(StringUtils.isBlank(reason),"请填写，作废原因！");
List<Standard> standards = super.list(Condition.create().in("id",ids).eq("effective",1));
if (CollectionUtils.isNotEmpty(standards)){
RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择需要作废的检测标准");
RestAssert.fail(StringUtils.isBlank(reason), "请填写，作废原因！");
List<Standard> standards = super.list(Condition.create().in("id", ids).eq("effective", 1));
if (CollectionUtils.isNotEmpty(standards)) {
for (Standard standard : standards) {
RestAssert.fail("检测标准："+standard.getCode()+"已经作废，请勿重复作废！");
RestAssert.fail("检测标准：" + standard.getCode() + "已经作废，请勿重复作废！");
}
}
Standard gradingStandard = new Standard();
......@@ -58,6 +67,6 @@ public class StandardServiceImpl extends BaseServiceImpl<StandardMapper, Standar
gradingStandard.setAbolishTime(new Date());
gradingStandard.setAbolishReason(reason);
gradingStandard.setEffective(1);
return super.update(gradingStandard,Condition.create().in("id",ids));
return super.update(gradingStandard, Condition.create().in("id", ids));
}
}
src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml
......@@ -118,6 +118,9 @@
status,
standard,
test_value,
tester,
tester_id,
test_time,
group_name,
group_id,
in_report
......@@ -273,10 +276,10 @@
<select id="selectItemFillProgress" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
with ix as (
select x.entrust_sample_item_id,
select x.company_id,x.entrust_sample_item_id,
(case when count(1) != sum(case when x.test_value is null then 0 else 1 end) then 0 else 1 end) "is_finish"
from entrust_sample_item_index x where x.deleted = 0
group by x.entrust_sample_item_id
group by x.company_id, x.entrust_sample_item_id
)
SELECT i.id,i.name,s.code AS "sampleCode",s.name AS "sampleName",
( case when i.status = 50 THEN '已提交' WHEN i.status = 40 and ix.is_finish = 1 then '已检测' else '检测中' end ) "handle_status",
......@@ -285,14 +288,14 @@
FROM
entrust_sample_item i
JOIN entrust_sample s ON i.entrust_sample_id = s.ID
LEFT JOIN ix on ix.entrust_sample_item_id = i.id
WHERE i.deleted = 0 AND s.deleted = 0
LEFT JOIN ix ix on ix.entrust_sample_item_id = i.id
WHERE i.deleted = 0 AND s.deleted = 0 and s.type = 0
AND s.entrust_id = #{vo.entrustId}
<if test="null != vo.name">
and i.name = #{vo.name}
and i.name like concat('%',#{vo.name},'%')
</if>
<if test="null != vo.sampleCode">
and s.code = #{vo.sampleCode}
and s.code like concat('%',#{vo.sampleCode},'%')
</if>
ORDER BY s.code ,i.name
</select>
......
src/test/java/resources/db_sql/hmhj/v150/20210810新增合同数据字段.sql 0 → 100644
/** created by meazty on 2021/8/11 11:43 **/
/** created by meazty on 2021/8/11 11:43 **/
ALTER TABLE "public"."contract_sample"
ADD COLUMN "trial_conclusion" varchar(64) COLLATE "pg_catalog"."default";
COMMENT ON COLUMN "public"."contract_sample"."trial_conclusion" IS '会审结论';
src/test/java/resources/db_sql/hmhj/v150/20210811新增委托单位相关表.sql 0 → 100644
-- ----------------------------
-- ----------------------------
-- Table structure for client_info
-- ----------------------------
DROP TABLE IF EXISTS "public"."client_info";
CREATE TABLE "public"."client_info" (
"id" int8 NOT NULL,
"org_id" int8,
"client" varchar(64) COLLATE "pg_catalog"."default",
"address" varchar(255) COLLATE "pg_catalog"."default",
"tel" varchar(128) COLLATE "pg_catalog"."default",
"company_id" int8,
"uid" int8,
"ctime" timestamp(0),
"ltime" timestamp(0),
"lid" int8,
"deleted" int2 DEFAULT 0
)
;
COMMENT ON COLUMN "public"."client_info"."org_id" IS '组织ID';
COMMENT ON COLUMN "public"."client_info"."client" IS '委托单位';
COMMENT ON COLUMN "public"."client_info"."address" IS '委托单位地址';
COMMENT ON COLUMN "public"."client_info"."tel" IS '联系方式';
COMMENT ON COLUMN "public"."client_info"."company_id" IS '企业ID';
COMMENT ON COLUMN "public"."client_info"."uid" IS '创建人ID';
COMMENT ON COLUMN "public"."client_info"."ctime" IS '创建时间';
COMMENT ON COLUMN "public"."client_info"."ltime" IS '最后修改时间';
COMMENT ON COLUMN "public"."client_info"."lid" IS '最后修改人ID';
COMMENT ON COLUMN "public"."client_info"."deleted" IS '是否删除0否1是';
COMMENT ON TABLE "public"."client_info" IS '委托单位配置信息';
-- ----------------------------
-- Table structure for client_test_side
-- ----------------------------
DROP TABLE IF EXISTS "public"."client_test_side";
CREATE TABLE "public"."client_test_side" (
"id" int8 NOT NULL,
"client_id" int8,
"test_side" varchar(150) COLLATE "pg_catalog"."default",
"test_address" varchar(180) COLLATE "pg_catalog"."default",
"test_contact" varchar(150) COLLATE "pg_catalog"."default",
"test_tel" varchar(150) COLLATE "pg_catalog"."default",
"company_id" int8,
"uid" int8,
"ctime" timestamp(0),
"ltime" timestamp(0),
"lid" int8,
"deleted" int2 DEFAULT 0
)
;
COMMENT ON COLUMN "public"."client_test_side"."client_id" IS '委托单位ID';
COMMENT ON COLUMN "public"."client_test_side"."test_side" IS '检测单位';
COMMENT ON COLUMN "public"."client_test_side"."test_address" IS '检测地址';
COMMENT ON COLUMN "public"."client_test_side"."test_contact" IS '检测联系人';
COMMENT ON COLUMN "public"."client_test_side"."test_tel" IS '检测联系方式';
COMMENT ON COLUMN "public"."client_test_side"."company_id" IS '企业ID';
COMMENT ON COLUMN "public"."client_test_side"."uid" IS '创建人ID';
COMMENT ON COLUMN "public"."client_test_side"."ctime" IS '创建时间';
COMMENT ON COLUMN "public"."client_test_side"."ltime" IS '最后修改时间';
COMMENT ON COLUMN "public"."client_test_side"."lid" IS '最后修改人ID';
COMMENT ON COLUMN "public"."client_test_side"."deleted" IS '是否删除0否1是';
COMMENT ON TABLE "public"."client_test_side" IS '委托单位下检测单位信息';
-- ----------------------------
-- Primary Key structure for table client_info
-- ----------------------------
ALTER TABLE "public"."client_info" ADD CONSTRAINT "entrust_config_pkey" PRIMARY KEY ("id");
-- ----------------------------
-- Primary Key structure for table client_test_side
-- ----------------------------
ALTER TABLE "public"."client_test_side" ADD CONSTRAINT "client_test_side_pkey" PRIMARY KEY ("id");
-- ----------------------------
-- 去除合同检测类型默认值 --
ALTER TABLE "public"."contract_sample" ALTER COLUMN type DROP DEFAULT;
\ No newline at end of file
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