病区逻辑调整|日志注解

common/src/main/java/com/lantone/common/vo/GetAbnormalLogVO.java

@@ -1,6 +1,7 @@
 package com.lantone.common.vo;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -14,14 +15,17 @@ public class GetAbnormalLogVO extends Page {
     /**
      * 操作方式
      */
+    @ApiModelProperty(value = "操作方式")
     String operationWay;
     /**
      * 操作ip
      */
+    @ApiModelProperty(value = "操作ip")
     String operationIp;
 
     /**
      * 标记(0-操作方式 1-操作ip)
      */
+    @ApiModelProperty(value = "单独列表返回标记(0-操作方式 1-操作ip)")
     Integer mark;
 }

common/src/main/java/com/lantone/common/vo/GetLoginLogVO.java

@@ -1,6 +1,7 @@
 package com.lantone.common.vo;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -15,14 +16,17 @@ public class GetLoginLogVO extends Page {
     /**
      * 登录用户
      */
+    @ApiModelProperty(value = "登录用户")
     String loginName;
     /**
      * 登录ip
      */
+    @ApiModelProperty(value = "登录ip")
     String loginIp;
 
     /**
      * 标记(0-登录用户 1-登录ip)
      */
+    @ApiModelProperty(value = "单独列表返回标记(0-登录用户 1-登录ip)")
     Integer mark;
 }

common/src/main/java/com/lantone/common/vo/GetOperationLogVO.java

@@ -1,6 +1,7 @@
 package com.lantone.common.vo;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -15,10 +16,12 @@ public class GetOperationLogVO extends Page {
     /**
      * 操作用户
      */
+    @ApiModelProperty(value = "操作用户")
     String operationName;
     /**
      * 操作日期
      */
+    @ApiModelProperty(value = "操作日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     String operationDate;
 }

common/src/main/java/com/lantone/common/vo/GetRegionVO.java

@@ -21,6 +21,9 @@ public class GetRegionVO extends Page {
     @ApiModelProperty(value = "医院ID",hidden = true)
     private Long hospitalId;
 
+    @ApiModelProperty(value = "用户ID",hidden = true)
+    private Long userId;
+
     @ApiModelProperty(value = "关联科室")
     private String deptName;
 

dblayer-mbg/src/main/resources/mapper/RegionMapper.xml

@@ -38,7 +38,9 @@
         <if test='hospitalId != null and hospitalId != ""'>
             AND t1.hospital_id = #{hospitalId}
         </if>
-
+        <if test='userId != null and userId != ""'>
+            AND t1.creator = #{userId}
+        </if>
         <if test='name != null and name != ""'>
             and t1.name like CONCAT('%',#{name},'%')
         </if>

security-center/src/main/java/com/lantone/security/facade/RegionManagementFacade.java

@@ -106,6 +106,7 @@ public class RegionManagementFacade {
      */
     public IPage<ViewRegionDTO> getRegion(GetRegionVO getRegionVO) {
         getRegionVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
+        getRegionVO.setUserId(SysUserUtils.getCurrentPrincipleId());
         IPage<ViewRegionDTO> page = regionFacade.getWard(getRegionVO);
         List<ViewRegionDTO> wardList = page.getRecords();
         if (ListUtil.isNotEmpty(wardList) && StringUtil.isNotEmpty(getRegionVO.getDeptName())) {
@@ -131,12 +132,11 @@ public class RegionManagementFacade {
      */
     public Boolean deleteRegion(Integer id) {
         Long hospitalId = SysUserUtils.getCurrentHospitalId();
-        regionFacade.lambdaUpdate()
+        boolean flag = regionFacade.lambdaUpdate()
                 .eq(Region::getId,id)
-                .eq(Region::getHospitalId, hospitalId).remove();
-        boolean flag = regionDeptService.lambdaUpdate()
-                .eq(RegionDept::getRegionId, id)
-                .eq(RegionDept::getHospitalId, hospitalId).remove();
+                .eq(Region::getHospitalId, hospitalId)
+                .set(Region::getIsDeleted,IsDeleteEnum.Y.getKey())
+                .update();
         return flag;
     }