From 0b161bd2fa0b448c8824815904355ad245287f01 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 05 三月 2024 19:06:00 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 34 ++++++++++++++--
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 19 +++++----
server/service/src/main/java/com/doumee/core/utils/Constants.java | 4 +-
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 3 +
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelImporter.java | 2
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 5 ++
server/company/src/main/java/com/doumee/api/system/SystemRoleController.java | 1
server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java | 1
8 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/system/SystemRoleController.java b/server/company/src/main/java/com/doumee/api/system/SystemRoleController.java
index eeb9125..cf27fba 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemRoleController.java
+++ b/server/company/src/main/java/com/doumee/api/system/SystemRoleController.java
@@ -63,6 +63,7 @@
@PostMapping("/create")
@RequiresPermissions("system:role:create")
public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole) {
+ systemRole.setType(Constants.ONE);
return ApiResponse.success(systemRoleBiz.create(systemRole));
}
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java b/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java
index 8886dac..622d6bf 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java
@@ -63,6 +63,7 @@
@PostMapping("/create")
@RequiresPermissions("system:role:create")
public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole) {
+ systemRole.setType(Constants.ZERO);
return ApiResponse.success(systemRoleBiz.create(systemRole));
}
diff --git a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelImporter.java b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelImporter.java
index 9e0d4a6..b7e0631 100644
--- a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelImporter.java
+++ b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelImporter.java
@@ -262,7 +262,7 @@
List<E> dataList = new ArrayList<>();
System.out.println("璧峰鏁版嵁琛�:"+getDataRowNum());
System.out.println("缁撴潫鏁版嵁琛�:"+getLastDataRowNum());
- for (int i = this.getDataRowNum(); i <= this.getLastDataRowNum(); i++) {
+ for (int i = this.getDataRowNum(); i < this.getLastDataRowNum(); i++) {
E e = (E)cls.newInstance();
int column = 0;
Row row = this.getRow(i);
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 5d4125f..9d91bb1 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
@@ -1007,10 +1007,10 @@
public enum NoticeType {
ZERO(0, "寰呭鎵�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
- ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","澶勭悊涓�"),
+ ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�"),
TWO(2, "寰呭嚭鍗�","寰呭鎵�","寰呭鎵�","","",""),
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
- FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","",""),
+ FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"),
FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""),
SIX(6, "","","","","","")
;
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index c32d163..2c1cacf 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -122,6 +122,19 @@
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+ if(Objects.isNull(insuranceApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(insuranceApply.getIsdeleted().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�");
+ }
+ Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+ }
+
if(
// Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())
// ||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())
@@ -140,6 +153,17 @@
update.setCheckUserId(user.getId());
update.setId(model.getId());
applyChangeMapper.updateById(update);
+
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+ if(model.getType().equals(Constants.ONE)){
+ noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+ }
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),
+ insuranceApply.getCompanyId(), Constants.NoticeType.FOUR);
+ noticesMapper.insert(notices);
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_CHECK_PASS_NO;
String info =applyLogType.getInfo();
@@ -591,8 +615,8 @@
applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
.setSql(" fee = ifnull(fee,0)+" + updateFee)
.setSql(" current_fee = " + updateCurrentFee)
- .set(insuranceApply.getStartTime().compareTo(update.getValidTime())!=0,ApplyDetail::getEndTime, DateUtil.getMontageDate(update.getApplyStartTime(), 3))
- .set(insuranceApply.getStartTime().compareTo(update.getValidTime())==0,ApplyDetail::getEndTime, DateUtil.getMontageDate(update.getApplyStartTime(), 2))
+ .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())!=0,ApplyDetail::getEndTime, DateUtil.getMontageDate(update.getApplyStartTime(), 3))
+ .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())==0,ApplyDetail::getEndTime, DateUtil.getMontageDate(update.getApplyStartTime(), 2))
.set(ApplyDetail::getEditor, update.getEditor())
.set(ApplyDetail::getEditDate, update.getEditDate())
.eq(ApplyDetail::getId, oldModel.getId())
@@ -603,8 +627,8 @@
//淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
.setSql(" fee = ifnull(fee,0)+" + updateFee)
- .set(insuranceApply.getStartTime().compareTo(update.getValidTime())!=0,MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 3))
- .set(insuranceApply.getStartTime().compareTo(update.getValidTime())==0,MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 2))
+ .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())!=0,MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 3))
+ .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())==0,MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 2))
.set(MemberInsurance::getStartTime, update.getApplyStartTime())
.eq(MemberInsurance::getRelationId, oldModel.getId())
);
@@ -723,7 +747,7 @@
//鍒犻櫎鍏朵粬寰呭姙
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),
- model.getCompanyId(), noticeType);
+ insuranceApply.getCompanyId(), noticeType);
noticesMapper.insert(notices);
ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
index 21fc9bf..366e9f3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
@@ -210,17 +210,18 @@
ApplyDetailPageDTO applyDetailPageDTO = pageWrap.getModel();
queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getApplyId()),ApplyDetail::getApplyId,applyDetailPageDTO.getApplyId());
- queryWrapper.ge(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
- &&!applyDetailPageDTO.getApplyStatus().equals(Constants.ZERO),
- ApplyDetail::getStartTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 00:00:00");
+
//鍦ㄤ繚
- queryWrapper.le(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
- &&applyDetailPageDTO.getApplyStatus().equals(Constants.ONE),
- ApplyDetail::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 23:59:59");
+ if(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
+ &&applyDetailPageDTO.getApplyStatus().equals(Constants.ONE)){
+ queryWrapper.apply(" now() <= t.END_TIME ");
+ }
//涓嶅湪淇�
- queryWrapper.ge(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
- &&applyDetailPageDTO.getApplyStatus().equals(Constants.TWO),
- ApplyDetail::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 23:59:59");
+ if(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
+ &&applyDetailPageDTO.getApplyStatus().equals(Constants.TWO)){
+ queryWrapper.apply("now() > t.END_TIME ");
+ }
+
queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getDuId()),ApplyDetail::getDuId,applyDetailPageDTO.getDuId());
queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getWorkTypeId()),ApplyDetail::getWorktypeId,applyDetailPageDTO.getWorkTypeId());
queryWrapper.like(StringUtils.isNotBlank(applyDetailPageDTO.getMemberName()),Member::getName,applyDetailPageDTO.getMemberName());
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 f8dd34f..d5f232d 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
@@ -1547,8 +1547,9 @@
}
if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey())
+ ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey())
||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()))){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佹棤娉曡繘琛屽叧闂�!");
}
//鍒犻櫎鍏朵粬寰呭姙
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,insuranceApply.getId()));
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index add335c..5b28bd9 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -126,6 +126,11 @@
//鍒犻櫎鍏朵粬寰呭姙
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),model.getInformantName(),
+ model.getCompanyId(), Constants.NoticeType.FOUR);
+ noticesMapper.insert(notices);
+
+
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_RETURN;
String info =applyLogType.getInfo();
info = info.replace("${param}", update.getCheckInfo());
--
Gitblit v1.9.3