From df7d2e1113b540ccb3600b3cdc9155bf7186e8fb Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 20 五月 2025 14:18:31 +0800
Subject: [PATCH] 执法单企业信息后台填充
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 bfcaa46..556acfd 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
@@ -9,10 +9,7 @@
import com.project.common.core.domain.model.DateRange;
import com.project.common.enums.OrderPre;
import com.project.common.exception.base.BaseException;
-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.common.utils.*;
import com.project.enforce.domain.*;
import com.project.enforce.domain.bo.editBo.EnforceComplaintLogBo;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
@@ -26,6 +23,8 @@
import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.mapper.EnforceOrderMapper;
import com.project.enforce.service.*;
+import com.project.system.domain.SysCompany;
+import com.project.system.service.ISysCompanyService;
import com.project.system.service.ISysDeptService;
import com.project.system.service.ISysOrderNoService;
import com.project.system.service.ISysUserService;
@@ -57,6 +56,7 @@
private final IEnforceEvaluateLogService evaluateLogService;
private final YPSmsService smsService;
private final EnforceOrderMapper orderMapper;
+ private final ISysCompanyService companyService;
/**
* 閫氱敤鍒楄〃-鏃犳潈闄�
@@ -67,6 +67,8 @@
public List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
+
+
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
}
@@ -138,7 +140,9 @@
QueryWrapper<EnforceOrder> qw = getQw(bo);
qw.ge("order_status",2);
List<EnforceOrder> list = this.list(qw);
- return Convert.toList(EnforceOrderVo.class , list);
+ List<EnforceOrderVo> vos = Convert.toList(EnforceOrderVo.class, list);
+ vos.forEach(SensitiveUtil::desensitize);
+ return vos;
}
/**
@@ -211,9 +215,11 @@
{
List<EnforceOrder> list = this.list(lq()
.eq(EnforceOrder::getIsShow, 1)
- .eq(EnforceOrder::getOrderStatus, 4)
+ .ge(EnforceOrder::getOrderStatus, 4)
);
- return Convert.toList(EnforceOrderVo.class, list);
+ List<EnforceOrderVo> vos = Convert.toList(EnforceOrderVo.class, list);
+ vos.forEach(SensitiveUtil::desensitize);
+ return vos;
}
/**
@@ -242,6 +248,7 @@
}
}
}
+ SensitiveUtil.desensitize(vo);
return vo;
}
@@ -455,6 +462,13 @@
//淇濆瓨鍓嶆牎楠�
private void validEntityBeforeSave(EnforceOrder entity)
{
+ if (entity.getCompanyId()!=null){
+ SysCompany company = companyService.getById(entity.getCompanyId());
+ entity.setCompanyName(company.getCompanyName());
+ entity.setCompanyCode(company.getCompanyCode());
+ entity.setCompanyUser(company.getCompanyUser());
+ entity.setCompanyPhone(company.getCompanyPhone());
+ }
if (entity.getOrderId()==null){
String orderNo = orderNoService.getOrderNo(OrderPre.ZFD.getIndex());
entity.setOrderNo(orderNo);
--
Gitblit v1.9.1