Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/HceReview.java

@@ -82,5 +82,10 @@ public class HceReview implements Serializable {
      */
     private Integer tenantId;
 
+    /**
+     * 处理内容
+     */
+    private String handleContent;
+
 
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceReviewServiceImpl.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.datascope.annotation.DataScope;
+import com.ruoyi.common.datascope.context.DataScopeContextHolder;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.security.utils.SecurityUtils;
@@ -17,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.function.LongToIntFunction;
 
 /**
  * <p>
@@ -35,6 +38,7 @@ public class HceReviewServiceImpl extends AbstractCrudService<HceReviewMapper, H
         hceReview.setNickName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         hceReview.setStatus(0);
         hceReview.setCreateTime(LocalDateTime.now());
+        hceReview.setDeptId(Integer.parseInt(String.valueOf(SecurityUtils.getLoginUser().getSysUser().getDeptId())));
         hceReview.setTenantId(SecurityUtils.getTenantId());
 
         this.save(hceReview);
@@ -59,6 +63,7 @@ public class HceReviewServiceImpl extends AbstractCrudService<HceReviewMapper, H
     }
 
     @Override
+    @DataScope
     public CommonPage<HceReview> page(HceReviewRequestVO requestVO){
         IPage<HceReview> page = new Page<>(requestVO.getPageNum(),requestVO.getPageSize());
         LambdaQueryWrapper<HceReview> queryWrapper = Wrappers.lambdaQuery();
@@ -66,6 +71,8 @@ public class HceReviewServiceImpl extends AbstractCrudService<HceReviewMapper, H
             queryWrapper.and(wrapper->wrapper.like(HceReview::getUserName,requestVO.getName()).or().like(HceReview::getNickName,requestVO.getName()));
         }
         queryWrapper.between(StringUtils.isNotBlank(requestVO.getStartTime())&&StringUtils.isNotBlank(requestVO.getEndTime()),HceReview::getCreateTime,requestVO.getStartTime(),requestVO.getEndTime())
+                .eq(requestVO.getStatus() != null,HceReview::getStatus,requestVO.getStatus())
+                .apply(DataScopeContextHolder.getDataScopeSql())
                 .orderByDesc(HceReview::getId);
         page = this.page(page,queryWrapper);
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/HceReviewRequestVO.java

@@ -10,6 +10,11 @@ public class HceReviewRequestVO {
      */
     private String name;
 
+    /**
+     * 处理状态
+     */
+    private Integer status;
+
     /**
      * 开始时间
      */

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/HceReviewMapper.xml

@@ -16,6 +16,7 @@
         <result column="handle_time" property="handleTime" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
+        <result column="handle_content" property="handleContent" />
     </resultMap>
 
 </mapper>