diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 27f9844..1f2bc20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -68,4 +68,10 @@ public ReturnDTO labAndGroup(@ApiParam("部门id") String deptId) { return ReturnUtil.success(labRelDeptService.getByDeptId(deptId)); } + + @ApiOperation("根据实验室及组别获取部门id") + @GetMapping("/getDeptIdByLabAndGroup") + public ReturnDTO getDeptIdByLabAndGroup(@ApiParam("实验室代码") String labCode, @ApiParam("组别代码") String groupNo) { + return ReturnUtil.success(labRelDeptService.getByLabAndGroup(labCode, groupNo)); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 27f9844..1f2bc20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -68,4 +68,10 @@ public ReturnDTO labAndGroup(@ApiParam("部门id") String deptId) { return ReturnUtil.success(labRelDeptService.getByDeptId(deptId)); } + + @ApiOperation("根据实验室及组别获取部门id") + @GetMapping("/getDeptIdByLabAndGroup") + public ReturnDTO getDeptIdByLabAndGroup(@ApiParam("实验室代码") String labCode, @ApiParam("组别代码") String groupNo) { + return ReturnUtil.success(labRelDeptService.getByLabAndGroup(labCode, groupNo)); + } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index e80a6ed..9fd9362 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; @@ -47,12 +48,28 @@ @TableField("equipment_name") private String equipmentName; + @NotEmpty(message = "实验室代码不能为空") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String") + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + /** - * 实验室名称 + * 组别代码 */ - @ApiModelProperty(value = "实验室名称", dataType = "String") - @TableField("lab_name") - private String labName; + @NotEmpty(message = "组别代码不能为空") + @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @ApiModelProperty(value = "组别代码(字典code)", dataType = "String") + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; /** * 开箱记录 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 27f9844..1f2bc20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -68,4 +68,10 @@ public ReturnDTO labAndGroup(@ApiParam("部门id") String deptId) { return ReturnUtil.success(labRelDeptService.getByDeptId(deptId)); } + + @ApiOperation("根据实验室及组别获取部门id") + @GetMapping("/getDeptIdByLabAndGroup") + public ReturnDTO getDeptIdByLabAndGroup(@ApiParam("实验室代码") String labCode, @ApiParam("组别代码") String groupNo) { + return ReturnUtil.success(labRelDeptService.getByLabAndGroup(labCode, groupNo)); + } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index e80a6ed..9fd9362 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; @@ -47,12 +48,28 @@ @TableField("equipment_name") private String equipmentName; + @NotEmpty(message = "实验室代码不能为空") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String") + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + /** - * 实验室名称 + * 组别代码 */ - @ApiModelProperty(value = "实验室名称", dataType = "String") - @TableField("lab_name") - private String labName; + @NotEmpty(message = "组别代码不能为空") + @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @ApiModelProperty(value = "组别代码(字典code)", dataType = "String") + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; /** * 开箱记录 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java index b1567a4..b7d7717 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.math.BigDecimal; @@ -73,12 +74,28 @@ @TableField("equipment_name") private String equipmentName; + @NotEmpty(message = "实验室代码不能为空") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String") + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + /** - * 实验室名称 + * 组别代码 */ - @ApiModelProperty(value = "实验室名称", dataType = "String") - @TableField("lab_name") - private String labName; + @NotEmpty(message = "组别代码不能为空") + @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @ApiModelProperty(value = "组别代码(字典code)", dataType = "String") + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; /** * 开箱记录 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 27f9844..1f2bc20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -68,4 +68,10 @@ public ReturnDTO labAndGroup(@ApiParam("部门id") String deptId) { return ReturnUtil.success(labRelDeptService.getByDeptId(deptId)); } + + @ApiOperation("根据实验室及组别获取部门id") + @GetMapping("/getDeptIdByLabAndGroup") + public ReturnDTO getDeptIdByLabAndGroup(@ApiParam("实验室代码") String labCode, @ApiParam("组别代码") String groupNo) { + return ReturnUtil.success(labRelDeptService.getByLabAndGroup(labCode, groupNo)); + } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index e80a6ed..9fd9362 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; @@ -47,12 +48,28 @@ @TableField("equipment_name") private String equipmentName; + @NotEmpty(message = "实验室代码不能为空") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String") + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + /** - * 实验室名称 + * 组别代码 */ - @ApiModelProperty(value = "实验室名称", dataType = "String") - @TableField("lab_name") - private String labName; + @NotEmpty(message = "组别代码不能为空") + @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @ApiModelProperty(value = "组别代码(字典code)", dataType = "String") + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; /** * 开箱记录 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java index b1567a4..b7d7717 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.math.BigDecimal; @@ -73,12 +74,28 @@ @TableField("equipment_name") private String equipmentName; + @NotEmpty(message = "实验室代码不能为空") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String") + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + /** - * 实验室名称 + * 组别代码 */ - @ApiModelProperty(value = "实验室名称", dataType = "String") - @TableField("lab_name") - private String labName; + @NotEmpty(message = "组别代码不能为空") + @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @ApiModelProperty(value = "组别代码(字典code)", dataType = "String") + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; /** * 开箱记录 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java index 87b7b8c..b8481e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -35,4 +35,17 @@ return dept; } + /** + * @param labCode + * @param groupNo + * @return + */ + @Override + public BizLabRelDept getByLabAndGroup(String labCode, String groupNo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("biz_lab_code",labCode); + queryWrapper.eq("group_no",groupNo); + return getOne(queryWrapper); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java index 27f9844..1f2bc20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemDeptController.java @@ -68,4 +68,10 @@ public ReturnDTO labAndGroup(@ApiParam("部门id") String deptId) { return ReturnUtil.success(labRelDeptService.getByDeptId(deptId)); } + + @ApiOperation("根据实验室及组别获取部门id") + @GetMapping("/getDeptIdByLabAndGroup") + public ReturnDTO getDeptIdByLabAndGroup(@ApiParam("实验室代码") String labCode, @ApiParam("组别代码") String groupNo) { + return ReturnUtil.success(labRelDeptService.getByLabAndGroup(labCode, groupNo)); + } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index e80a6ed..9fd9362 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; @@ -47,12 +48,28 @@ @TableField("equipment_name") private String equipmentName; + @NotEmpty(message = "实验室代码不能为空") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String") + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + /** - * 实验室名称 + * 组别代码 */ - @ApiModelProperty(value = "实验室名称", dataType = "String") - @TableField("lab_name") - private String labName; + @NotEmpty(message = "组别代码不能为空") + @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @ApiModelProperty(value = "组别代码(字典code)", dataType = "String") + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; /** * 开箱记录 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java index b1567a4..b7d7717 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfoApproval.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.math.BigDecimal; @@ -73,12 +74,28 @@ @TableField("equipment_name") private String equipmentName; + @NotEmpty(message = "实验室代码不能为空") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String") + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + /** - * 实验室名称 + * 组别代码 */ - @ApiModelProperty(value = "实验室名称", dataType = "String") - @TableField("lab_name") - private String labName; + @NotEmpty(message = "组别代码不能为空") + @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @ApiModelProperty(value = "组别代码(字典code)", dataType = "String") + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; /** * 开箱记录 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java index 87b7b8c..b8481e4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizLabRelDeptServiceImpl.java @@ -35,4 +35,17 @@ return dept; } + /** + * @param labCode + * @param groupNo + * @return + */ + @Override + public BizLabRelDept getByLabAndGroup(String labCode, String groupNo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("biz_lab_code",labCode); + queryWrapper.eq("group_no",groupNo); + return getOne(queryWrapper); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java index 659aade..f38e97b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizLabRelDeptService.java @@ -27,4 +27,6 @@ * @return */ BizLabRelDept getByDeptId(String deptId); + + BizLabRelDept getByLabAndGroup(String labCode, String groupNo); }