From cdb4df5b86eefa7c36e4746b7fc00d7d15b52ce6 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 21 六月 2024 19:53:34 +0800
Subject: [PATCH] 数据权限优化，执法内容添加
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 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 e22d765..7ca3bc4 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
@@ -16,6 +16,7 @@
import com.project.enforce.domain.EnforcePeer;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
+import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.mapper.EnforceOrderMapper;
@@ -55,9 +56,16 @@
public List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
- if (StringUtils.isNotEmpty(bo.getParams())) {
- qw.apply(bo.getParams().get("dataScope") != null, bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
- }
+ qw.apply(StringUtils.isNotEmpty(bo.getParams().get("dataScope").toString()), bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
+ List<EnforceOrder> list = this.list(qw);
+ return Convert.toList(EnforceOrderVo.class , list);
+ }
+
+ @Override//鎵ф硶涓婃姤鍒楄〃
+ @DataScope(deptAlias = "execute_dept_id", userAlias = "execute_id")
+ public List<EnforceOrderVo> getExecuteList(EnforceOrderQueryBo bo) {
+ QueryWrapper<EnforceOrder> qw = getQw(bo);
+ qw.apply(StringUtils.isNotEmpty(bo.getParams().get("dataScope").toString()), bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
}
@@ -74,6 +82,13 @@
bo.setApplyDeptIds(null);
}
return this.baseMapper.selectCheckList(bo);
+ }
+
+ @Override
+ public List<EnforceOrderVo> queryCheckedList(OrderCheckedQueryBo bo)
+ {
+ bo.setUserId(SecurityUtils.getUserId());
+ return this.baseMapper.selectCheckedList(bo);
}
@Override//淇℃伅鍏紡鍒楄〃
@@ -172,16 +187,38 @@
vos.add(new OrderNodeVo("瀹℃壒鎷掔粷",checkLog.getCheckUser(),checkLog.getCheckTime(), checkLog.getCheckReason()));
}
}
- } else {
- if (order.getInTime()!=null){
- vos.add(new OrderNodeVo("鎵爜鍏ヤ紒",order.getExecuteUser(),order.getInTime(), null));
- }
- if (order.getExecuteTime()!=null){
- vos.add(new OrderNodeVo("缁撴灉涓婃姤",order.getExecuteUser(),order.getExecuteTime(), null));
- }
+ }
+ if (order.getInTime()!=null){
+ vos.add(new OrderNodeVo("鎵爜鍏ヤ紒",order.getExecuteUser(),order.getInTime(), null));
+ }
+ if (order.getExecuteTime()!=null){
+ vos.add(new OrderNodeVo("缁撴灉涓婃姤",order.getExecuteUser(),order.getExecuteTime(), null));
}
return vos;
+ }
+
+ @Override//鎵爜缁撴灉
+ public List<EnforceOrderVo> getScanList(String companyCode)
+ {
+ Long userId = SecurityUtils.getUserId();
+ return this.baseMapper.selectScanList(companyCode, userId);
+ }
+
+ @Override//纭鎵爜鎵ф硶
+ @Transactional
+ public Boolean doScanOrder(Long orderId)
+ {
+ EnforceOrder order = this.getById(orderId);
+ order.setOrderStatus(3);
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ order.setExecuteId(user.getUserId());
+ order.setExecuteUser(user.getNickName());
+ order.setExecutePhone(user.getRecommendPhone());
+ order.setExecuteDeptId(user.getDeptId());
+ order.setExecuteDeptName(deptService.getDeptAllName(user.getDeptId()));
+ order.setInTime(DateUtils.getNowDate());
+ return this.updateById(order);
}
@@ -235,7 +272,8 @@
qw.eq(StringUtils.isNotEmpty(bo.getCompanyAddress()), "company_address", bo.getCompanyAddress());
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.like(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
+ qw.like(StringUtils.isNotEmpty(bo.getEnforceContent()), "enforce_content", bo.getEnforceContent());
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());
--
Gitblit v1.9.1