From ee22d914b0b400cbf35ba4d10346bf1a349d1d62 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 17:59:26 +0800
Subject: [PATCH] 生成模板优化
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 175 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 147 insertions(+), 28 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 cc5e2a1..be7bdf0 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,29 +8,27 @@
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.EnforceCheckLog;
-import com.project.enforce.domain.EnforceOrder;
-import com.project.enforce.domain.EnforcePeer;
+import com.project.enforce.domain.*;
+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;
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.enforce.service.*;
import com.project.system.service.ISysDeptService;
import com.project.system.service.ISysOrderNoService;
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;
@@ -52,8 +50,43 @@
private final ISysOrderNoService orderNoService;
private final IEnforcePeerService peerService;
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)
{
@@ -63,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);
@@ -72,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();
@@ -86,6 +129,11 @@
return this.baseMapper.selectCheckList(bo);
}
+ /**
+ * 瀹℃壒璁板綍鍒楄〃
+ * @param bo 鍙傛暟
+ * @return 鍒楄〃
+ */
@Override
public List<EnforceOrderVo> queryCheckedList(OrderCheckedQueryBo bo)
{
@@ -93,24 +141,52 @@
return this.baseMapper.selectCheckedList(bo);
}
- @Override//淇℃伅鍏紡鍒楄〃
+
+ /**
+ * 淇℃伅鍏紡鍒楄〃
+ * @return 鍒楄〃
+ */
+ @Override
public List<EnforceOrderVo> showList()
{
- List<EnforceOrder> list = this.list(lq().eq(EnforceOrder::getIsShow, 1));
+ List<EnforceOrder> list = this.list(lq()
+ .eq(EnforceOrder::getIsShow, 1)
+ .eq(EnforceOrder::getOrderStatus, 4)
+ );
return Convert.toList(EnforceOrderVo.class, list);
}
- @Override//id鏌ヨ
+ /**
+ * id鏌ヨ
+ */
+ @Override
public EnforceOrderVo queryById(Long orderId)
{
EnforceOrder db = this.baseMapper.selectById(orderId);
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);
+ if (db.getIsEva()==1){
+ EnforceEvaluateLog one = evaluateLogService.getOne(evaluateLogService.lq().eq(EnforceEvaluateLog::getOrderId, orderId));
+ if (one!=null){
+ String questionStatic = one.getQuestionStatic();
+ if (StringUtils.isNotEmpty(questionStatic)){
+ try {
+ EnforceEvaluateVo evaluateVo = JsonUtils.jsonToPojo(questionStatic, EnforceEvaluateVo.class);
+ vo.setEvaluateVo(evaluateVo);
+ } catch (Exception e) {
+ throw new BaseException("璇勪环闂埜瑙ｆ瀽寮傚父锛�");
+ }
+ }
+ }
+ }
return vo;
}
+ /**
+ * 鏂板
+ */
@Override//娣诲姞
@Transactional
public Boolean insertByBo(EnforceOrderBo bo)
@@ -140,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)
@@ -154,6 +233,9 @@
return this.updateById(update);
}
+ /**
+ * 鍒犻櫎
+ */
@Override//鍒犻櫎
@Transactional
public Boolean deleteByIds(Collection<Long> ids)
@@ -164,6 +246,9 @@
return this.removeByIds(ids);
}
+ /**
+ * 鑾峰彇涓嬩竴绾у鎵逛汉鐢佃瘽
+ */
@Override
public List<String> getCheckPhones(Integer checkLevel, Long applyDeptId)
{
@@ -223,7 +308,8 @@
return this.updateById(order);
}
- @Override
+ @Override//涓婃姤缁撴灉
+ @Transactional
public Boolean doResultOrder(OrderResultBo resultBo)
{
if (resultBo.getRegionStatus()==null){
@@ -238,25 +324,56 @@
.set(StringUtils.isNotEmpty(resultBo.getRegionReason()), EnforceOrder::getRegionReason, resultBo.getRegionReason())
.set(StringUtils.isNotEmpty(resultBo.getRegionImgs()), EnforceOrder::getRegionImgs, resultBo.getRegionImgs())
.set(StringUtils.isNotEmpty(resultBo.getRegionVideos()), EnforceOrder::getRegionVideos, resultBo.getRegionVideos())
+ .set( EnforceOrder::getOrderStatus, 4)
.set( EnforceOrder::getExecuteTime, DateUtils.getNowDate())
);
}
+ @Override//鎵ф硶鍗曟姇璇�
+ @Transactional
+ public Boolean orderComplaint(OrderComplaintBo bo)
+ {
+ if (bo.getOrderId()==null){
+ throw new BaseException("璇烽�夋嫨瑕佹姇璇夌殑鎵ф硶鍗曪紒");
+ }
+ if (StringUtils.isEmpty(bo.getComplaintType())){
+ throw new BaseException("璇烽�夋嫨瑕佹姇璇夌被鍨嬶紒");
+ }
+ if (StringUtils.isEmpty(bo.getComplaintReason())){
+ throw new BaseException("璇峰～鍐欐姇璇夊唴瀹癸紒");
+ }
+ EnforceOrder order = this.getById(bo.getOrderId());
+ //娣诲姞鎶曡瘔璁板綍
+ EnforceComplaintLogBo complaintLogBo = Convert.convert(EnforceComplaintLogBo.class, order);
+ complaintLogBo.setComplaintType(bo.getComplaintType());
+ complaintLogBo.setComplaintReason(bo.getComplaintReason());
+ Boolean addLog = complaintLogService.insertByBo(complaintLogBo);
+ if (addLog){
+ return this.update(lu()
+ .set(EnforceOrder::getIsComplaint,1)
+ .set(EnforceOrder::getComplaintType,bo.getComplaintType())
+ .set(EnforceOrder::getComplaintReason,bo.getComplaintReason())
+ .eq(EnforceOrder::getOrderId,bo.getOrderId())
+ );
+ }
+ return false;
+ }
+
+ @Override//鎵ф硶鍗曟姇璇夎妭鐐�
+ public List<OrderNodeVo> orderComplaintNodeList(Long orderId)
+ {
+ EnforceComplaintLog log = complaintLogService.getOne(complaintLogService.lq().eq(EnforceComplaintLog::getOrderId, orderId));
+ if (log==null){
+ return null;
+ }
+ return complaintLogService.orderNodeList(log.getId());
+ }
+
+
+
//-------------------------------------------------------------------------------------
-
- /**
- * 鍙戦�佸鎵圭煭淇�
- * @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)
@@ -327,6 +444,8 @@
qw.eq(bo.getIsShow() != null, "is_show", bo.getIsShow());
qw.eq(bo.getIsEva() != null, "is_eva", bo.getIsEva());
qw.eq(bo.getTotalScore() != null, "total_score", bo.getTotalScore());
+ qw.ge(StringUtils.isNotEmpty(bo.getBeginTime()), "in_time", bo.getBeginTime());
+ qw.le(StringUtils.isNotEmpty(bo.getEndTime()), "in_time", bo.getEndTime());
if (StringUtils.isNotEmpty(bo.getIsAsc()) && StringUtils.isNotEmpty(bo.getOrderByColumn())){
if ("acs".equals(bo.getIsAsc())) {
qw.orderByAsc(bo.getOrderByColumn());
--
Gitblit v1.9.1