feat: 医疗器械CURD调整

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/MedicalEquipmentController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
 import com.qunzhixinxi.hnqz.admin.entity.MedicalEquipment;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaDrugEnt;
+import com.qunzhixinxi.hnqz.admin.entity.base.BaseEntity;
 import com.qunzhixinxi.hnqz.admin.service.MedicalEquipmentService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
@@ -14,6 +15,7 @@ import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -50,7 +52,7 @@ public class MedicalEquipmentController {
 	 * @return
 	 */
 	@PostMapping
-	public R<?> save(@RequestBody MedicalEquipment medicalEquipment) {
+	public R<?> save(@Validated(BaseEntity.Create.class) @RequestBody MedicalEquipment medicalEquipment) {
 		int count = medicalEquipmentService.count(Wrappers.<MedicalEquipment>lambdaQuery()
 				.eq(MedicalEquipment::getDrugEntId, medicalEquipment.getDrugEntId())
 				.eq(MedicalEquipment::getName, medicalEquipment.getName()));
@@ -68,7 +70,7 @@ public class MedicalEquipmentController {
 	 * @return
 	 */
 	@PutMapping
-	public R<?> update(@RequestBody MedicalEquipment medicalEquipment) {
+	public R<?> update(@Validated(BaseEntity.Update.class) @RequestBody MedicalEquipment medicalEquipment) {
 		int count = medicalEquipmentService.count(Wrappers.<MedicalEquipment>lambdaQuery()
 				.eq(MedicalEquipment::getDrugEntId, medicalEquipment.getDrugEntId())
 				.eq(MedicalEquipment::getName, medicalEquipment.getName())
@@ -116,7 +118,7 @@ public class MedicalEquipmentController {
 	}
 
 	/**
-	 * 查询当前企业对应的医疗器械 TODO
+	 * 查询当前企业对应的医疗器械
 	 *
 	 * @return
 	 */
@@ -130,6 +132,14 @@ public class MedicalEquipmentController {
 		if (deptRelation == null) {
 			return R.ok(Collections.emptyList());
 		}
+		// 查询是否存在父级的父级
+		SysDeptRelation pDeptRelation = sysDeptRelationService.getOne(Wrappers.<SysDeptRelation>lambdaQuery()
+				.eq(SysDeptRelation::getDescendant, deptRelation.getAncestor())
+				.ne(SysDeptRelation::getAncestor, deptRelation.getAncestor()));
+		if (pDeptRelation != null && pDeptRelation.getAncestor() != 1) {
+			deptRelation = pDeptRelation;
+		}
+
 		// 查询企业对应药企id
 		WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.selectByDeptId(deptRelation.getAncestor());
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/MedicalEquipment.java

@@ -13,6 +13,8 @@ import com.qunzhixinxi.hnqz.admin.entity.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -33,16 +35,19 @@ public class MedicalEquipment extends Model<MedicalEquipment> {
     /**
      * 器械名称
      */
+	@NotBlank(message = "器械名称不能为空", groups = BaseEntity.Create.class)
     private String name;
 
     /**
      * 生产厂家
      */
+	@NotBlank(message = "生产厂家不能为空", groups = BaseEntity.Create.class)
     private String manufacturer;
 
     /**
      * 所属企业id
      */
+	@NotNull(message = "所属企业id不能为空", groups = BaseEntity.Create.class)
     private Integer drugEntId;
 
     /**
@@ -53,11 +58,13 @@ public class MedicalEquipment extends Model<MedicalEquipment> {
     /**
      * 规格
      */
+	@NotBlank(message = "规格不能为空", groups = BaseEntity.Create.class)
     private String specification;
 
     /**
      * 计量单位组名称
      */
+	@NotBlank(message = "计量单位组名称不能为空", groups = BaseEntity.Create.class)
     private String measureUnit;
 
     /**