From d509e25f601c110427306543a0d17cd97cc6b194 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 17:45:12 +0800
Subject: [PATCH] 生成模板优化
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 101 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 80 insertions(+), 21 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 c470d09..f6e32bf 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,13 +8,15 @@
import com.project.common.core.domain.entity.SysUser;
import com.project.common.enums.OrderPre;
import com.project.common.exception.base.BaseException;
-import com.project.common.sms.YPSmsApi;
import com.project.common.utils.DateUtils;
import com.project.common.utils.JsonUtils;
import com.project.common.utils.SecurityUtils;
import com.project.common.utils.StringUtils;
import com.project.enforce.domain.*;
-import com.project.enforce.domain.bo.editBo.*;
+import com.project.enforce.domain.bo.editBo.EnforceComplaintLogBo;
+import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
+import com.project.enforce.domain.bo.editBo.OrderComplaintBo;
+import com.project.enforce.domain.bo.editBo.OrderResultBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceEvaluateVo;
@@ -27,7 +29,6 @@
import com.project.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -51,8 +52,41 @@
private final IEnforceCheckLogService checkLogService;
private final IEnforceComplaintLogService complaintLogService;
private final IEnforceEvaluateLogService evaluateLogService;
+ private final YPSmsService smsService;
- @Override//鍒楄〃鏌ヨ
+ /**
+ * 閫氱敤鍒楄〃-鏃犳潈闄�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ @Override
+ public List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo)
+ {
+ QueryWrapper<EnforceOrder> qw = getQw(bo);
+ List<EnforceOrder> list = this.list(qw);
+ return Convert.toList(EnforceOrderVo.class , list);
+ }
+
+ /**
+ * 浼佷笟鎵ф硶鍗曞垪琛�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ @Override
+ public List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo)
+ {
+ QueryWrapper<EnforceOrder> qw = getQw(bo);
+ qw.ge("order_status",2);
+ List<EnforceOrder> list = this.list(qw);
+ return Convert.toList(EnforceOrderVo.class , list);
+ }
+
+ /**
+ * 鎵ф硶鐢宠鍗曞垪琛�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ @Override
@DataScope(deptAlias = "apply_dept_id", userAlias = "apply_id")
public List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo)
{
@@ -62,7 +96,12 @@
return Convert.toList(EnforceOrderVo.class , list);
}
- @Override//鎵ф硶涓婃姤鍒楄〃
+ /**
+ * 鎵ф硶鎵ц鍗曞垪琛�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ @Override
@DataScope(deptAlias = "execute_dept_id", userAlias = "execute_id")
public List<EnforceOrderVo> getExecuteList(EnforceOrderQueryBo bo) {
QueryWrapper<EnforceOrder> qw = getQw(bo);
@@ -71,7 +110,12 @@
return Convert.toList(EnforceOrderVo.class , list);
}
- @Override//寰呭鏍稿垪琛�
+ /**
+ * 寰呭鏍稿垪琛�
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
+ @Override
public List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo)
{
SysUser loginUser = SecurityUtils.getLoginUser().getUser();
@@ -85,6 +129,11 @@
return this.baseMapper.selectCheckList(bo);
}
+ /**
+ * 瀹℃壒璁板綍鍒楄〃
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
@Override
public List<EnforceOrderVo> queryCheckedList(OrderCheckedQueryBo bo)
{
@@ -92,7 +141,12 @@
return this.baseMapper.selectCheckedList(bo);
}
- @Override//淇℃伅鍏紡鍒楄〃
+
+ /**
+ * 淇℃伅鍏紡鍒楄〃
+ * @return 鍒楄〃
+ */
+ @Override
public List<EnforceOrderVo> showList()
{
List<EnforceOrder> list = this.list(lq()
@@ -102,7 +156,10 @@
return Convert.toList(EnforceOrderVo.class, list);
}
- @Override//id鏌ヨ
+ /**
+ * id鏌ヨ
+ */
+ @Override
public EnforceOrderVo queryById(Long orderId)
{
EnforceOrder db = this.baseMapper.selectById(orderId);
@@ -127,6 +184,9 @@
}
+ /**
+ * 鏂板
+ */
@Override//娣诲姞
@Transactional
public Boolean insertByBo(EnforceOrderBo bo)
@@ -156,11 +216,14 @@
}
boolean savePeers = peerService.saveOrUpdateBatch(bo.getPeers());
if (savePeers && StringUtils.isNotEmpty(phones)) {
- sendApplyMsg(phones, add.getApplyUser());
+ smsService.sendApplyMsg(phones, add.getApplyUser());
}
return savePeers;
}
+ /**
+ * 淇敼
+ */
@Override//淇敼
@Transactional
public Boolean updateByBo(EnforceOrderBo bo)
@@ -170,6 +233,9 @@
return this.updateById(update);
}
+ /**
+ * 鍒犻櫎
+ */
@Override//鍒犻櫎
@Transactional
public Boolean deleteByIds(Collection<Long> ids)
@@ -180,6 +246,9 @@
return this.removeByIds(ids);
}
+ /**
+ * 鑾峰彇涓嬩竴绾у鎵逛汉鐢佃瘽
+ */
@Override
public List<String> getCheckPhones(Integer checkLevel, Long applyDeptId)
{
@@ -301,20 +370,10 @@
}
+
+
//-------------------------------------------------------------------------------------
-
- /**
- * 鍙戦�佸鎵圭煭淇�
- * @param phones 鎵嬫満鍙�
- * @param applyUser 鐢宠浜�
- */
- @Async
- 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));
- }
//淇濆瓨鍓嶆牎楠�
private void validEntityBeforeSave(EnforceOrder entity)
--
Gitblit v1.9.1