From 6acee0d1d79a05f7a3a3c386e9df02e9a741f544 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 21 六月 2024 17:21:16 +0800
Subject: [PATCH] 执法单节点添加，审批修改
---
project-enforce/src/main/java/com/project/enforce/domain/vo/OrderNodeVo.java | 37 +++++++
project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 6 +
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java | 7 +
project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java | 10 +
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 2
project-common/src/main/java/com/project/common/core/domain/BaseQuery.java | 13 ++
project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java | 7 +
project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java | 8 +
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java | 2
project-system/src/main/resources/mapper/system/SysUserMapper.xml | 16 ++-
project-system/src/main/java/com/project/system/service/ISysDeptService.java | 1
project-admin/src/main/resources/application.yml | 1
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 37 +++++++
project-system/src/main/resources/mapper/system/SysRoleMapper.xml | 4
project-admin/src/main/java/com/project/admin/controller/tool/TestController.java | 37 +++++++
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 70 +++++++++++--
project-system/src/main/resources/mapper/system/SysDeptMapper.xml | 4
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java | 2
project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml | 15 --
project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java | 14 +-
20 files changed, 246 insertions(+), 47 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index 8458e58..0042cd2 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -4,13 +4,20 @@
import com.project.common.annotation.RepeatSubmit;
import com.project.common.core.controller.BaseController;
import com.project.common.core.domain.AjaxResult;
+import com.project.common.core.domain.entity.SysDept;
+import com.project.common.core.domain.entity.SysUser;
import com.project.common.core.page.TableDataInfo;
import com.project.common.enums.BusinessType;
+import com.project.common.utils.SecurityUtils;
+import com.project.common.utils.StringUtils;
import com.project.common.utils.poi.ExcelUtil;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
+import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.service.IEnforceOrderService;
+import com.project.system.service.ISysDeptService;
+import com.project.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -32,6 +39,27 @@
public class EnforceOrderController extends BaseController {
private final IEnforceOrderService iEnforceOrderService;
+ private final ISysUserService userService;
+ private final ISysDeptService deptService;
+
+ @ApiOperation("鑾峰彇鍚岃浜�")
+ @GetMapping("/peerList")
+ public AjaxResult peerList(String nickName, String deptId)
+ {
+ List<SysUser> list = userService.list(userService.lq()
+ .ne(SysUser::getUserType,"02")
+ .ne(SysUser::getUserName,"admin")
+ .ne(SysUser::getUserId, SecurityUtils.getUserId())
+ .eq(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
+ .eq(deptId!=null, SysUser::getDeptId,deptId)
+ );
+ list.forEach(user->{
+ SysDept sysDept = deptService.selectDeptById(user.getDeptId());
+ sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
+ user.setDept(sysDept);
+ });
+ return AjaxResult.success(list);
+ }
@ApiOperation("鎵ф硶鍗曞垪琛�")
@GetMapping("/list")
@@ -61,6 +89,14 @@
return getDataTable(list);
}
+ @ApiOperation("鎵ф硶鍗曡妭鐐�")
+ @GetMapping("/orderNodeList")
+ public AjaxResult orderNodeList(@RequestParam("orderId") Long orderId)
+ {
+ List<OrderNodeVo> list = iEnforceOrderService.orderNodeList(orderId);
+ return AjaxResult.success(list);
+ }
+
@ApiOperation("瀵煎嚭鎵ф硶鍗曞垪琛�")
//@PreAuthorize("@ss.hasPermi('enforce:order:export')")
@@ -83,6 +119,7 @@
}
+
@ApiOperation("鏂板鎵ф硶鍗�")
//@PreAuthorize("@ss.hasPermi('enforce:order:add')")
@Log(title = "鎵ф硶鍗�", businessType = BusinessType.INSERT)
diff --git a/project-admin/src/main/java/com/project/admin/controller/tool/TestController.java b/project-admin/src/main/java/com/project/admin/controller/tool/TestController.java
new file mode 100644
index 0000000..5dd9e30
--- /dev/null
+++ b/project-admin/src/main/java/com/project/admin/controller/tool/TestController.java
@@ -0,0 +1,37 @@
+package com.project.admin.controller.tool;
+
+import com.project.common.core.domain.AjaxResult;
+import com.project.enforce.service.IEnforceOrderService;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ * @date 2024骞�06鏈�21鏃�
+ */
+
+@Slf4j
+@RestController
+@RequestMapping("/tool/test")
+@RequiredArgsConstructor
+public class TestController
+{
+
+ private final IEnforceOrderService orderService;
+
+ @ApiOperation("鑾峰彇瀹℃壒浜�")
+ @PostMapping(value = "/getCheckPhones")
+ public AjaxResult getCheckPhones(Integer checkLevel, Long applyDeptId)
+ {
+
+ return AjaxResult.success(orderService.getCheckPhones(checkLevel, applyDeptId));
+ }
+
+}
diff --git a/project-admin/src/main/resources/application.yml b/project-admin/src/main/resources/application.yml
index b1e7e70..6f63bda 100644
--- a/project-admin/src/main/resources/application.yml
+++ b/project-admin/src/main/resources/application.yml
@@ -147,3 +147,4 @@
- /verify/**
- /report/**
- /enforce/order/showList
+ - /enforce/order/**
diff --git a/project-common/src/main/java/com/project/common/core/domain/BaseQuery.java b/project-common/src/main/java/com/project/common/core/domain/BaseQuery.java
index edb065c..fcfd734 100644
--- a/project-common/src/main/java/com/project/common/core/domain/BaseQuery.java
+++ b/project-common/src/main/java/com/project/common/core/domain/BaseQuery.java
@@ -8,6 +8,7 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -32,7 +33,19 @@
private String endTime;
+ public Map<String, Object> getParams()
+ {
+ if (params == null)
+ {
+ params = new HashMap<>();
+ }
+ return params;
+ }
+ public void setParams(Map<String, Object> params)
+ {
+ this.params = params;
+ }
public void setBeginTime(String beginTime) {
this.beginTime = StringUtils.isEmpty(beginTime) ? null : beginTime + " 00:00:00";
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
index 1fc4dea..b867b25 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
@@ -1,8 +1,8 @@
package com.project.enforce.domain;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.project.common.core.domain.BaseDomain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +21,7 @@
@Accessors(chain = true)
@TableName("enforce_order")
@ApiModel("鎵ф硶鍗曞疄浣撳璞�")
-public class EnforceOrder extends BaseDomain {
+public class EnforceOrder {
private static final long serialVersionUID=1L;
@@ -210,4 +210,10 @@
@ApiModelProperty("鎶曡瘔鍐呭")
private String complaintReason;
+ /**
+ * 閫昏緫鍒犻櫎鐘舵��
+ */
+ @TableLogic(value = "0",delval = "1")
+ private Integer delFlag;
+
}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
index 7c9414f..f7748b6 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
@@ -106,7 +106,7 @@
@ApiModelProperty("棰勮鍘熷洜")
private String warnReason;
/** 璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠� */
- @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2宸插鎵瑰緟鎵ц锛�3宸叉墽琛屽緟涓婃姤锛�4宸蹭笂鎶�")
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2宸插鎵瑰緟鎵ц锛�3宸叉墽琛屽緟涓婃姤锛�4宸蹭笂鎶�")
private Integer orderStatus;
/** 瀹℃壒浜哄崟浣� */
@ApiModelProperty("瀹℃壒浜哄崟浣�")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
index ab80c57..ec14fbc 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
@@ -2,12 +2,14 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.project.common.annotation.Excel;
+import com.project.enforce.domain.EnforcePeer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
@@ -81,7 +83,7 @@
@Excel(name = "璁″垝鎵ф硶鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("璁″垝鎵ф硶鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date planTime;
@ApiModelProperty("鎵爜鍏ュ満鏃堕棿")
@@ -174,4 +176,7 @@
@ApiModelProperty("鎶曡瘔鍐呭")
private String complaintReason;
+
+ @ApiModelProperty("鍚岃浜烘暟缁�")
+ private List<EnforcePeer> peers;
}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/OrderNodeVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/OrderNodeVo.java
new file mode 100644
index 0000000..1c90e3b
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/OrderNodeVo.java
@@ -0,0 +1,37 @@
+package com.project.enforce.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderNodeVo
+{
+
+ @ApiModelProperty("鑺傜偣鍚�")
+ private String nodeName;
+
+ @ApiModelProperty("鑺傜偣鐢ㄦ埛")
+ private String nodeUser;
+
+ @ApiModelProperty("鑺傜偣鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date nodeTime;
+
+ @ApiModelProperty("鑺傜偣璇存槑")
+ private String nodeReason;
+}
+
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
index e980db3..9a485fc 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
@@ -5,6 +5,7 @@
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
+import com.project.enforce.domain.vo.OrderNodeVo;
import java.util.Collection;
import java.util.List;
@@ -70,4 +71,10 @@
List<String> getCheckPhones(Integer checkLevel, Long applyDeptId);
+ /**
+ * 鎵ф硶鑺傜偣鍒楄〃
+ * @param orderId 鎵ф硶鍗昳d
+ * @return 鑺傜偣
+ */
+ List<OrderNodeVo> orderNodeList(Long orderId);
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
index c6b20d5..90d2125 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.convert.Convert;
import com.project.common.core.domain.entity.SysUser;
import com.project.common.exception.base.BaseException;
+import com.project.common.utils.DateUtils;
import com.project.common.utils.SecurityUtils;
import com.project.common.utils.StringUtils;
import com.project.enforce.domain.EnforceCheckLog;
@@ -73,11 +74,13 @@
//瀹℃壒鎷掔粷锛岀粰鐢宠浜哄彂閫佺煭淇★紝濡傛灉閫氱煡浼佷笟涔熺粰浼佷笟鍙戦�佺煭淇�
smsService.sendCheckMsg(order.getApplyPhone(), order.getCheckStatus());
} else {
- List<String> phones = orderService.getCheckPhones(order.getCheckLevel(), order.getApplyDeptId());
+ List<String> phones = orderService.getCheckPhones(order.getCheckLevel()+1, order.getApplyDeptId());
if (StringUtils.isNotEmpty(phones)){
order.setCheckStatus(1);
//缁欎笅涓�绾у鎵逛汉鍙戦�佺煭淇�
smsService.sendApplyMsg(phones, order.getApplyUser());
+ String checkPhones = StringUtils.join(phones, ",");
+ orderService.update(orderService.lu().set(EnforceOrder::getCheckIds, checkPhones).eq(EnforceOrder::getOrderId, order.getOrderId()));
} else {
order.setCheckStatus(2);
order.setOrderStatus(2);
@@ -111,6 +114,7 @@
checkLog.setCheckUser(loginUser.getUserName());
checkLog.setCheckPhone(loginUser.getPhonenumber());
checkLog.setCheckStatus(bo.getCheckStatus());
+ checkLog.setCheckTime(DateUtils.getNowDate());
checkLog.setCheckReason(bo.getCheckReason());
boolean save = checkLogService.save(checkLog);
if (!save) {
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java
index 46f3290..7268711 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java
@@ -81,7 +81,7 @@
//淇濆瓨鍓嶆牎楠�
private void validEntityBeforeSave(EnforceCompanyLog entity)
{
- if (StringUtils.isEmpty(entity.getComeDeptName())){
+ if (StringUtils.isEmpty(entity.getComeDeptName()) && entity.getComeDeptId()!=null){
entity.setComeDeptName(deptService.getDeptAllName(entity.getComeDeptId()));
}
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
index 08218c4..64157bd 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
@@ -82,7 +82,7 @@
//淇濆瓨鍓嶆牎楠�
private void validEntityBeforeSave(EnforceComplaintLog entity)
{
- if (StringUtils.isEmpty(entity.getExecuteDeptName())){
+ if (StringUtils.isEmpty(entity.getExecuteDeptName()) && entity.getExecuteDeptName()!=null){
entity.setExecuteDeptName(deptService.getDeptAllName(entity.getExecuteDeptId()));
}
}
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 fce5771..e22d765 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
@@ -8,14 +8,18 @@
import com.project.common.core.domain.entity.SysUser;
import com.project.common.enums.OrderPre;
import com.project.common.sms.YPSmsApi;
+import com.project.common.utils.DateUtils;
import com.project.common.utils.SecurityUtils;
import com.project.common.utils.StringUtils;
+import com.project.enforce.domain.EnforceCheckLog;
import com.project.enforce.domain.EnforceOrder;
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.vo.EnforceOrderVo;
+import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.mapper.EnforceOrderMapper;
+import com.project.enforce.service.IEnforceCheckLogService;
import com.project.enforce.service.IEnforceOrderService;
import com.project.enforce.service.IEnforcePeerService;
import com.project.system.service.ISysDeptService;
@@ -27,6 +31,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -43,13 +48,16 @@
private final ISysDeptService deptService;
private final ISysOrderNoService orderNoService;
private final IEnforcePeerService peerService;
+ private final IEnforceCheckLogService checkLogService;
@Override//鍒楄〃鏌ヨ
- @DataScope(deptAlias = "apply_dept_id", userAlias = "apply_user_id")
+ @DataScope(deptAlias = "apply_dept_id", userAlias = "apply_id")
public List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
- qw.apply(bo.getParams().get("dataScope") != null, bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
+ if (StringUtils.isNotEmpty(bo.getParams())) {
+ qw.apply(bo.getParams().get("dataScope") != null, bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
+ }
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
}
@@ -59,7 +67,12 @@
{
SysUser loginUser = SecurityUtils.getLoginUser().getUser();
bo.setCheckIds(loginUser.getPhonenumber());
- bo.setApplyDeptIds(deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId()));
+ List<Long> deptIds = deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId());
+ if (StringUtils.isNotEmpty(deptIds)){
+ bo.setApplyDeptIds(deptIds);
+ } else {
+ bo.setApplyDeptIds(null);
+ }
return this.baseMapper.selectCheckList(bo);
}
@@ -74,7 +87,10 @@
public EnforceOrderVo queryById(Long orderId)
{
EnforceOrder db = this.baseMapper.selectById(orderId);
- return Convert.convert(EnforceOrderVo.class , db);
+ EnforceOrderVo vo = Convert.convert(EnforceOrderVo.class, db);
+ List<EnforcePeer> peers = peerService.list(peerService.lq().eq(EnforcePeer::getOrderId, orderId).eq(EnforcePeer::getPeerType,2));
+ vo.setPeers(peers);
+ return vo;
}
@@ -91,7 +107,7 @@
add.setCheckIds(checkPhones);
}
this.save(add);
- bo.getPeers().add(new EnforcePeer()
+ bo.getPeers().add(0,new EnforcePeer()
.setPeerType(1)
.setPeerId(add.getApplyId())
.setPeerUser(add.getApplyUser())
@@ -137,6 +153,37 @@
return getCheckPhones(checkLevel, applyDeptId, 0);
}
+ @Override
+ public List<OrderNodeVo> orderNodeList(Long orderId)
+ {
+ List<OrderNodeVo> vos = new ArrayList<>();
+ EnforceOrder order = this.getById(orderId);
+ List<EnforceCheckLog> checkLogs = checkLogService.list(checkLogService.lq()
+ .eq(EnforceCheckLog::getOrderId, orderId).orderByAsc(EnforceCheckLog::getCheckTime)
+ );
+ if (order.getApplyTime()!=null){
+ vos.add(new OrderNodeVo("鎻愪氦鐢宠",order.getApplyUser(),order.getApplyTime(), null));
+ }
+ if (StringUtils.isNotEmpty(checkLogs)){
+ for (EnforceCheckLog checkLog : checkLogs) {
+ if (checkLog.getCheckStatus()>0){
+ vos.add(new OrderNodeVo("瀹℃壒閫氳繃",checkLog.getCheckUser(),checkLog.getCheckTime(), null));
+ } else {
+ 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));
+ }
+ }
+
+ return vos;
+ }
+
//-------------------------------------------------------------------------------------
@@ -150,9 +197,7 @@
public void sendApplyMsg(List<String> phones, String applyUser)
{
String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.APPLY_TMP, applyUser));
- phones.forEach(phone->{
- YPSmsApi.sendSms(phone, applyMsg) ;
- });
+ phones.forEach(phone-> YPSmsApi.sendSms(phone, applyMsg));
}
//淇濆瓨鍓嶆牎楠�
@@ -162,14 +207,15 @@
String orderNo = orderNoService.getOrderNo(OrderPre.ZFD.getIndex());
entity.setOrderNo(orderNo);
entity.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(entity.getApplyDeptId()));
+ entity.setApplyTime(DateUtils.getNowDate());
}
- if (StringUtils.isEmpty(entity.getApplyDeptName())){
+ if (StringUtils.isEmpty(entity.getApplyDeptName()) && entity.getApplyDeptId()!=null){
entity.setApplyDeptName(deptService.getDeptAllName(entity.getApplyDeptId()));
}
- if (StringUtils.isEmpty(entity.getExecuteDeptName())){
+ if (StringUtils.isEmpty(entity.getExecuteDeptName()) && entity.getExecuteDeptId()!=null){
entity.setExecuteDeptName(deptService.getDeptAllName(entity.getExecuteDeptId()));
}
- if (StringUtils.isEmpty(entity.getCheckDeptName())){
+ if (StringUtils.isEmpty(entity.getCheckDeptName()) && entity.getCheckDeptId()!=null){
entity.setCheckDeptName(deptService.getDeptAllName(entity.getCheckDeptId()));
}
@@ -245,7 +291,7 @@
return null;
}
checkLevel = 0;
- deptId = deptService.getById(deptId).getParentId();
+ deptId = deptService.selectDeptById(deptId).getParentId();
current++;
getCheckPhones(checkLevel, deptId, current);
}
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
index ab4be13..8878a5b 100644
--- a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.project.enforce.mapper.EnforceOrderMapper">
- <resultMap type="EnforceOrder" id="EnforceOrderResult">
+ <resultMap type="EnforceOrderVo" id="EnforceOrderResult">
<result property="orderId" column="order_id" />
<result property="orderNo" column="order_no" />
<result property="companyId" column="company_id" />
@@ -48,18 +48,11 @@
<result property="isShow" column="is_show" />
<result property="isEva" column="is_eva" />
<result property="totalScore" column="total_score" />
- <result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectEnforceOrderVo">
- select order_id, order_no, company_id, company_name, company_code, company_user, company_phone, company_address,
- region_code,region_name,enforce_reason,user_num,
- apply_id,apply_user,apply_phone,apply_dept_id,apply_dept_name,apply_time,
- warn_status,warn_reason,order_status,
- check_dept_id,check_dept_name,check_status,check_reason,check_level,
- execute_id,execute_user,execute_phone,execute_dept_id,execute_dept_name,execute_time,
- region_status,region_reason,region_imgs,region_videos,is_notice_company,is_show,is_eva,total_score
- from sys_job_log
+ select *
+ from enforce_order
</sql>
<select id="selectCheckList"
@@ -79,7 +72,7 @@
<if test="checkIds != null and checkIds != '' ">
AND check_ids like concat('%', #{checkIds}, '%')
</if>
- <if test="applyDeptIds != null ">
+ <if test="applyDeptIds != null and applyDeptIds !='' ">
AND apply_dept_id in
<foreach collection="applyDeptIds" item="applyDeptId" open="(" separator="," close=")">
#{applyDeptId}
diff --git a/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java b/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java
index b533252..9c86359 100644
--- a/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java
+++ b/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java
@@ -2,6 +2,7 @@
import com.project.common.annotation.DataScope;
import com.project.common.core.domain.BaseEntity;
+import com.project.common.core.domain.BaseQuery;
import com.project.common.core.domain.entity.SysRole;
import com.project.common.core.domain.entity.SysUser;
import com.project.common.core.domain.model.LoginUser;
@@ -124,19 +125,13 @@
}
else if (DATA_SCOPE_DEPT.equals(dataScope))
{
- sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
+ sqlString.append(StringUtils.format(" OR {} = {} ", deptAlias, user.getDeptId()));
}
else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
{
sqlString.append(StringUtils.format(
" OR {} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
deptAlias, user.getDeptId(), user.getDeptId()));
- }
- else if (DATA_SCOPE_ORG.equals(dataScope))
- {
- sqlString.append(StringUtils.format(
- " OR {} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
- deptAlias, user.getRecommendUser(), user.getRecommendUser()));
}
else if (DATA_SCOPE_SELF.equals(dataScope))
{
@@ -159,7 +154,10 @@
if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
{
BaseEntity baseEntity = (BaseEntity) params;
- baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+ baseEntity.getParams().put(DATA_SCOPE, " (" + sqlString.substring(4) + ")");
+ } else if (StringUtils.isNotNull(params) && params instanceof BaseQuery) {
+ BaseQuery baseQuery = (BaseQuery) params;
+ baseQuery.getParams().put(DATA_SCOPE, " (" + sqlString.substring(4) + ")");
}
}
}
diff --git a/project-system/src/main/java/com/project/system/service/ISysDeptService.java b/project-system/src/main/java/com/project/system/service/ISysDeptService.java
index 72de54a..0902dac 100644
--- a/project-system/src/main/java/com/project/system/service/ISysDeptService.java
+++ b/project-system/src/main/java/com/project/system/service/ISysDeptService.java
@@ -146,4 +146,5 @@
*/
String getDeptAllName(Long deptId);
+
}
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
index a582612..6791398 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
@@ -387,9 +387,13 @@
* @return names鍒楄〃
*/
public List<String> getAncestorsNames(long deptId, List<String> names) {
- SysDept dept = this.getById(deptId);
+ SysDept dept = deptMapper.selectDeptById(deptId);
if (dept == null) {
- return new ArrayList<>();
+ return names;
+ }
+ if (deptId == 100) {
+ names.add(dept.getDeptName());
+ return names;
}
if (dept.getParentId() != null && dept.getParentId() == 100) {
names.add(dept.getDeptName());
diff --git a/project-system/src/main/resources/mapper/system/SysDeptMapper.xml b/project-system/src/main/resources/mapper/system/SysDeptMapper.xml
index f56e0a2..2ae2cc8 100644
--- a/project-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/project-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -43,7 +43,9 @@
AND status = #{status}
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
+ <if test="params != null and params.dataScope != null">
+ AND ${params.dataScope}
+ </if>
order by d.parent_id, d.order_num
</select>
diff --git a/project-system/src/main/resources/mapper/system/SysRoleMapper.xml b/project-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 00860bc..c801e1b 100644
--- a/project-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/project-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -52,7 +52,9 @@
and date_format(r.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
+ <if test="params != null and params.dataScope != null">
+ AND ${params.dataScope}
+ </if>
order by r.role_sort
</select>
diff --git a/project-system/src/main/resources/mapper/system/SysUserMapper.xml b/project-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7280b60..0e54a13 100644
--- a/project-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/project-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -92,7 +92,9 @@
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
+ <if test="params != null and params.dataScope != null">
+ AND ${params.dataScope}
+ </if>
</select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
@@ -109,7 +111,9 @@
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
+ <if test="params != null and params.dataScope != null">
+ AND ${params.dataScope}
+ </if>
</select>
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
@@ -127,7 +131,9 @@
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
+ <if test="params != null and params.dataScope != null">
+ AND ${params.dataScope}
+ </if>
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
@@ -241,9 +247,9 @@
join sys_user_role ur on u.user_id = ur.user_id
join sys_role r on r.role_id=ur.role_id
where
- u.user_type = '01'
+ u.user_type != '02'
and r.role_key = #{roleKey}
- and (u.dept_id = #{deptId} or u.dept_id in (SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors)))
+ and u.dept_id = #{deptId}
</select>
</mapper>
--
Gitblit v1.9.1