diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 456f0a9..4de80d0 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-job - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 456f0a9..4de80d0 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-job - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 06cb258..444318c 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -56,7 +56,7 @@ @ApiOperation("任务单详情") @PostMapping("/detail") - public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 456f0a9..4de80d0 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-job - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 06cb258..444318c 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -56,7 +56,7 @@ @ApiOperation("任务单详情") @PostMapping("/detail") - public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 9cd7bb7..3e12111 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 456f0a9..4de80d0 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-job - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 06cb258..444318c 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -56,7 +56,7 @@ @ApiOperation("任务单详情") @PostMapping("/detail") - public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 9cd7bb7..3e12111 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 3a7b5ac..d995bca 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 456f0a9..4de80d0 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-job - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 06cb258..444318c 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -56,7 +56,7 @@ @ApiOperation("任务单详情") @PostMapping("/detail") - public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 9cd7bb7..3e12111 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 3a7b5ac..d995bca 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 58b85f5..4cc2779 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.dto.BaseRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -148,8 +150,13 @@ */ @ApiModelProperty(value = "接收状态(字典code)", dataType = "String") @TableField("receive_status") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_STATUS) private String receiveStatus; + @TableField(exist = false) + @ApiModelProperty(value = "接收状态名称", dataType = "String") + private String receiveStatusName; + /** * 接收说明 */ diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 456f0a9..4de80d0 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-job - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 06cb258..444318c 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -56,7 +56,7 @@ @ApiOperation("任务单详情") @PostMapping("/detail") - public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 9cd7bb7..3e12111 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 3a7b5ac..d995bca 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 58b85f5..4cc2779 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.dto.BaseRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -148,8 +150,13 @@ */ @ApiModelProperty(value = "接收状态(字典code)", dataType = "String") @TableField("receive_status") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_STATUS) private String receiveStatus; + @TableField(exist = false) + @ApiModelProperty(value = "接收状态名称", dataType = "String") + private String receiveStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 324f22d..068ffb6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +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; @@ -66,8 +68,14 @@ */ @ApiModelProperty(value = "样品在本次委托中分发的状态（字典code）", dataType = "String") @TableField("sample_status") + @DictCodeField(cacheName = MeterDictCode.SAMPLE_STATUS) private String sampleStatus; + + @TableField(exist = false) + @ApiModelProperty("接收状态名称") + private String sampleStatusName; + /** * 样品在本次委托中的备注 */ @@ -124,6 +132,27 @@ @TableField("measure_content") private String measureContent; + @ApiModelProperty(value = "检定完成度", dataType = "String") + @TableField(exist = false) + private String measureCompletePercent; + + public String getMeasureCompletePercent() { + if("1".equals(sampleStatus) || "2".equals(sampleStatus) || "9".equals(sampleStatus)){ + return "未检定"; + } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ + return "检定中"; + } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ + return "检定完"; + } else if("10".equals(sampleStatus)){ + return "已退回"; + } + return measureCompletePercent; + } + + @ApiModelProperty(value = "检定完成时间（最后一个实验室出具证书时间）", dataType = "String") + @TableField("measure_complete_time") + private String measureCompleteTime; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; @@ -132,5 +161,4 @@ @TableField("update_time") private String updateTime; - } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 456f0a9..4de80d0 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-job - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 06cb258..444318c 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -56,7 +56,7 @@ @ApiOperation("任务单详情") @PostMapping("/detail") - public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 9cd7bb7..3e12111 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 3a7b5ac..d995bca 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 58b85f5..4cc2779 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.dto.BaseRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -148,8 +150,13 @@ */ @ApiModelProperty(value = "接收状态(字典code)", dataType = "String") @TableField("receive_status") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_STATUS) private String receiveStatus; + @TableField(exist = false) + @ApiModelProperty(value = "接收状态名称", dataType = "String") + private String receiveStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 324f22d..068ffb6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +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; @@ -66,8 +68,14 @@ */ @ApiModelProperty(value = "样品在本次委托中分发的状态（字典code）", dataType = "String") @TableField("sample_status") + @DictCodeField(cacheName = MeterDictCode.SAMPLE_STATUS) private String sampleStatus; + + @TableField(exist = false) + @ApiModelProperty("接收状态名称") + private String sampleStatusName; + /** * 样品在本次委托中的备注 */ @@ -124,6 +132,27 @@ @TableField("measure_content") private String measureContent; + @ApiModelProperty(value = "检定完成度", dataType = "String") + @TableField(exist = false) + private String measureCompletePercent; + + public String getMeasureCompletePercent() { + if("1".equals(sampleStatus) || "2".equals(sampleStatus) || "9".equals(sampleStatus)){ + return "未检定"; + } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ + return "检定中"; + } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ + return "检定完"; + } else if("10".equals(sampleStatus)){ + return "已退回"; + } + return measureCompletePercent; + } + + @ApiModelProperty(value = "检定完成时间（最后一个实验室出具证书时间）", dataType = "String") + @TableField("measure_complete_time") + private String measureCompleteTime; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; @@ -132,5 +161,4 @@ @TableField("update_time") private String updateTime; - } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cf564e5..ec09616 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-common - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 456f0a9..4de80d0 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-job - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 06cb258..444318c 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -56,7 +56,7 @@ @ApiOperation("任务单详情") @PostMapping("/detail") - public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 9cd7bb7..3e12111 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 3a7b5ac..d995bca 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 58b85f5..4cc2779 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.dto.BaseRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -148,8 +150,13 @@ */ @ApiModelProperty(value = "接收状态(字典code)", dataType = "String") @TableField("receive_status") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_STATUS) private String receiveStatus; + @TableField(exist = false) + @ApiModelProperty(value = "接收状态名称", dataType = "String") + private String receiveStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 324f22d..068ffb6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +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; @@ -66,8 +68,14 @@ */ @ApiModelProperty(value = "样品在本次委托中分发的状态（字典code）", dataType = "String") @TableField("sample_status") + @DictCodeField(cacheName = MeterDictCode.SAMPLE_STATUS) private String sampleStatus; + + @TableField(exist = false) + @ApiModelProperty("接收状态名称") + private String sampleStatusName; + /** * 样品在本次委托中的备注 */ @@ -124,6 +132,27 @@ @TableField("measure_content") private String measureContent; + @ApiModelProperty(value = "检定完成度", dataType = "String") + @TableField(exist = false) + private String measureCompletePercent; + + public String getMeasureCompletePercent() { + if("1".equals(sampleStatus) || "2".equals(sampleStatus) || "9".equals(sampleStatus)){ + return "未检定"; + } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ + return "检定中"; + } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ + return "检定完"; + } else if("10".equals(sampleStatus)){ + return "已退回"; + } + return measureCompletePercent; + } + + @ApiModelProperty(value = "检定完成时间（最后一个实验室出具证书时间）", dataType = "String") + @TableField("measure_complete_time") + private String measureCompleteTime; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; @@ -132,5 +161,4 @@ @TableField("update_time") private String updateTime; - } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cf564e5..ec09616 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-common - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f7010f6..074d0a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -20,7 +20,7 @@ Page orderListPage(Page page, OrderListRequest request) throws Exception; - ReturnDTO orderDetail(Long id); + ReturnDTO orderDetail(Long id) throws Exception; ReturnDTO addOrder(BizBusinessOrderInfo businessOrder); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 456f0a9..4de80d0 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-job - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 06cb258..444318c 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -56,7 +56,7 @@ @ApiOperation("任务单详情") @PostMapping("/detail") - public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 9cd7bb7..3e12111 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 3a7b5ac..d995bca 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 58b85f5..4cc2779 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.dto.BaseRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -148,8 +150,13 @@ */ @ApiModelProperty(value = "接收状态(字典code)", dataType = "String") @TableField("receive_status") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_STATUS) private String receiveStatus; + @TableField(exist = false) + @ApiModelProperty(value = "接收状态名称", dataType = "String") + private String receiveStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 324f22d..068ffb6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +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; @@ -66,8 +68,14 @@ */ @ApiModelProperty(value = "样品在本次委托中分发的状态（字典code）", dataType = "String") @TableField("sample_status") + @DictCodeField(cacheName = MeterDictCode.SAMPLE_STATUS) private String sampleStatus; + + @TableField(exist = false) + @ApiModelProperty("接收状态名称") + private String sampleStatusName; + /** * 样品在本次委托中的备注 */ @@ -124,6 +132,27 @@ @TableField("measure_content") private String measureContent; + @ApiModelProperty(value = "检定完成度", dataType = "String") + @TableField(exist = false) + private String measureCompletePercent; + + public String getMeasureCompletePercent() { + if("1".equals(sampleStatus) || "2".equals(sampleStatus) || "9".equals(sampleStatus)){ + return "未检定"; + } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ + return "检定中"; + } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ + return "检定完"; + } else if("10".equals(sampleStatus)){ + return "已退回"; + } + return measureCompletePercent; + } + + @ApiModelProperty(value = "检定完成时间（最后一个实验室出具证书时间）", dataType = "String") + @TableField("measure_complete_time") + private String measureCompleteTime; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; @@ -132,5 +161,4 @@ @TableField("update_time") private String updateTime; - } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cf564e5..ec09616 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-common - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f7010f6..074d0a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -20,7 +20,7 @@ Page orderListPage(Page page, OrderListRequest request) throws Exception; - ReturnDTO orderDetail(Long id); + ReturnDTO orderDetail(Long id) throws Exception; ReturnDTO addOrder(BizBusinessOrderInfo businessOrder); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 0848091..dac1790 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -65,11 +65,16 @@ } @Override - public ReturnDTO orderDetail(Long id) { + public ReturnDTO orderDetail(Long id) throws Exception { BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); + DictCodeUtils.convertDictCodeToName(orderInfo); + // todo 交接单编号列表，另需补充根据交接单编号打印pdf的接口 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); + for (BizBusinessOrderSampleRelation bizBusinessOrderSampleRelation : orderSampleList) { + DictCodeUtils.convertDictCodeToName(bizBusinessOrderSampleRelation); + } orderInfo.setCustomerSampleInfoList(orderSampleList); return ReturnUtil.success(orderInfo); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index f581324..7bce6a9 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 573bac1..3518b0c 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 diff --git a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml index cdf249e..94f74dd 100644 --- a/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/board/BoardMessageMapper.xml @@ -107,7 +107,7 @@ ) union all - (select * from message_3 + (select * from message_4 ${ew.sqlSegment} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 456f0a9..4de80d0 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-job - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java index 06cb258..444318c 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/BizBusinessOrderInfoController.java @@ -56,7 +56,7 @@ @ApiOperation("任务单详情") @PostMapping("/detail") - public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO orderDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 9cd7bb7..3e12111 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.0.0.1 + 1.1.1.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 3a7b5ac..d995bca 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 58b85f5..4cc2779 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.dto.BaseRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -148,8 +150,13 @@ */ @ApiModelProperty(value = "接收状态(字典code)", dataType = "String") @TableField("receive_status") + @DictCodeField(message = "接收状态不合法", cacheName = MeterDictCode.ORDER_STATUS) private String receiveStatus; + @TableField(exist = false) + @ApiModelProperty(value = "接收状态名称", dataType = "String") + private String receiveStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 324f22d..068ffb6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +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; @@ -66,8 +68,14 @@ */ @ApiModelProperty(value = "样品在本次委托中分发的状态（字典code）", dataType = "String") @TableField("sample_status") + @DictCodeField(cacheName = MeterDictCode.SAMPLE_STATUS) private String sampleStatus; + + @TableField(exist = false) + @ApiModelProperty("接收状态名称") + private String sampleStatusName; + /** * 样品在本次委托中的备注 */ @@ -124,6 +132,27 @@ @TableField("measure_content") private String measureContent; + @ApiModelProperty(value = "检定完成度", dataType = "String") + @TableField(exist = false) + private String measureCompletePercent; + + public String getMeasureCompletePercent() { + if("1".equals(sampleStatus) || "2".equals(sampleStatus) || "9".equals(sampleStatus)){ + return "未检定"; + } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ + return "检定中"; + } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ + return "检定完"; + } else if("10".equals(sampleStatus)){ + return "已退回"; + } + return measureCompletePercent; + } + + @ApiModelProperty(value = "检定完成时间（最后一个实验室出具证书时间）", dataType = "String") + @TableField("measure_complete_time") + private String measureCompleteTime; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; @@ -132,5 +161,4 @@ @TableField("update_time") private String updateTime; - } diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cf564e5..ec09616 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.0.0.1 + 1.1.1.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-model - 1.0.0.1 + 1.1.1.1 com.casic casic-metering-common - 1.0.0.1 + 1.1.1.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java index f7010f6..074d0a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessOrderInfoService.java @@ -20,7 +20,7 @@ Page orderListPage(Page page, OrderListRequest request) throws Exception; - ReturnDTO orderDetail(Long id); + ReturnDTO orderDetail(Long id) throws Exception; ReturnDTO addOrder(BizBusinessOrderInfo businessOrder); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 0848091..dac1790 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -65,11 +65,16 @@ } @Override - public ReturnDTO orderDetail(Long id) { + public ReturnDTO orderDetail(Long id) throws Exception { BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); + DictCodeUtils.convertDictCodeToName(orderInfo); + // todo 交接单编号列表，另需补充根据交接单编号打印pdf的接口 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); + for (BizBusinessOrderSampleRelation bizBusinessOrderSampleRelation : orderSampleList) { + DictCodeUtils.convertDictCodeToName(bizBusinessOrderSampleRelation); + } orderInfo.setCustomerSampleInfoList(orderSampleList); return ReturnUtil.success(orderInfo); } diff --git a/pom.xml b/pom.xml index 093b9d1..543eb92 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.0.0.1 + 1.1.1.1 casic-metering-eqpt-xichang pom