diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/admin/ExpertWhiteEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/admin/ExpertWhiteEntity.java index 1c45796..77a8540 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/admin/ExpertWhiteEntity.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/admin/ExpertWhiteEntity.java @@ -32,6 +32,12 @@ public class ExpertWhiteEntity { @TableField("mobile") private String mobile; + /** + * 状态(1:正常 2:无效) + */ + @TableField("status") + private Integer status; + /** * 医院名称 */ diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertWhiteEntityService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertWhiteEntityService.java index 289d456..21e218b 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertWhiteEntityService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertWhiteEntityService.java @@ -36,6 +36,7 @@ public class ExpertWhiteEntityService { if (mobile != null){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ExpertWhiteEntity::getMobile, mobile); + queryWrapper.eq(ExpertWhiteEntity::getStatus, 1); ExpertWhiteEntity expertWhite = expertWhiteEntityDao.selectOne(queryWrapper); if (expertWhite != null) { return expertWhite; @@ -45,6 +46,7 @@ public class ExpertWhiteEntityService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ExpertWhiteEntity::getName, name); queryWrapper.eq(ExpertWhiteEntity::getHospitalName, hospitalName); + queryWrapper.eq(ExpertWhiteEntity::getStatus, 1); return expertWhiteEntityDao.selectOne(queryWrapper); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/constant/CaseplatformExpertWhiteStatusEnum.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/constant/CaseplatformExpertWhiteStatusEnum.java new file mode 100644 index 0000000..3a58589 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/constant/CaseplatformExpertWhiteStatusEnum.java @@ -0,0 +1,26 @@ +package net.lab1024.sa.admin.module.business.caseplatformcase.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import net.lab1024.sa.common.common.enumeration.BaseEnum; + +@AllArgsConstructor +@Getter +public enum CaseplatformExpertWhiteStatusEnum implements BaseEnum { + DEFAULT(1, "正常"), + BEFORE(2, "无效"), + ; + + private final Integer value; + + private final String desc; + + public static CaseplatformExpertWhiteStatusEnum getByVal(int val){ + for (CaseplatformExpertWhiteStatusEnum type: CaseplatformExpertWhiteStatusEnum.values()){ + if(type.getValue() == val){ + return type; + } + } + return null; + } +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformExpertWhiteController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformExpertWhiteController.java index c9e2e40..5bee7a2 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformExpertWhiteController.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformExpertWhiteController.java @@ -2,8 +2,10 @@ package net.lab1024.sa.admin.module.business.caseplatformcase.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.CaseplatformAcAppUpdateForm; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.CaseplatformCaseQueryForm; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.CaseplatformExpertWhiteQueryForm; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.UpdateCaseplatformExpertWhiteForm; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.CaseplatformCaseVO; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.GetCaseplatformExpertWhitePageVo; import net.lab1024.sa.admin.module.business.caseplatformcase.service.CaseplatformCaseService; @@ -50,7 +52,13 @@ public class CaseplatformExpertWhiteController { @ApiOperation("删除") @DeleteMapping("/caseplatformExpertWhite/delete/{id}") - public ResponseDTO deleteCaseplatformAcApp(@PathVariable("id") Long id) { + public ResponseDTO deleteCaseplatformExpertWhite(@PathVariable("id") Long id) { return caseplatformExpertWhiteService.delete(id); } + + @ApiOperation("修改状态") + @DeleteMapping("/caseplatformExpertWhite/update/{id}") + public ResponseDTO updateCaseplatformExpertWhite(@PathVariable("id") Long id,@RequestBody @Valid UpdateCaseplatformExpertWhiteForm form) { + return caseplatformExpertWhiteService.updateCaseplatformAcApp(id,form); + } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/UpdateCaseplatformExpertWhiteForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/UpdateCaseplatformExpertWhiteForm.java new file mode 100644 index 0000000..2c8476d --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/UpdateCaseplatformExpertWhiteForm.java @@ -0,0 +1,15 @@ +package net.lab1024.sa.admin.module.business.caseplatformcase.domain.form; + +import lombok.Data; +import net.lab1024.sa.admin.module.business.caseplatformcase.constant.CaseAcAppStatusEnum; +import net.lab1024.sa.admin.module.business.caseplatformcase.constant.CaseplatformExpertWhiteStatusEnum; +import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum; +import net.lab1024.sa.common.common.validator.enumeration.CheckEnum; + + +@Data +public class UpdateCaseplatformExpertWhiteForm { + @ApiModelPropertyEnum(value = CaseplatformExpertWhiteStatusEnum.class, desc = "状态") + @CheckEnum(value = CaseplatformExpertWhiteStatusEnum.class, message = "状态 错误") + private Integer status; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/GetCaseplatformExpertWhitePageVo.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/GetCaseplatformExpertWhitePageVo.java index 248f4a3..017572b 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/GetCaseplatformExpertWhitePageVo.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/GetCaseplatformExpertWhitePageVo.java @@ -17,6 +17,9 @@ public class GetCaseplatformExpertWhitePageVo { @ApiModelProperty(value = "手机号") private String mobile; + @ApiModelProperty(value = "状态") + private String status; + @ApiModelProperty(value = "医院名称") private String hospitalName; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformExpertWhiteService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformExpertWhiteService.java index 1f18a96..5f1005a 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformExpertWhiteService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformExpertWhiteService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import net.lab1024.sa.admin.module.app.expert.admin.ExpertWhiteEntity; import net.lab1024.sa.admin.module.app.expert.dao.ExpertWhiteEntityDao; import net.lab1024.sa.admin.module.business.area.domain.vo.ProvVO; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity.CaseplatformAcAppEntity; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.*; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.GetCaseplatformExpertWhitePageVo; import net.lab1024.sa.admin.module.system.login.domain.LoginEmployeeDetail; @@ -107,6 +108,7 @@ public class CaseplatformExpertWhiteService { expertWhite.setDepartment(department); expertWhite.setTitle(title); expertWhite.setMobile(mobile); + expertWhite.setStatus(1); expertWhite.setCreateTime(LocalDateTime.now()); expertWhiteEntityDao.insert(expertWhite); } @@ -123,4 +125,23 @@ public class CaseplatformExpertWhiteService { return ResponseDTO.ok(); } + + /** + * 修改状态-医生管理 + */ + public ResponseDTO updateCaseplatformAcApp(Long id,UpdateCaseplatformExpertWhiteForm form) { + // 检测申请是否存在 + ExpertWhiteEntity expertWhite = expertWhiteEntityDao.selectById(id); + if (expertWhite == null){ + return ResponseDTO.userErrorParam("操作失败"); + } + + if (!expertWhite.getStatus().equals(form.getStatus())){ + expertWhite.setStatus(form.getStatus()); + expertWhiteEntityDao.updateById(expertWhite); + } + + return ResponseDTO.ok(); + } + }