diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index b89b4c2..12f85bc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -58,6 +58,16 @@ } /** + * 任务分发-查询各状态样品数量(待分发、检测中、检测完、已超期) + */ + @ApiOperation("任务分发-查询各状态样品数量") + @GetMapping("/handOut/amount") + @ResponseBody + public ReturnDTO> queryHandOutAmount() { + return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); + } + + /** * 任务分发-详情 */ @ApiOperation("任务分发-详情") @@ -131,6 +141,16 @@ } /** + * 实验室检测-我的检测-查询各状态样品数量(待检测、检测中、检测完) + */ + @ApiOperation("实验室检测-我的检测-查询各状态样品数量(待检测、检测中、检测完)") + @GetMapping("/myExecutive/amount") + @ResponseBody + public ReturnDTO> queryMyExecutiveAmount() { + return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount()); + } + + /** * 实验室检测-部门检测-分配(分配给具体人员) */ @ApiOperation("实验室检测-部门检测-分配按钮(分配给具体人员)") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index b89b4c2..12f85bc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -58,6 +58,16 @@ } /** + * 任务分发-查询各状态样品数量(待分发、检测中、检测完、已超期) + */ + @ApiOperation("任务分发-查询各状态样品数量") + @GetMapping("/handOut/amount") + @ResponseBody + public ReturnDTO> queryHandOutAmount() { + return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); + } + + /** * 任务分发-详情 */ @ApiOperation("任务分发-详情") @@ -131,6 +141,16 @@ } /** + * 实验室检测-我的检测-查询各状态样品数量(待检测、检测中、检测完) + */ + @ApiOperation("实验室检测-我的检测-查询各状态样品数量(待检测、检测中、检测完)") + @GetMapping("/myExecutive/amount") + @ResponseBody + public ReturnDTO> queryMyExecutiveAmount() { + return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount()); + } + + /** * 实验室检测-部门检测-分配(分配给具体人员) */ @ApiOperation("实验室检测-部门检测-分配按钮(分配给具体人员)") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleAmountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleAmountResponse.java new file mode 100644 index 0000000..68706f8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleAmountResponse.java @@ -0,0 +1,31 @@ +package com.casic.missiles.dto.business.labExecutive; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/23 9:02 + */ +@ApiModel +@NoArgsConstructor +@Data +public class SampleAmountResponse { + @DictCodeField(message = "检定状态不合法", cacheName = MeterDictCode.MEASURE_STATUS) + @ApiModelProperty(value = "状态(字典code)", dataType = "String") + private String status; + @ApiModelProperty(value = "状态(字典value)", dataType = "String") + private String statusName; + @ApiModelProperty(value = "数量", dataType = "Long") + private Long amount; + + public SampleAmountResponse(String status, Long amount) { + this.status = status; + this.amount = amount; + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index b89b4c2..12f85bc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -58,6 +58,16 @@ } /** + * 任务分发-查询各状态样品数量(待分发、检测中、检测完、已超期) + */ + @ApiOperation("任务分发-查询各状态样品数量") + @GetMapping("/handOut/amount") + @ResponseBody + public ReturnDTO> queryHandOutAmount() { + return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); + } + + /** * 任务分发-详情 */ @ApiOperation("任务分发-详情") @@ -131,6 +141,16 @@ } /** + * 实验室检测-我的检测-查询各状态样品数量(待检测、检测中、检测完) + */ + @ApiOperation("实验室检测-我的检测-查询各状态样品数量(待检测、检测中、检测完)") + @GetMapping("/myExecutive/amount") + @ResponseBody + public ReturnDTO> queryMyExecutiveAmount() { + return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount()); + } + + /** * 实验室检测-部门检测-分配(分配给具体人员) */ @ApiOperation("实验室检测-部门检测-分配按钮(分配给具体人员)") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleAmountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleAmountResponse.java new file mode 100644 index 0000000..68706f8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleAmountResponse.java @@ -0,0 +1,31 @@ +package com.casic.missiles.dto.business.labExecutive; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/23 9:02 + */ +@ApiModel +@NoArgsConstructor +@Data +public class SampleAmountResponse { + @DictCodeField(message = "检定状态不合法", cacheName = MeterDictCode.MEASURE_STATUS) + @ApiModelProperty(value = "状态(字典code)", dataType = "String") + private String status; + @ApiModelProperty(value = "状态(字典value)", dataType = "String") + private String statusName; + @ApiModelProperty(value = "数量", dataType = "Long") + private Long amount; + + public SampleAmountResponse(String status, Long amount) { + this.status = status; + this.amount = amount; + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index 12711bb..fbd37b7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -16,8 +18,8 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.HandOutPropertyEnum; import com.casic.missiles.enums.business.MeasureStatusEnum; -import com.casic.missiles.enums.meter.MeterDictEnum; import com.casic.missiles.enums.business.OrderStatusEnum; +import com.casic.missiles.enums.meter.MeterDictEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -134,6 +136,37 @@ } @Override + public List handOutAmount() { + SampleHandOutListRequest handOutListRequest = new SampleHandOutListRequest(); + Page page = getSampleHandOutListResponsePage(); + handOutListRequest.setSampleStatus(SampleStatusEnum.TO_HANDOUT); + Page toPage = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest); + Page page1 = getSampleHandOutListResponsePage(); + handOutListRequest.setSampleStatus(SampleStatusEnum.IN_MEASURE); + Page inPage = orderSampleRelationMapper.selectSampleListByStatus(page1, handOutListRequest); + Page page2 = getSampleHandOutListResponsePage(); + handOutListRequest.setSampleStatus(SampleStatusEnum.MEASURE_COMPLETE); + Page completePage = orderSampleRelationMapper.selectSampleListByStatus(page2, handOutListRequest); + Page page3 = getSampleHandOutListResponsePage(); + handOutListRequest.setSampleStatus(SampleStatusEnum.BE_OVERDUE); + Page overPage = orderSampleRelationMapper.selectSampleListByStatus(page3, handOutListRequest); + + SampleAmountResponse toAmount = new SampleAmountResponse(SampleStatusEnum.TO_HANDOUT, toPage.getTotal()); + SampleAmountResponse inAmount = new SampleAmountResponse(SampleStatusEnum.IN_MEASURE, inPage.getTotal()); + SampleAmountResponse completeAmount = new SampleAmountResponse(SampleStatusEnum.MEASURE_COMPLETE, completePage.getTotal()); + SampleAmountResponse overAmount = new SampleAmountResponse(SampleStatusEnum.BE_OVERDUE, overPage.getTotal()); + List resultList = new ArrayList<>(); + resultList.add(toAmount); + resultList.add(inAmount); + resultList.add(completeAmount); + resultList.add(overAmount); + for (SampleAmountResponse sampleAmountResponse : resultList) { + sampleAmountResponse.setStatusName(dictService.getDictNameByCode(MeterDictCode.SAMPLE_STATUS, sampleAmountResponse.getStatus())); + } + return resultList; + } + + @Override public SampleHandOutDetailResponse handOutListDetail(SampleHandOutDetailRequest request) throws Exception{ //根据样品id和委托书id查询样品、委托书、委托方 SampleHandOutDetailResponse sampleDetail = orderSampleRelationMapper.selectSampleDetail(request.getOrderId(), request.getSampleId()); @@ -328,6 +361,33 @@ } @Override + public List myExecutiveAmount() { + //登录用户id获取计量人员id,实验室检测信息中存储的是计量人员id + AuthUser user = ShiroKit.getUser(); + MeterStaff meterStaff = getMeterStaffInfo(user); + if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + Long userId = meterStaff.getId(); + Page page = getSampleLabExecutiveListResponsePage(); + Page page1 = getSampleLabExecutiveListResponsePage(); + Page page2 = getSampleLabExecutiveListResponsePage(); + SampleLabExecutiveListRequest labExecutiveListRequest = new SampleLabExecutiveListRequest(); + Page toPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.TO_MEASURE); + Page inPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page1, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE); + Page completePage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page2, labExecutiveListRequest, userId, MeasureStatusEnum.MEASURE_COMPLETE); + SampleAmountResponse toAmount = new SampleAmountResponse(MeasureStatusEnum.TO_MEASURE, toPage.getTotal()); + SampleAmountResponse inAmount = new SampleAmountResponse(MeasureStatusEnum.IN_MEASURE, inPage.getTotal()); + SampleAmountResponse completeAmount = new SampleAmountResponse(MeasureStatusEnum.MEASURE_COMPLETE, completePage.getTotal()); + List resultList = new ArrayList<>(); + resultList.add(toAmount); + resultList.add(inAmount); + resultList.add(completeAmount); + for (SampleAmountResponse sampleAmountResponse : resultList) { + sampleAmountResponse.setStatusName(dictService.getDictNameByCode(MeterDictCode.MEASURE_STATUS, sampleAmountResponse.getStatus())); + } + return resultList; + } + + @Override public ReturnDTO sampleReceive(List requestList) { //扫描收入会显示扫进来哪些,检测人员确定要扫描的样品后,调用接口,接口中查询是否在该用户的待检测中有该样品,没有则返回提示信息,有则更新状态 //该接口前应该有个根据标签查询样品信息的接口(查样品和委托书关联表中最新的委托书的样品列表) @@ -581,6 +641,20 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private Page getSampleHandOutListResponsePage() { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSize(1); + return page; + } + + private Page getSampleLabExecutiveListResponsePage() { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSize(1); + return page; + } + private QueryWrapper getOperateLogWrapper(SampleHandOutListResponse handOut) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", handOut.getOrderId()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java index b89b4c2..12f85bc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java @@ -58,6 +58,16 @@ } /** + * 任务分发-查询各状态样品数量(待分发、检测中、检测完、已超期) + */ + @ApiOperation("任务分发-查询各状态样品数量") + @GetMapping("/handOut/amount") + @ResponseBody + public ReturnDTO> queryHandOutAmount() { + return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); + } + + /** * 任务分发-详情 */ @ApiOperation("任务分发-详情") @@ -131,6 +141,16 @@ } /** + * 实验室检测-我的检测-查询各状态样品数量(待检测、检测中、检测完) + */ + @ApiOperation("实验室检测-我的检测-查询各状态样品数量(待检测、检测中、检测完)") + @GetMapping("/myExecutive/amount") + @ResponseBody + public ReturnDTO> queryMyExecutiveAmount() { + return ReturnUtil.success(labExecutiveInfoService.myExecutiveAmount()); + } + + /** * 实验室检测-部门检测-分配(分配给具体人员) */ @ApiOperation("实验室检测-部门检测-分配按钮(分配给具体人员)") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleAmountResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleAmountResponse.java new file mode 100644 index 0000000..68706f8 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleAmountResponse.java @@ -0,0 +1,31 @@ +package com.casic.missiles.dto.business.labExecutive; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/23 9:02 + */ +@ApiModel +@NoArgsConstructor +@Data +public class SampleAmountResponse { + @DictCodeField(message = "检定状态不合法", cacheName = MeterDictCode.MEASURE_STATUS) + @ApiModelProperty(value = "状态(字典code)", dataType = "String") + private String status; + @ApiModelProperty(value = "状态(字典value)", dataType = "String") + private String statusName; + @ApiModelProperty(value = "数量", dataType = "Long") + private Long amount; + + public SampleAmountResponse(String status, Long amount) { + this.status = status; + this.amount = amount; + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java index 12711bb..fbd37b7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -16,8 +18,8 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.HandOutPropertyEnum; import com.casic.missiles.enums.business.MeasureStatusEnum; -import com.casic.missiles.enums.meter.MeterDictEnum; import com.casic.missiles.enums.business.OrderStatusEnum; +import com.casic.missiles.enums.meter.MeterDictEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -134,6 +136,37 @@ } @Override + public List handOutAmount() { + SampleHandOutListRequest handOutListRequest = new SampleHandOutListRequest(); + Page page = getSampleHandOutListResponsePage(); + handOutListRequest.setSampleStatus(SampleStatusEnum.TO_HANDOUT); + Page toPage = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest); + Page page1 = getSampleHandOutListResponsePage(); + handOutListRequest.setSampleStatus(SampleStatusEnum.IN_MEASURE); + Page inPage = orderSampleRelationMapper.selectSampleListByStatus(page1, handOutListRequest); + Page page2 = getSampleHandOutListResponsePage(); + handOutListRequest.setSampleStatus(SampleStatusEnum.MEASURE_COMPLETE); + Page completePage = orderSampleRelationMapper.selectSampleListByStatus(page2, handOutListRequest); + Page page3 = getSampleHandOutListResponsePage(); + handOutListRequest.setSampleStatus(SampleStatusEnum.BE_OVERDUE); + Page overPage = orderSampleRelationMapper.selectSampleListByStatus(page3, handOutListRequest); + + SampleAmountResponse toAmount = new SampleAmountResponse(SampleStatusEnum.TO_HANDOUT, toPage.getTotal()); + SampleAmountResponse inAmount = new SampleAmountResponse(SampleStatusEnum.IN_MEASURE, inPage.getTotal()); + SampleAmountResponse completeAmount = new SampleAmountResponse(SampleStatusEnum.MEASURE_COMPLETE, completePage.getTotal()); + SampleAmountResponse overAmount = new SampleAmountResponse(SampleStatusEnum.BE_OVERDUE, overPage.getTotal()); + List resultList = new ArrayList<>(); + resultList.add(toAmount); + resultList.add(inAmount); + resultList.add(completeAmount); + resultList.add(overAmount); + for (SampleAmountResponse sampleAmountResponse : resultList) { + sampleAmountResponse.setStatusName(dictService.getDictNameByCode(MeterDictCode.SAMPLE_STATUS, sampleAmountResponse.getStatus())); + } + return resultList; + } + + @Override public SampleHandOutDetailResponse handOutListDetail(SampleHandOutDetailRequest request) throws Exception{ //根据样品id和委托书id查询样品、委托书、委托方 SampleHandOutDetailResponse sampleDetail = orderSampleRelationMapper.selectSampleDetail(request.getOrderId(), request.getSampleId()); @@ -328,6 +361,33 @@ } @Override + public List myExecutiveAmount() { + //登录用户id获取计量人员id,实验室检测信息中存储的是计量人员id + AuthUser user = ShiroKit.getUser(); + MeterStaff meterStaff = getMeterStaffInfo(user); + if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + Long userId = meterStaff.getId(); + Page page = getSampleLabExecutiveListResponsePage(); + Page page1 = getSampleLabExecutiveListResponsePage(); + Page page2 = getSampleLabExecutiveListResponsePage(); + SampleLabExecutiveListRequest labExecutiveListRequest = new SampleLabExecutiveListRequest(); + Page toPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.TO_MEASURE); + Page inPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page1, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE); + Page completePage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page2, labExecutiveListRequest, userId, MeasureStatusEnum.MEASURE_COMPLETE); + SampleAmountResponse toAmount = new SampleAmountResponse(MeasureStatusEnum.TO_MEASURE, toPage.getTotal()); + SampleAmountResponse inAmount = new SampleAmountResponse(MeasureStatusEnum.IN_MEASURE, inPage.getTotal()); + SampleAmountResponse completeAmount = new SampleAmountResponse(MeasureStatusEnum.MEASURE_COMPLETE, completePage.getTotal()); + List resultList = new ArrayList<>(); + resultList.add(toAmount); + resultList.add(inAmount); + resultList.add(completeAmount); + for (SampleAmountResponse sampleAmountResponse : resultList) { + sampleAmountResponse.setStatusName(dictService.getDictNameByCode(MeterDictCode.MEASURE_STATUS, sampleAmountResponse.getStatus())); + } + return resultList; + } + + @Override public ReturnDTO sampleReceive(List requestList) { //扫描收入会显示扫进来哪些,检测人员确定要扫描的样品后,调用接口,接口中查询是否在该用户的待检测中有该样品,没有则返回提示信息,有则更新状态 //该接口前应该有个根据标签查询样品信息的接口(查样品和委托书关联表中最新的委托书的样品列表) @@ -581,6 +641,20 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private Page getSampleHandOutListResponsePage() { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSize(1); + return page; + } + + private Page getSampleLabExecutiveListResponsePage() { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSize(1); + return page; + } + private QueryWrapper getOperateLogWrapper(SampleHandOutListResponse handOut) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", handOut.getOrderId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java index 5bd3d6c..e98da87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java @@ -20,6 +20,8 @@ Page handOutListPage(Page page, SampleHandOutListRequest handOutListRequest) throws Exception; + List handOutAmount(); + SampleHandOutDetailResponse handOutListDetail(SampleHandOutDetailRequest SampleHandOutDetailRequest) throws Exception; List handOutInitList(SampleHandOutInitListRequest handOutInitListRequest); @@ -30,6 +32,8 @@ Page myLabExecutiveListPage(Page page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception; + List myExecutiveAmount(); + ReturnDTO sampleReceive(List requestList); ReturnDTO sampleExecutiveComplete(List requestList); @@ -43,5 +47,4 @@ ReturnDTO sampleExecutiveSendBack(ExecutiveSendBackRequest request); ReturnDTO allocateStaff(SampleAllocateRequest sampleAllocateRequest); - }