From def329ac7a0215b6650d3aeccc7ca7d2fca62e5a Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 09:44:38 +0800
Subject: [PATCH] 配置
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 97 insertions(+), 13 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 fce5771..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
@@ -8,14 +8,19 @@
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.bo.queryBo.OrderCheckedQueryBo;
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 +32,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 +49,23 @@
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());//鏁版嵁鏉冮檺鎺у埗
+ 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);
}
@@ -59,8 +75,20 @@
{
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);
+ }
+
+ @Override
+ public List<EnforceOrderVo> queryCheckedList(OrderCheckedQueryBo bo)
+ {
+ bo.setUserId(SecurityUtils.getUserId());
+ return this.baseMapper.selectCheckedList(bo);
}
@Override//淇℃伅鍏紡鍒楄〃
@@ -74,7 +102,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 +122,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 +168,59 @@
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()));
+ }
+ }
+ }
+ 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);
+ }
+
//-------------------------------------------------------------------------------------
@@ -150,9 +234,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 +244,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()));
}
@@ -189,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());
@@ -245,7 +329,7 @@
return null;
}
checkLevel = 0;
- deptId = deptService.getById(deptId).getParentId();
+ deptId = deptService.selectDeptById(deptId).getParentId();
current++;
getCheckPhones(checkLevel, deptId, current);
}
--
Gitblit v1.9.1