From 8ff8b4652c49fafbc31025cfe16e3c81bab37f9d Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 19 六月 2024 23:24:54 +0800
Subject: [PATCH] 计划执法时间添加
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index 67468d3..db43b7e 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -11,6 +11,7 @@
import com.project.common.exception.base.BaseException;
import com.project.common.utils.SecurityUtils;
import com.project.common.utils.StringUtils;
+import com.project.common.vo.KeyVal;
import com.project.enforce.domain.EnforceOrder;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
@@ -37,6 +38,7 @@
public class EnforceOrderServiceImpl extends ServiceImpl<EnforceOrderMapper, EnforceOrder> implements IEnforceOrderService {
private final ISysDeptService deptService;
+ private final EnforceOrderMapper orderMapper;
@Override//鍒楄〃鏌ヨ
@@ -53,22 +55,30 @@
public List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo)
{
SysUser loginUser = SecurityUtils.getLoginUser().getUser();
- if (!"01".equals(loginUser.getUserType())) {
- throw new BaseException("鎮ㄦ病鏈夊鎵规潈闄愶紝璇烽噸璇曪紒");
+ if (bo.getIsCheckQuery()!=null && bo.getIsCheckQuery()==1){
+ List<String> roleKeys = loginUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+ if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE) && roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)){
+ bo.setCheckLevel(null);
+ } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE)){
+ bo.setCheckLevel(0);
+ } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)) {
+ bo.setCheckLevel(1);
+ } else {
+ throw new BaseException("鎮ㄦ病鏈夊鎵规潈闄愶紝璇烽噸璇曪紒");
+ }
}
- List<String> roleKeys = loginUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
- if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE) && roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)){
- bo.setCheckLevel(null);
- } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE)){
- bo.setCheckLevel(0);
- } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)) {
- bo.setCheckLevel(1);
- } else {
- throw new BaseException("鎮ㄦ病鏈夊鎵规潈闄愶紝璇烽噸璇曪紒");
- }
+
bo.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(loginUser.getDeptId()));
+ bo.setApplyDeptIds(deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId()));
return this.baseMapper.selectCheckList(bo);
+ }
+
+ @Override//淇℃伅鍏紡鍒楄〃
+ public List<EnforceOrderVo> showList()
+ {
+ List<EnforceOrder> list = this.list(lq().eq(EnforceOrder::getIsShow, 1));
+ return Convert.toList(EnforceOrderVo.class, list);
}
@Override//id鏌ヨ
@@ -107,6 +117,17 @@
return this.removeByIds(ids);
}
+ @Override//鏈堝害鍒嗗竷
+ public List<KeyVal> getMonthCount(Long deptId) {
+ return orderMapper.getMonthCount(deptId);
+ }
+
+ @Override//閮ㄩ棬鍒嗗竷
+ public List<KeyVal> getDeptCount(String yearMonth)
+ {
+ return orderMapper.getDeptCount(yearMonth);
+ }
+
//-------------------------------------------------------------------------------------
@@ -133,12 +154,14 @@
qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());
qw.eq(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
+ qw.eq(StringUtils.isNotEmpty(bo.getEnforceType()), "enforce_type", bo.getEnforceType());
qw.eq(bo.getApplyId() != null, "apply_id", bo.getApplyId());
qw.eq(StringUtils.isNotEmpty(bo.getApplyUser()), "apply_user", bo.getApplyUser());
qw.eq(StringUtils.isNotEmpty(bo.getApplyPhone()), "apply_phone", bo.getApplyPhone());
qw.eq(bo.getApplyDeptId() != null, "apply_dept_id", bo.getApplyDeptId());
qw.like(StringUtils.isNotEmpty(bo.getApplyDeptName()), "apply_dept_name", bo.getApplyDeptName());
qw.eq(bo.getApplyTime() != null, "apply_time", bo.getApplyTime());
+ qw.eq(bo.getPlanTime() != null, "plan_time", bo.getPlanTime());
qw.eq(bo.getUserNum() != null, "user_num", bo.getUserNum());
qw.eq(bo.getWarnStatus() != null, "warn_status", bo.getWarnStatus());
qw.eq(StringUtils.isNotEmpty(bo.getWarnReason()), "warn_reason", bo.getWarnReason());
--
Gitblit v1.9.1