diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4ecac7..273b32e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -32,7 +32,8 @@ SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, - bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType" + bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType", + bo.is_urgent AS "isUrgent" FROM ( SELECT * @@ -53,7 +54,7 @@ AND bo.require_over_time > #{request.endTime} - + AND bo.is_urgent = #{request.isUrgent} ) bo diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index d04eb14..7bee168 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -83,6 +83,9 @@ @ExcelProperty(value = "应出具证书", order = 11) private Integer requireCertifications; + @ApiModelProperty(value = "是否加急", dataType = "Integer") + private Integer isUrgent; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a4ecac7..273b32e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -32,7 +32,8 @@ SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, - bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType" + bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType", + bo.is_urgent AS "isUrgent" FROM ( SELECT * @@ -53,7 +54,7 @@ AND bo.require_over_time > #{request.endTime} - + AND bo.is_urgent = #{request.isUrgent} ) bo diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index d04eb14..7bee168 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -83,6 +83,9 @@ @ExcelProperty(value = "应出具证书", order = 11) private Integer requireCertifications; + @ApiModelProperty(value = "是否加急", dataType = "Integer") + private Integer isUrgent; + @JSONField(serialize = false) private Integer measureType; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index f5c6f61..138a1e2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -202,7 +202,13 @@ @Override public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); - String dealType = "委托书" + ((status.equals("2")) ? "接收" : "退回"); + String dealType = ""; + if (status.equals("2")) { + dealType = "委托书接收" ; + doUpdateSampleStatus(orderCancelRequest.getId(),"1"); + } else { + dealType = "委托书退回"; + } int addDealRecordFlag = addDealRecord(orderCancelRequest, dealType); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); @@ -250,6 +256,7 @@ return dealRecordMapper.insert(businessDealRecord); } + /** * 强调正在做状态更新 */ @@ -324,6 +331,20 @@ return this.sampleRelationMapper.insert(sampleStatusPopulation); } + /** + * 强调正在做状态更新 + */ + private int doUpdateSampleStatus(Long orderId, String sampleStatus) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("order_id", orderId); +// queryWrapper.isNull("sampleStatus"); + BusinessOrderSampleRelation orderSample = new BusinessOrderSampleRelation(); + orderSample.setId(orderId); + orderSample.setSampleStatus(sampleStatus); + return this.sampleRelationMapper.update(orderSample, queryWrapper); + } + + private void doSampleListPopulation(BusinessOrder businessOrder) { businessOrder.getCustomerSampleInfoList().forEach( customerSampleInfo -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java index 3bbcaaf..75161b6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -224,13 +224,13 @@ if (StringUtils.isEmpty(validDeadline)) { return "0"; } - if (validDeadline.compareTo(sdf.format(new Date())) > 0) { + if (validDeadline.compareTo(sdf.format(new Date())) < 0) { return "2"; } Calendar date = Calendar.getInstance(); date.setTime(new Date()); date.add(Calendar.DAY_OF_MONTH, -30); - if (validDeadline.compareTo(sdf.format(date.getTime())) > 0) { + if (validDeadline.compareTo(sdf.format(date.getTime())) < 0) { return "1"; } return "0";