From 7e346c75d1878d4b6dc24ecdf4ba8c27452c37e0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 三月 2024 15:03:57 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 40 +++-----------------
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 24 +++++++++++
2 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index cc01e72..07d73d9 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -707,6 +707,7 @@
THSQZ(5, "鐢宠閫�鍥�"),
YGB(6, "宸插叧闂�"),
DQYQZ(7, "寰呯缃�"),
+
WTBDQS(28, "寰呯缃�"),
WTBDSH(21, "寰呭鏍�"),
WTBDCD(22, "寰呭嚭鍗�"),
@@ -959,24 +960,22 @@
public enum UnionChangeStatus {
- MERGE(0, "寰呯缃茬敵璇峰崟","",0),
- UPLOAD_INSURANCE_POLICY(1, "寰呬笂浼犱繚鍗�","",0),
- FINISH(2, "淇濋殰涓�","",0),
- CLOSE(3, "鍏抽棴","",0),
+ MERGE(0, "寰呯缃茬敵璇峰崟",""),
+ UPLOAD_INSURANCE_POLICY(1, "寰呬笂浼犱繚鍗�",""),
+ FINISH(2, "淇濋殰涓�",""),
+ CLOSE(3, "鍏抽棴",""),
;
// 鎴愬憳鍙橀噺
private String name;
private String info;
private int key;
- private int collectStatus;
// 鏋勯�犳柟娉�
- UnionChangeStatus(int key, String name,String info,int collectStatus) {
+ UnionChangeStatus(int key, String name,String info) {
this.name = name;
this.key = key;
this.info = info;
- this.collectStatus = collectStatus;
}
// 鏅�氭柟娉�
@@ -984,25 +983,6 @@
for (UnionChangeStatus c : UnionChangeStatus.values()) {
if (c.getKey() == index) {
return c.name;
- }
- }
- return null;
- }
- public static List<Integer> getKesByStatus(Integer collectStatus) {
- List<Integer> list = new ArrayList<>();
- if(collectStatus!=null){
- for (UnionChangeStatus c : UnionChangeStatus.values()) {
- if (Constants.equalsInteger(c.getCollectStatus() ,collectStatus)) {
- list.add(c.getKey());
- }
- }
- }
- return list;
- }
- public static Integer getCollectStatus(Integer index) {
- for (UnionChangeStatus c : UnionChangeStatus.values()) {
- if (Constants.equalsInteger(c.getKey() , index)) {
- return c.collectStatus;
}
}
return null;
@@ -1039,14 +1019,6 @@
public void setInfo(String info) {
this.info = info;
- }
-
- public int getCollectStatus() {
- return collectStatus;
- }
-
- public void setCollectStatus(int collectStatus) {
- this.collectStatus = collectStatus;
}
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 6292a25..9cc0e6a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1621,13 +1621,34 @@
QueryWrapper<InsuranceApply> wrapper = new QueryWrapper<>(insuranceApply);
return insuranceApplyMapper.selectList(wrapper);
}
+
+ public List<Integer> getCollectStatus(Integer collectStatus){
+ List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus);
+ if(collectStatus.equals(Constants.ApplyCollectStatus.DCD)){
+ statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey()));
+ }else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP)){
+ statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDSH.getKey()));
+ }else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ)){
+ statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
+ }else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH)){
+ statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYTH.getKey()));
+ }else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB)){
+ statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYGB.getKey()));
+ }else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ)){
+ statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDQS.getKey()));
+ }
+
+ return statusList;
+ }
@Override
public PageData<InsuranceApply> findPage(PageWrap<InsuranceApplyQueryDTO> pageWrap) {
IPage<InsuranceApply> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(pageWrap.getModel().getStatusCollect());
+
+ List<Integer> statusList = this.getCollectStatus(pageWrap.getModel().getStatusCollect());
+
queryWrapper.selectAll(InsuranceApply.class);
queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
@@ -2163,6 +2184,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+
smsEmailService.validateCode(smsCheckDTO.getCode());
MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>()
--
Gitblit v1.9.3