diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 9d26497..7b09c44 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -128,7 +128,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 9d26497..7b09c44 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -128,7 +128,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 99fca59..8778b11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -82,10 +82,10 @@ @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String") private String certifications; - @ApiModelProperty(value = "是否加急", dataType = "String") - private Boolean isUrgent; + @ApiModelProperty(value = "是否加急", dataType = "Integer") + private Integer isUrgent; - private Boolean isDel; + private Integer isDel; @ApiModelProperty(value = "创建人", dataType = "String") private Long createUser; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 9d26497..7b09c44 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -128,7 +128,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 99fca59..8778b11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -82,10 +82,10 @@ @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String") private String certifications; - @ApiModelProperty(value = "是否加急", dataType = "String") - private Boolean isUrgent; + @ApiModelProperty(value = "是否加急", dataType = "Integer") + private Integer isUrgent; - private Boolean isDel; + private Integer isDel; @ApiModelProperty(value = "创建人", dataType = "String") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java index ff9fd1c..4aa97c7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -33,11 +33,12 @@ private String phone; @ApiModelProperty(value = "删除标记", dataType = "String") - private String isDel; + private Integer isDel; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; @ApiModelProperty(value = "最后修改时间", dataType = "String") private String updateTime; + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 9d26497..7b09c44 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -128,7 +128,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 99fca59..8778b11 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -82,10 +82,10 @@ @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String") private String certifications; - @ApiModelProperty(value = "是否加急", dataType = "String") - private Boolean isUrgent; + @ApiModelProperty(value = "是否加急", dataType = "Integer") + private Integer isUrgent; - private Boolean isDel; + private Integer isDel; @ApiModelProperty(value = "创建人", dataType = "String") private Long createUser; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java index ff9fd1c..4aa97c7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java @@ -33,11 +33,12 @@ private String phone; @ApiModelProperty(value = "删除标记", dataType = "String") - private String isDel; + private Integer isDel; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; @ApiModelProperty(value = "最后修改时间", dataType = "String") private String updateTime; + } 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 ba5ef78..fe3e293 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 @@ -136,7 +136,7 @@ if (sampleInfo.getIsExistSample().equals("0")) { ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200; - }else { + } else { ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo); sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200; } @@ -194,7 +194,8 @@ String orderNo = NumberGeneratorUtil.getContactNo("wtsc", maxNo); AuthUser authUser = ShiroKit.getUser(); businessOrder.setCreateUser(authUser.getId()); - businessOrder.setCustomerNo(orderNo); + businessOrder.setOrderCode(orderNo); + businessOrder.setStatus("1"); } @@ -206,7 +207,7 @@ queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 2, "is_urgent", request.getIsUrgent()); queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo()); queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus()); - queryWrapper.eq("is_del",0); + queryWrapper.eq("is_del", 0); queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()), "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),