diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java new file mode 100644 index 0000000..bcb13d9 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums; + +/** + * @Description: 委托书状态类型枚举 + * @Author: wangpeng + * @Date: 2023/03/08 17:51 + */ +public interface OrderStatusEnum { + String TO_RECEIVE = "1"; //未接收 + String RECEIVE_COMPLETE = "2"; //已接收 + String CANCELED = "3"; //已取消 + String COMPLETE = "4"; //检测完成 +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java new file mode 100644 index 0000000..bcb13d9 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums; + +/** + * @Description: 委托书状态类型枚举 + * @Author: wangpeng + * @Date: 2023/03/08 17:51 + */ +public interface OrderStatusEnum { + String TO_RECEIVE = "1"; //未接收 + String RECEIVE_COMPLETE = "2"; //已接收 + String CANCELED = "3"; //已取消 + String COMPLETE = "4"; //检测完成 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java index 65c19e3..0f3e84f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -74,7 +74,7 @@ /** * 部门/科室/工程组名称 */ - @ExcelProperty("组织编号") + @ExcelProperty("组织名称") @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) @NotBlank(message = "计量组织名称不能为空") @TableField("organize_name") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java new file mode 100644 index 0000000..bcb13d9 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums; + +/** + * @Description: 委托书状态类型枚举 + * @Author: wangpeng + * @Date: 2023/03/08 17:51 + */ +public interface OrderStatusEnum { + String TO_RECEIVE = "1"; //未接收 + String RECEIVE_COMPLETE = "2"; //已接收 + String CANCELED = "3"; //已取消 + String COMPLETE = "4"; //检测完成 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java index 65c19e3..0f3e84f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -74,7 +74,7 @@ /** * 部门/科室/工程组名称 */ - @ExcelProperty("组织编号") + @ExcelProperty("组织名称") @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) @NotBlank(message = "计量组织名称不能为空") @TableField("organize_name") 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 585a207..5235310 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 @@ -12,20 +12,14 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.*; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.HandOutPropertyEnum; -import com.casic.missiles.enums.MeasureStatusEnum; -import com.casic.missiles.enums.MeterDictEnum; +import com.casic.missiles.enums.*; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.*; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.business.BusinessCertificateReport; -import com.casic.missiles.model.business.BusinessLabExecutiveInfo; -import com.casic.missiles.model.business.BusinessLabExecutiveOperateLog; -import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.model.business.*; import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; @@ -71,6 +65,8 @@ private AbstractDictService dictService; @Autowired private MeterStaffMapper staffMapper; + @Autowired + private BusinessOrderMapper orderMapper; @Override public Page handOutListPage(Page page, SampleHandOutListRequest handOutListRequest) throws Exception{ @@ -377,7 +373,9 @@ if(CollectionUtils.isEmpty(unExecutiveInfos)){ //更新样品状态为检测完 orderSampleRelationMapper.updateByOrderIdAndSampleId(pre.getOrderId(), pre.getSampleId(), SampleStatusEnum.MEASURE_COMPLETE); - // TODO: 2023/2/17 委托书中所有样品检测完更新委托书接收状态为检测完成，需求待定 + + //委托书中所有样品检测完更新委托书接收状态为检测完成，未检测完的数量为0则表示全部检完 + updateOrderStatusComplete(pre); //将检测记录加入到实验室检测模板（仅全部为检测完成的才加入到模板，包含终止的不会加入） List labList = new ArrayList<>(); @@ -407,6 +405,23 @@ throw new BusinessException(BusinessExceptionEnum.COMPLETE_SAMPLE_NOT_EXIST); } + @Transactional + public void updateOrderStatusComplete(SampleOperateRequest pre) { + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.eq("order_id", pre.getOrderId()); + List statusList = new ArrayList<>(); + statusList.add(SampleStatusEnum.TO_RECEIVE); + statusList.add(SampleStatusEnum.TO_HANDOUT); + statusList.add(SampleStatusEnum.IN_MEASURE); + wrapper1.in("sample_status", statusList); + if(orderSampleRelationMapper.selectCount(wrapper1) == 0){ + BusinessOrder businessOrder = new BusinessOrder(); + businessOrder.setId(pre.getOrderId()); + businessOrder.setStatus(OrderStatusEnum.COMPLETE); + orderMapper.updateById(businessOrder); + } + } + private BusinessLabExecutiveTemplateInfo getBusinessLabExecutiveTemplateInfo(Long maxNo, int i, BusinessLabExecutiveInfo lab) { BusinessLabExecutiveTemplateInfo templateInfo = new BusinessLabExecutiveTemplateInfo(); String templateCode = NumberGeneratorUtil.getContactNo("sysjcmb", maxNo + i); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java new file mode 100644 index 0000000..bcb13d9 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums; + +/** + * @Description: 委托书状态类型枚举 + * @Author: wangpeng + * @Date: 2023/03/08 17:51 + */ +public interface OrderStatusEnum { + String TO_RECEIVE = "1"; //未接收 + String RECEIVE_COMPLETE = "2"; //已接收 + String CANCELED = "3"; //已取消 + String COMPLETE = "4"; //检测完成 +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java index 65c19e3..0f3e84f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -74,7 +74,7 @@ /** * 部门/科室/工程组名称 */ - @ExcelProperty("组织编号") + @ExcelProperty("组织名称") @ApiModelProperty(value = "计量组织名称", dataType = "String", required = true) @NotBlank(message = "计量组织名称不能为空") @TableField("organize_name") 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 585a207..5235310 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 @@ -12,20 +12,14 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.*; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.HandOutPropertyEnum; -import com.casic.missiles.enums.MeasureStatusEnum; -import com.casic.missiles.enums.MeterDictEnum; +import com.casic.missiles.enums.*; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.*; import com.casic.missiles.mapper.meter.MeterOrganizeMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.business.BusinessCertificateReport; -import com.casic.missiles.model.business.BusinessLabExecutiveInfo; -import com.casic.missiles.model.business.BusinessLabExecutiveOperateLog; -import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo; +import com.casic.missiles.model.business.*; import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService; @@ -71,6 +65,8 @@ private AbstractDictService dictService; @Autowired private MeterStaffMapper staffMapper; + @Autowired + private BusinessOrderMapper orderMapper; @Override public Page handOutListPage(Page page, SampleHandOutListRequest handOutListRequest) throws Exception{ @@ -377,7 +373,9 @@ if(CollectionUtils.isEmpty(unExecutiveInfos)){ //更新样品状态为检测完 orderSampleRelationMapper.updateByOrderIdAndSampleId(pre.getOrderId(), pre.getSampleId(), SampleStatusEnum.MEASURE_COMPLETE); - // TODO: 2023/2/17 委托书中所有样品检测完更新委托书接收状态为检测完成，需求待定 + + //委托书中所有样品检测完更新委托书接收状态为检测完成，未检测完的数量为0则表示全部检完 + updateOrderStatusComplete(pre); //将检测记录加入到实验室检测模板（仅全部为检测完成的才加入到模板，包含终止的不会加入） List labList = new ArrayList<>(); @@ -407,6 +405,23 @@ throw new BusinessException(BusinessExceptionEnum.COMPLETE_SAMPLE_NOT_EXIST); } + @Transactional + public void updateOrderStatusComplete(SampleOperateRequest pre) { + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.eq("order_id", pre.getOrderId()); + List statusList = new ArrayList<>(); + statusList.add(SampleStatusEnum.TO_RECEIVE); + statusList.add(SampleStatusEnum.TO_HANDOUT); + statusList.add(SampleStatusEnum.IN_MEASURE); + wrapper1.in("sample_status", statusList); + if(orderSampleRelationMapper.selectCount(wrapper1) == 0){ + BusinessOrder businessOrder = new BusinessOrder(); + businessOrder.setId(pre.getOrderId()); + businessOrder.setStatus(OrderStatusEnum.COMPLETE); + orderMapper.updateById(businessOrder); + } + } + private BusinessLabExecutiveTemplateInfo getBusinessLabExecutiveTemplateInfo(Long maxNo, int i, BusinessLabExecutiveInfo lab) { BusinessLabExecutiveTemplateInfo templateInfo = new BusinessLabExecutiveTemplateInfo(); String templateCode = NumberGeneratorUtil.getContactNo("sysjcmb", maxNo + i); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchRemindMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchRemindMessageServiceImpl.java index 58ce952..6f6d1b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchRemindMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchRemindMessageServiceImpl.java @@ -61,9 +61,9 @@ wrapper.eq(StringUtils.isNotBlank(request.getMessageType()), "message_type", request.getMessageType()); wrapper.eq("status", 0); wrapper.apply(StringUtils.isNotBlank(request.getStartTime()), - "{0} <= DATE_FORMAT(train_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]); + "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getEndTime()), - "{0} >= DATE_FORMAT(train_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]); wrapper.orderByDesc("create_time"); return wrapper; }