Skip to content

P
patzn-cloud-service-hmhj
Commit 1564409a by wangweidong
Options

土工平台修改

parent c9e42f3d
Showing with 141 additions and 6 deletions
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSampleController.java
......@@ -229,6 +229,34 @@ public class ContractSampleController extends ServiceController {
@ApiOperation("验收组织历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_check_accept_org_his")
public RestResult<Page<ContractSampleVO>> getPageCheckAcceptOrgHis(ContractSampleVO contractSample) {
contractSample.setStatus(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
return success(contractSampleService.pageCheckAcceptOrgHis(getPage(), contractSample));
}
@ApiOperation("专家会审历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_expert_review_his")
public RestResult<Page<ContractSampleVO>> getPageExpertReviewHis(ContractSampleVO contractSample) {
contractSample.setStatus(ContractSampleStatusEnum.EXPERT_REVIEW);
return success(contractSampleService.pageCheckAcceptOrgHis(getPage(), contractSample));
}
@ApiOperation("专家会审分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.google.common.collect.Lists;
import com.patzn.cloud.service.hmhj.dto.EntrustDTO;
import com.patzn.cloud.service.hmhj.entity.Entrust;
import com.patzn.cloud.service.hmhj.enums.*;
......@@ -62,6 +63,65 @@ public class EntrustController extends ServiceController {
}
@ApiOperation("外委登记历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_out_his")
public RestResult<Page<EntrustVO>> getPageOutHis(EntrustVO entrust) {
entrust.setStatusList(Lists.newArrayList(
EntrustStatusEnum.OUT_INPUT
));
return success(entrustService.pageVO(getPage(), entrust));
}
@ApiOperation("委托登记历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_reg_his")
public RestResult<Page<EntrustVO>> getPageRegHis(EntrustVO entrust) {
entrust.setStatusList(Lists.newArrayList(
EntrustStatusEnum.CHECK,
EntrustStatusEnum.MAKE,
EntrustStatusEnum.TEST,
EntrustStatusEnum.QUALITY_CHECK
));
return success(entrustService.pageVO(getPage(), entrust));
}
@ApiOperation("委托评审历史分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_check_his")
public RestResult<Page<EntrustVO>> getPageCheckHis(EntrustVO entrust) {
entrust.setStatusList(Lists.newArrayList(
EntrustStatusEnum.MAKE,
EntrustStatusEnum.TEST,
EntrustStatusEnum.QUALITY_CHECK
));
return success(entrustService.pageVO(getPage(), entrust));
}
@ApiOperation("外委数据录入分页列表")
@ApiImplicitParams({
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IContractSampleService.java
......@@ -46,4 +46,6 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
Page<ContractSampleVO> pageVO(Page<ContractSampleVO> page, ContractSampleVO contractSample);
boolean addDTO(ContractSampleDTO dto);
Page<ContractSampleVO> pageCheckAcceptOrgHis(Page<ContractSampleVO> page, ContractSampleVO contractSample);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustService.java
......@@ -48,4 +48,6 @@ public interface IEntrustService extends IBaseService<Entrust> {
Page<EntrustVO> pageEntrustJudge(Page<EntrustVO> page, EntrustVO entrust);
boolean outInputSubmitToQualityCheck(Long[] ids, Account account);
Page<EntrustVO> pageVO(Page<EntrustVO> page, EntrustVO entrust);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleServiceImpl.java
......@@ -7,6 +7,7 @@ import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
import com.patzn.cloud.service.hmhj.entity.ContractSample;
import com.patzn.cloud.service.hmhj.entity.ContractSampleItem;
import com.patzn.cloud.service.hmhj.entity.ContractSampleRecord;
import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
......@@ -25,6 +26,7 @@ import com.baomidou.mybatisplus.plugins.Page;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.stream.Collectors;
/**
* 服务实现类
......@@ -222,4 +224,26 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
}
@Override
public Page<ContractSampleVO> pageCheckAcceptOrgHis(Page<ContractSampleVO> page, ContractSampleVO contractSample) {
List<ContractSampleRecord> recordList = contractSampleRecordService.list(Condition.create().setSqlSelect("contract_sample_id").eq("origin",contractSample.getStatus().getDisplay()).groupBy("contract_sample_id"));
if (CollectionUtils.isEmpty(recordList)){
return page;
}
List<Long> sampleIds = recordList.stream().map(r->{
return r.getContractSampleId();
}).collect(Collectors.toList());
if (CollectionUtils.isEmpty(sampleIds)){
return page;
}
contractSample.setIdList(sampleIds);
contractSample.setStatus(null);
return page.setRecords(baseMapper.selectVOList(page,contractSample));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java
......@@ -151,7 +151,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
entrust.setStatus(EntrustStatusEnum.CHECK);
entrust.setProgress(EntrustStatusEnum.CHECK);
if (update(entrust,Condition.create().in("id",ids))){
entrustRecordService.record(ids,EntrustStatusEnum.DRAFT.getName(),EntrustStatusEnum.CHECK.getName(),0,account,"提交至委托审核");
entrustRecordService.record(ids,EntrustStatusEnum.DRAFT.getDisplay(),EntrustStatusEnum.CHECK.getDisplay(),0,account,"提交至委托审核");
lmsMsgService.sendMsg("/hmhj/entrust_manage/entrust_review","有委托从委托登记提交过来，请及时审核","新的委托审核任务！",account,null);
}
return true;
......@@ -168,7 +168,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
entrust.setStatus(EntrustStatusEnum.OUT_INPUT);
entrust.setProgress(EntrustStatusEnum.OUT_INPUT);
if (update(entrust,Condition.create().in("id",ids))){
entrustRecordService.record(ids,EntrustStatusEnum.OUT_DRAFT.getName(),EntrustStatusEnum.OUT_INPUT.getName(),0,account,"提交至外委数据录入");
entrustRecordService.record(ids,EntrustStatusEnum.OUT_DRAFT.getDisplay(),EntrustStatusEnum.OUT_INPUT.getDisplay(),0,account,"提交至外委数据录入");
lmsMsgService.sendMsg("/hmhj/accept_manage/sub_input","有外委登记提交过来，请及时填写外委数据","新的委托外委数据录入任务！",account,null);
}
return true;
......@@ -186,7 +186,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
entrust.setStatus(EntrustStatusEnum.DRAFT);
entrust.setProgress(EntrustStatusEnum.BACK_CHECK);
if (update(entrust,Condition.create().in("id",ids))){
entrustRecordService.record(ids,EntrustStatusEnum.CHECK.getName(),EntrustStatusEnum.DRAFT.getName(),1,account,reason);
entrustRecordService.record(ids,EntrustStatusEnum.CHECK.getDisplay(),EntrustStatusEnum.DRAFT.getDisplay(),1,account,reason);
lmsMsgService.sendMsg("/hmhj/entrust_manage/entrust_register","有委托从委托审核驳回，请及时查看退回原因并处理","新的委托审核退回任务！",account,null);
}
return true;
......@@ -201,7 +201,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
entrust.setStatus(EntrustStatusEnum.MAKE);
entrust.setProgress(EntrustStatusEnum.MAKE);
if (update(entrust,Condition.create().in("id",ids))){
entrustRecordService.record(ids,EntrustStatusEnum.CHECK.getName(),EntrustStatusEnum.MAKE.getName(),0,account,"提交至样品待制备");
entrustRecordService.record(ids,EntrustStatusEnum.CHECK.getDisplay(),EntrustStatusEnum.MAKE.getDisplay(),0,account,"提交至样品待制备");
lmsMsgService.sendMsg("/hmhj/sample_manage/sample_prepare","有委托审核通过，请及时进行样品的制备","新的样品制备任务！",account,null);
}
return true;
......@@ -217,7 +217,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
entrust.setStatus(EntrustStatusEnum.MAKE);
entrust.setProgress(EntrustStatusEnum.MAKE);
if (update(entrust,Condition.create().in("id",ids))){
entrustRecordService.record(ids,EntrustStatusEnum.DRAFT.getName(),EntrustStatusEnum.MAKE.getName(),0,account,"委托登记提交至样品待制备");
entrustRecordService.record(ids,EntrustStatusEnum.DRAFT.getDisplay(),EntrustStatusEnum.MAKE.getDisplay(),0,account,"委托登记提交至样品待制备");
lmsMsgService.sendMsg("/hmhj/sample_manage/sample_prepare","有委托登记提交至样品待制备，请及时进行样品的制备","新的样品制备任务！",account,null);
}
return true;
......@@ -482,11 +482,16 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
entrustSample.setStatus(EntrustSampleStatusEnum.END);
entrustSample.setProgress(EntrustSampleStatusEnum.END);
entrustSampleService.update(entrustSample,Condition.create().in("entrust_id",ids));
entrustRecordService.record(ids,EntrustStatusEnum.OUT_INPUT.getName(),EntrustStatusEnum.QUALITY_CHECK.getName(),0,account,"外委数据录入提交至质量判定");
entrustRecordService.record(ids,EntrustStatusEnum.OUT_INPUT.getDisplay(),EntrustStatusEnum.QUALITY_CHECK.getDisplay(),0,account,"外委数据录入提交至质量判定");
lmsMsgService.sendMsg("/hmhj/quality_manage/quality_decide","有外委数据录入提交过来进行质量判定，请及时进行质量判定","新的质量判定任务！",account,null);
}
return true;
}
@Override
public Page<EntrustVO> pageVO(Page<EntrustVO> page, EntrustVO entrust) {
return page.setRecords(baseMapper.selectVOList(page,entrust));
}
}
src/main/resources/mapper/hmhj/ContractSampleMapper.xml
......@@ -13,6 +13,13 @@
#{status}
</foreach>
</if>
<if test="null!=vo.idList">
AND s.id IN
<foreach collection="vo.idList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</sql>
<select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.ContractSampleVO">
......
src/main/resources/mapper/hmhj/EntrustMapper.xml
......@@ -26,6 +26,13 @@
#{id}
</foreach>
</if>
<if test="null!=vo.statusList">
AND status IN
<foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
#{status}
</foreach>
</if>
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment