From a43f9d75a9e0ba2720b3c438a0c5ece7be0eb110 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 28 五月 2025 18:23:45 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 6
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 11 ++
server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java | 5 +
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 4 +
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 10 +-
server/service/src/main/java/com/doumee/service/business/impl/CompanyUserApplyServiceImpl.java | 2
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 51 ++++++++++--
server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 4
server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java | 2
server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java | 47 ++++++++++-
server/company/src/main/java/com/doumee/api/business/InsuranceController.java | 6 +
server/service/src/main/java/com/doumee/service/business/SolutionsBaseService.java | 1
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 2
server/service/src/main/java/com/doumee/dao/business/vo/SettleClaimsExcelVO.java | 2
server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java | 9 ++
server/service/src/main/java/com/doumee/service/business/impl/CompanyPermissionServiceImpl.java | 2
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 6
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 2
server/service/src/main/java/com/doumee/service/business/InsuranceService.java | 2
server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java | 2
server/service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java | 2
server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java | 10 ++
server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java | 45 +++++++++-
server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsExt.java | 3
24 files changed, 191 insertions(+), 45 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/InsuranceController.java b/server/company/src/main/java/com/doumee/api/business/InsuranceController.java
index 929f336..92aaed5 100644
--- a/server/company/src/main/java/com/doumee/api/business/InsuranceController.java
+++ b/server/company/src/main/java/com/doumee/api/business/InsuranceController.java
@@ -99,7 +99,9 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:insurance:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(insuranceService.findById(id));
+ public ApiResponse findById(@PathVariable Integer id,Integer type) {
+ return ApiResponse.success(insuranceService.findByIdAndType(id,type));
}
+
+
}
diff --git a/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java b/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java
index d25ad93..14604fd 100644
--- a/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Solutions;
import com.doumee.dao.business.model.SolutionsBase;
import com.doumee.service.business.SolutionsBaseService;
@@ -18,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* @author 姹熻箘韫�
@@ -64,7 +66,12 @@
@PostMapping("/updateById")
@RequiresPermissions("business:solutionsbase:update")
public ApiResponse updateById(@RequestBody SolutionsBase solutionsBase) {
- solutionsBaseService.updateById(solutionsBase);
+ if(Objects.isNull(solutionsBase.getSaveType())
+ || Constants.equalsInteger(solutionsBase.getSaveType(),Constants.ZERO)){
+ solutionsBaseService.updateById(solutionsBase);
+ }else{
+ solutionsBaseService.saveSolutionsRisk(solutionsBase);
+ }
return ApiResponse.success(null);
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
index 8b41529..c4e3c2e 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
@@ -184,4 +184,14 @@
@ApiModelProperty(value = "琛屼繚闄╃敓鏁堣捣鏈�")
@TableField(exist = false)
private Date parentStartTime;
+
+ @ApiModelProperty(value = "鏂规鍩虹鐗堟湰涓婚敭", example = "1")
+ @TableField(exist = false)
+ private Integer solutionBaseId;
+
+
+ @ApiModelProperty(value = "鎵�灞炰繚闄╁叕鍙哥紪鐮侊紙insurance锛�", example = "1")
+ @TableField(exist = false)
+ private Integer insuranceId;
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
index ca7b16c..b1fbc38 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
@@ -210,6 +210,11 @@
@ApiModelProperty(value = "淇濆崟鏄庣粏琛屼富閿�")
private Integer applyDetailId;
+ @ApiModelProperty(value = "鎶ユ鏃堕棿")
+ @TableField(exist = false)
+ private Date reportDate;
+
+
@ApiModelProperty(value = "璧斿伩閲戦")
@TableField(exist = false)
@ExcelColumn(name="璧斿伩閲戦",index = 10,width = 16)
@@ -338,4 +343,10 @@
@ApiModelProperty(value = "鎷掔粷閫�鍥炴棩蹇�")
@TableField(exist = false)
private SettleClaimsLog refuseSettleClaimsLog;
+
+ @ApiModelProperty(value = "琛ュ厖璇存槑鏃ュ織")
+ @TableField(exist = false)
+ private SettleClaimsLog supplementSettleClaimsLog;
+
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsExt.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsExt.java
index dfb16fd..a7beb3c 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsExt.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsExt.java
@@ -276,4 +276,7 @@
@ExcelColumn(name="璐ｄ换涓庤瘎娈嬫潯閴村畾淇℃伅-娆惧叧鑱斿叧绯� 0淇濆崟鍙� 1鍏宠仈璇勬畫鏉℃ 2鍔冲姩鑳藉姏閴村畾")
private Integer jdZrpctkRel;
+ @ApiModelProperty(value = "鎶ユ鏃堕棿")
+ private Date reportDate;
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java b/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
index c92717b..ee0181e 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
@@ -192,4 +192,9 @@
@TableField(exist = false)
private List<Integer> worktypeIdList;
+
+ @ApiModelProperty(value = "淇濆瓨绫诲瀷锛�0姝ｅ父鏁版嵁锛�1椋庨櫓淇℃伅", example = "1")
+ @TableField(exist = false)
+ private Integer saveType;
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/vo/SettleClaimsExcelVO.java b/server/service/src/main/java/com/doumee/dao/business/vo/SettleClaimsExcelVO.java
index 1c0867f..4c928c8 100644
--- a/server/service/src/main/java/com/doumee/dao/business/vo/SettleClaimsExcelVO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/vo/SettleClaimsExcelVO.java
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鎶ユ鏃堕棿",index = 4,width = 20,dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date createDate;
+ private Date reportDate;
@ApiModelProperty(value = "鍑洪櫓鏃堕棿")
@ExcelColumn(name="鍑洪櫓鏃堕棿",index = 5,width = 20,dateFormat = "yyyy-MM-dd HH:mm:ss")
diff --git a/server/service/src/main/java/com/doumee/service/business/InsuranceService.java b/server/service/src/main/java/com/doumee/service/business/InsuranceService.java
index 0b95966..c7d5b45 100644
--- a/server/service/src/main/java/com/doumee/service/business/InsuranceService.java
+++ b/server/service/src/main/java/com/doumee/service/business/InsuranceService.java
@@ -98,4 +98,6 @@
void updateStatus(Insurance insurance);
void saveLpInfo(Insurance insurance);
+
+ Insurance findByIdAndType(Integer id,Integer type);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/SolutionsBaseService.java b/server/service/src/main/java/com/doumee/service/business/SolutionsBaseService.java
index 8d5c90a..5cb8515 100644
--- a/server/service/src/main/java/com/doumee/service/business/SolutionsBaseService.java
+++ b/server/service/src/main/java/com/doumee/service/business/SolutionsBaseService.java
@@ -48,6 +48,7 @@
*/
void updateById(SolutionsBase solutionsBase);
+ void saveSolutionsRisk(SolutionsBase solutionsBase);
/**
* 鎵归噺涓婚敭鏇存柊
*
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 91e7b7c..1dd9e0a 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
@@ -260,7 +260,7 @@
pidanFile.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
pidanFile.setType(Constants.TWO);
}
- multifileMapper.insertBatchSomeColumn(pidanFileList);
+ multifileMapper.insert(pidanFileList);
update.setApplyId(model.getApplyId());
@@ -360,7 +360,7 @@
pidanFile.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
pidanFile.setType(Constants.TWO);
}
- multifileMapper.insertBatchSomeColumn(param.getPidanFileList());
+ multifileMapper.insert(param.getPidanFileList());
// param.getPidanFile().setIsdeleted(Constants.ZERO);
// param.getPidanFile().setObjId(update.getId());
@@ -805,7 +805,7 @@
}
if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
- memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
+ memberInsuranceJoinMapper.insert(memberInsuranceList);
}
if (totalFee.compareTo(new BigDecimal(0)) != 0) {
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 0134629..529c16c 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
@@ -307,16 +307,20 @@
queryWrapper.selectAs(Solutions::getId,ApplyDetail::getSolutionId);
queryWrapper.selectAs(Solutions::getName,ApplyDetail::getSolutionName);
queryWrapper.selectAs(Solutions::getType,ApplyDetail::getSolutionType);
+ queryWrapper.selectAs(Insurance::getBaseId,ApplyDetail::getInsuranceId);
queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
queryWrapper.selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo);
queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName);
queryWrapper.selectAs(InsuranceApply::getStartTime,ApplyDetail::getParentStartTime);
queryWrapper.selectAs(InsuranceApply::getEndTime,ApplyDetail::getParentEndTime);
+
+ queryWrapper.selectAs(Solutions::getParentId,ApplyDetail::getSolutionBaseId);
queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId);
queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId);
queryWrapper.leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId);
queryWrapper.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId);
queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
+ queryWrapper.leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId);
queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getApplyId()),ApplyDetail::getApplyId,applyDetailPageDTO.getApplyId());
queryWrapper.ge(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
&&!applyDetailPageDTO.getApplyStatus().equals(Constants.ZERO),
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyPermissionServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyPermissionServiceImpl.java
index 4fec71a..9add455 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyPermissionServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyPermissionServiceImpl.java
@@ -77,7 +77,7 @@
model.setCreateDate(date);
list.add(model);
}
- companyPermissionMapper.insertBatchSomeColumn(list);
+ companyPermissionMapper.insert(list);
}
return companyPermission.getId();
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index c158679..7bc78a6 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -383,7 +383,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇濋櫓鏂规銆�"+s.getName()+"銆戝凡琚鐢紝涓嶈兘杩涜璇ユ搷浣�");
}
}
- companySolutionJoinMapper.insertBatchSomeColumn(list);
+ companySolutionJoinMapper.insert(list);
//瀛樺偍寰呭姙淇℃伅
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SOLUTIONS;
for (CompanySolution s:list) {
@@ -457,7 +457,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇濋櫓鏂规銆�"+s.getName()+"銆戝凡琚鐢紝涓嶈兘杩涜璇ユ搷浣�");
}
}
- companySolutionJoinMapper.insertBatchSomeColumn(list);
+ companySolutionJoinMapper.insert(list);
}*/
@@ -502,7 +502,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇濋櫓鏂规銆�"+s.getName()+"銆戝凡琚鐢紝涓嶈兘杩涜璇ユ搷浣�");
}
}
- companySolutionJoinMapper.insertBatchSomeColumn(list);
+ companySolutionJoinMapper.insert(list);
}*/
private void isValidCreateParam(Company company) {
if(StringUtils.isBlank(company.getPhone())
@@ -545,7 +545,7 @@
}else {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺韩浠借瘉鎵弿浠讹紒");
}
- multifileMapper.insertBatchSomeColumn(multifileList);
+ multifileMapper.insert(multifileList);
}
private void dealFileDataForUpdate(Company company ) {
@@ -586,7 +586,7 @@
.eq(Multifile::getIsdeleted,Constants.ZERO)
.in(Multifile::getObjType,objList)
);
- multifileMapper.insertBatchSomeColumn(multifileList);
+ multifileMapper.insert(multifileList);
}
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserApplyServiceImpl.java
index b8df447..bf238c9 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserApplyServiceImpl.java
@@ -308,7 +308,7 @@
companyPermission.setType(Constants.ONE);
companyPermissionList.add(companyPermission);
}
- companyPermissionMapper.insertBatchSomeColumn(companyPermissionList);
+ companyPermissionMapper.insert(companyPermissionList);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
index f3210d9..8c132f1 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
@@ -228,7 +228,7 @@
}
if(newWorktypes!=null &&newWorktypes.size()>0){
//鎵归噺鏌ヨ宸ョ鍏宠仈璁板綍
- duWorktypeMapper.insertBatchSomeColumn(newWorktypes);
+ duWorktypeMapper.insert(newWorktypes);
}
}
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 3e5853d..906ff97 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
@@ -330,7 +330,7 @@
);
}
- memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
+ memberInsuranceJoinMapper.insert(memberInsuranceList);
}
this.updateApplyCurrentFee(insuranceApply.getId(),null);
@@ -2452,7 +2452,7 @@
this.checkMemberSolution(solutions.getParentId(),member.getIdcardNo(),member.getName(),insuranceApply.getStartTime(),insuranceApply.getEndTime(),insuranceApply.getId());
}
if(CollectionUtils.isNotEmpty(addMemberList)){
- memberJoinMapper.insertBatchSomeColumn(addMemberList);
+ memberJoinMapper.insert(addMemberList);
}
memberList.addAll(addMemberList);
for (int i = 0; i < applyDetailList.size(); i++) {
@@ -2539,7 +2539,7 @@
}
Long end = System.currentTimeMillis();
logger.error("澶勭悊鍗曟暟鎹粨鏉熸椂闂�:=========================>"+end +";鑰楁椂锛�====銆�"+(end-start));
- applyDetailJoinMapper.insertBatchSomeColumn(applyDetailList);
+ applyDetailJoinMapper.insert(applyDetailList);
}
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
index e03f3c8..88d1647 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
@@ -427,16 +427,11 @@
}
@Override
- public Insurance findById(Integer id) {
+ public Insurance findByIdAndType(Integer id,Integer type) {
Insurance model = insuranceMapper.selectById(id);
if(model == null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY );
}
- List<Worktype> worktypeList = worktypeMapper.selectList(new QueryWrapper<Worktype>().lambda()
- .eq(Worktype::getInsuranceId,id)
- .eq(Worktype::getIsdeleted,Constants.ZERO)
- .orderByAsc(Worktype::getSortnum));
- model.setWorktypeList(worktypeList);
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
systemDictDataBiz.queryByCode(Constants.OSS,Constants.INSURANCE).getCode();
//闄勪欢淇℃伅
@@ -453,11 +448,49 @@
lpFile.setFileurlFull(path + lpFile.getFileurl());
model.setLpFile(lpFile);
}
-
+ if(Objects.nonNull(type)&&Constants.equalsInteger(type,Constants.ONE)){
+ return model;
+ }
+ List<Worktype> worktypeList = worktypeMapper.selectList(new QueryWrapper<Worktype>().lambda()
+ .eq(Worktype::getInsuranceId,id)
+ .eq(Worktype::getIsdeleted,Constants.ZERO)
+ .orderByAsc(Worktype::getSortnum));
+ model.setWorktypeList(worktypeList);
return model;
}
@Override
+ public Insurance findById(Integer id) {
+ return this.findByIdAndType(id,null);
+// Insurance model = insuranceMapper.selectById(id);
+// if(model == null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY );
+// }
+// List<Worktype> worktypeList = worktypeMapper.selectList(new QueryWrapper<Worktype>().lambda()
+// .eq(Worktype::getInsuranceId,id)
+// .eq(Worktype::getIsdeleted,Constants.ZERO)
+// .orderByAsc(Worktype::getSortnum));
+// model.setWorktypeList(worktypeList);
+// String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
+// systemDictDataBiz.queryByCode(Constants.OSS,Constants.INSURANCE).getCode();
+// //闄勪欢淇℃伅
+// Multifile lpStampTempFile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
+// .eq(Multifile::getObjId,id).eq(Multifile::getObjType,Constants.MultiFile.LP_STAMP_FILE.getKey()).last("limit 1"));
+// if(Objects.nonNull(lpStampTempFile)){
+// lpStampTempFile.setFileurlFull(path + lpStampTempFile.getFileurl());
+// model.setLpStampTempFile(lpStampTempFile);
+// }
+//
+// Multifile lpFile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
+// .eq(Multifile::getObjId,id).eq(Multifile::getObjType,Constants.MultiFile.LP_FILE.getKey()).last("limit 1"));
+// if(Objects.nonNull(lpFile)){
+// lpFile.setFileurlFull(path + lpFile.getFileurl());
+// model.setLpFile(lpFile);
+// }
+
+ }
+
+ @Override
public Insurance findOne(Insurance insurance) {
QueryWrapper<Insurance> wrapper = new QueryWrapper<>(insurance);
return insuranceMapper.selectOne(wrapper);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java
index 8b6f279..5ea3e1e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java
@@ -46,7 +46,7 @@
if(Objects.isNull(knowledge)
|| StringUtils.isBlank(knowledge.getTitle())
|| StringUtils.isBlank(knowledge.getLink())
- || Objects.isNull(knowledge.getCityId())
+// || Objects.isNull(knowledge.getCityId())
|| Objects.isNull(knowledge.getProvinceId())
|| StringUtils.isBlank(knowledge.getYearInfo())
|| StringUtils.isBlank(knowledge.getTitle())
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
index 499431b..ded1bf6 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
@@ -41,7 +41,7 @@
|| StringUtils.isEmpty(labels.getName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(labelsMapper.selectCount(new QueryWrapper<Labels>().lambda().eq(Labels::getIsdeleted,Constants.ZERO).eq(Labels::getStatus,Constants.ZERO))>=5){
+ if(labelsMapper.selectCount(new QueryWrapper<Labels>().lambda().eq(Labels::getIsdeleted,Constants.ZERO).eq(Labels::getStatus,Constants.ZERO))>=50){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鏈�澶氶厤缃�50涓爣绛緙");
}
labelsMapper.delete(new QueryWrapper<Labels>().lambda().eq(Labels::getName,labels.getName()));
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 58914ca..85c3211 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
@@ -396,6 +396,7 @@
}
if(!Constants.equalsObject(settleClaims.getStatus(),Constants.ZERO)
&&( Objects.isNull(settleClaims.getExtData().getBxName())
+ || Objects.isNull(settleClaims.getExtData().getReportDate())
|| Objects.isNull(settleClaims.getExtData().getBxCode())
|| Objects.isNull(settleClaims.getExtData().getBxEnddate())
|| Objects.isNull(settleClaims.getExtData().getBxOrg())
@@ -567,6 +568,7 @@
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鎻愭姤涓殑鎶ユ鏁版嵁!");
}
+
settleClaims.setCreateDate(new Date());
settleClaims.setIsdeleted(Constants.ZERO);
settleClaims.setCompanyId(loginUserInfo.getCompanyId());
@@ -850,7 +852,24 @@
settleClaims.setRefuseSettleClaimsLog(settleClaimsLog);
}
-
+ if((Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())
+ || Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION.getKey()))
+ && Constants.equalsInteger(settleClaims.getWaitSupplement(),Constants.ONE)){
+ SettleClaimsLog settleClaimsLog = settleClaimsLogJoinMapper.selectJoinOne(SettleClaimsLog.class,
+ new MPJLambdaWrapper<SettleClaimsLog>()
+ .selectAll(SettleClaimsLog.class)
+ .selectAs(SystemUser::getRealname,SettleClaimsLog::getCreatorName)
+ .selectAs(SystemUser::getType,SettleClaimsLog::getCreatorType)
+ .selectAs(Company::getName,SettleClaimsLog::getCompanyName)
+ .leftJoin(SystemUser.class,SystemUser::getId,SettleClaimsLog::getCreator)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
+ .in(SettleClaimsLog::getObjType,Constants.SettleClaimsLogType.SUPPLEMENT_DESCRIBE.getKey())
+ .orderByDesc(SettleClaimsLog::getCreateDate)
+ .last(" limit 1")
+ );
+ settleClaims.setSupplementSettleClaimsLog(settleClaimsLog);
+ }
@@ -1183,6 +1202,7 @@
.selectAs(Member::getIdcardNo,SettleClaims::getMemberIdcardNo)
.selectAs(Worktype::getName,SettleClaims::getWorktypeName)
.selectAs(InsuranceApply::getStartTime,SettleClaims::getBaoxianStartTime)
+ .selectAs(InsuranceApply::getCode,SettleClaims::getApplyCode)
.selectAs(DispatchUnit::getName,SettleClaims::getDuName)
.selectAs(InsuranceApply::getStartTime,SettleClaims::getBaoxianStartTime)
.selectAs(InsuranceApply::getEndTime,SettleClaims::getBaoxianEndTime)
@@ -1201,7 +1221,8 @@
}else {
queryWrapper. in(Company::getId, user.getCompanyIdList());
}
- } else {
+ queryWrapper.ne(SettleClaims::getStatus,Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey());
+ }{
//浼佷笟鐢ㄦ埛鍙湅鑷繁鐨勬暟鎹�
pageWrap.getModel().setCompanyId(user.getCompanyId());
}
@@ -1257,6 +1278,7 @@
.selectAs(SettleClaimsExt::getBxStartdate,SettleClaims::getBaoxianStartTime)
.selectAs(SettleClaimsExt::getBxEnddate,SettleClaims::getBaoxianEndTime)
.selectAs(SettleClaimsExt::getBxCode,SettleClaims::getApplyCode)
+ .selectAs(SettleClaimsExt::getReportDate,SettleClaims::getReportDate)
.innerJoin(SettleClaimsExt.class,SettleClaimsExt::getSettileClaimsId,SettleClaims::getId);
queryWrapper.eq(SettleClaims::getIsdeleted,Constants.ZERO);
queryWrapper.eq(SettleClaims::getOrigin,Constants.ONE);
@@ -1273,7 +1295,9 @@
queryWrapper.orderByDesc(SettleClaims::getCreateDate);
PageData<SettleClaims> pageData = PageData.from(settleClaimsJoinMapper.selectJoinPage(page,SettleClaims.class, queryWrapper));
for (SettleClaims settleClaims:pageData.getRecords()) {
- settleClaims.setStatusName(Constants.SettleClaimsStatus.getName(settleClaims.getStatus()));
+ if(Objects.nonNull(settleClaims.getStatus())){
+ settleClaims.setStatusName(Constants.SettleClaimsStatus.getName(settleClaims.getStatus()));
+ }
settleClaims.setPcAccount(settleClaims.getHpAccount().add(settleClaims.getHpOtherAccount()));
}
return pageData;
@@ -1327,6 +1351,14 @@
BeanUtils.copyProperties(settleClaimsDTO,settleClaims);
settleClaims.setReportNumStatus(Constants.ZERO);
settleClaims.setOrigin(Constants.ZERO);
+ if(Constants.equalsInteger(settleClaimsDTO.getSaveType(),Constants.ONE)&&StringUtils.isBlank(settleClaims.getCode())){
+ Long nextCode = settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda().ne(SettleClaims::getStatus,Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())
+ .eq(SettleClaims::getOrigin,Constants.ZERO) .like(SettleClaims::getCreateDate,DateUtil.getDate(new Date(),"yyyy-MM-dd"))
+ )+1;
+ settleClaims.setCode("YYBLP-"+DateUtil.getDate(new Date(),"yyyyMMdd")+
+ (StringUtils.leftPad(nextCode.toString(),2,"0"))
+ );
+ }
if(Objects.nonNull(settleClaims.getId())){
settleClaims.setEditDate(new Date());
settleClaims.setEditor(loginUserInfo.getId());
@@ -1369,7 +1401,7 @@
}
Date happenTime = DateUtil.StringToDate(settleClaims.getHappenTime());
if(happenTime.getTime() < insuranceApply.getStartTime().getTime() || happenTime.getTime() > insuranceApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"浜嬫晠鍙戠敓浜嬩欢鏈湪淇濆崟鐢熸晥鑼冨洿鍐�");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"浜嬫晠鍙戠敓鏃堕棿鏈湪淇濆崟鐢熸晥鑼冨洿鍐�");
}
Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
if(Objects.isNull(solutions)){
@@ -1952,8 +1984,11 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠呭彲淇敼涓�娆℃姤妗堝彿");
}
if(!(
- (Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())&&Constants.equalsInteger(model.getReportNumStatus(),Constants.ONE))
- ||(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())
+ (Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())
+ &&Constants.equalsInteger(model.getReportNumStatus(),Constants.ONE))
+ ||((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())
+ || Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())
+ || Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_DISCUSS_AUDIT.getKey()))
&&Constants.equalsInteger(model.getReportNumStatus(),Constants.ZERO))
// ||(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_DEAL.getKey())
// &&Constants.equalsInteger(model.getReportNumStatus(),Constants.ZERO))
@@ -2090,11 +2125,11 @@
//鍙楃悊鍟嗚瀹℃壒
settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
.eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime()).set(SettleClaims::getEditor,loginUserInfo.getId())
- .set(SettleClaims::getStatus,Constants.SettleClaimsStatus.REJECT_DEAL.getKey()));
+ .set(SettleClaims::getStatus,Constants.SettleClaimsStatus.WAIT_DISCUSS_AUDIT.getKey()));
//瀛樺偍鏃ュ織
this.saveSettleClaimsLog(settleClaims,
Constants.SettleClaimsLogType.PLATFORM_WAIT_DISCUSS,
- dto.getDescribe(),Constants.SettleClaimsStatus.REJECT_DEAL);
+ dto.getDescribe(),Constants.SettleClaimsStatus.WAIT_DISCUSS_AUDIT);
}
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
index 8d21eff..fe919a1 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
@@ -145,6 +145,7 @@
//鍘嗗彶鐗堟湰鐨勫伐绉嶄俊鎭�
SolutionWorktype newType = new SolutionWorktype();
BeanUtils.copyProperties(w, newType);
+ newType.setId(null);
newType.setSolutionId(newModel.getId());
solutionWorktypeJoinMapper.insert(newType);
}
@@ -163,12 +164,12 @@
|| Objects.isNull(solutionsBase.getAddValidDays())
|| Objects.isNull(solutionsBase.getDelValidDays())
|| Objects.isNull(solutionsBase.getInsuranceId())
- || Objects.isNull(solutionsBase.getRiskDelayStatus())
- || Objects.isNull(solutionsBase.getRiskDelayTime())
- || Objects.isNull(solutionsBase.getRiskDelayUnit())
- || Objects.isNull(solutionsBase.getRiskNewUserStatus())
- || Objects.isNull(solutionsBase.getRiskNewUserTime())
- || Objects.isNull(solutionsBase.getRiskNewUserUnit())
+// || Objects.isNull(solutionsBase.getRiskDelayStatus())
+// || Objects.isNull(solutionsBase.getRiskDelayTime())
+// || Objects.isNull(solutionsBase.getRiskDelayUnit())
+// || Objects.isNull(solutionsBase.getRiskNewUserStatus())
+// || Objects.isNull(solutionsBase.getRiskNewUserTime())
+// || Objects.isNull(solutionsBase.getRiskNewUserUnit())
||solutionsBase.getInsuranceId()==null
|| Constants.formatIntegerNum(solutionsBase.getMaxAge()) < 0
@@ -181,6 +182,35 @@
if(Constants.equalsInteger(solutionsBase.getValidType(),Constants.ZERO) && Objects.isNull(solutionsBase.getValidTypeNum())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ }
+
+
+ @Override
+ public void saveSolutionsRisk(SolutionsBase solutionsBase){
+ if( Objects.isNull(solutionsBase)
+ || Objects.isNull(solutionsBase.getId())
+ ||Objects.isNull(solutionsBase.getRiskDelayStatus())
+ || Objects.isNull(solutionsBase.getRiskDelayTime())
+ || Objects.isNull(solutionsBase.getRiskDelayUnit())
+ || Objects.isNull(solutionsBase.getRiskNewUserStatus())
+ || Objects.isNull(solutionsBase.getRiskNewUserTime())
+ || Objects.isNull(solutionsBase.getRiskNewUserUnit())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ SolutionsBase model = solutionsBaseMapper.selectById(solutionsBase.getId());
+ if(Objects.isNull(model)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ solutionsBaseMapper.update(new UpdateWrapper<SolutionsBase>().lambda()
+ .set(SolutionsBase::getEditDate,new Date())
+ .set(SolutionsBase::getRiskDelayStatus,solutionsBase.getRiskDelayStatus())
+ .set(SolutionsBase::getRiskDelayTime,solutionsBase.getRiskDelayTime())
+ .set(SolutionsBase::getRiskDelayUnit,solutionsBase.getRiskDelayUnit())
+ .set(SolutionsBase::getRiskNewUserStatus,solutionsBase.getRiskNewUserStatus())
+ .set(SolutionsBase::getRiskNewUserTime,solutionsBase.getRiskNewUserTime())
+ .set(SolutionsBase::getRiskNewUserUnit,solutionsBase.getRiskNewUserUnit())
+ .eq(SolutionsBase::getId,solutionsBase.getId())
+ );
}
@Override
@@ -218,6 +248,9 @@
solutionsBaseMapper.deleteBatchIds(ids);
}
+
+
+
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void updateById(SolutionsBase solutionsBase) {
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
index 7563390..5090c9d 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
@@ -497,7 +497,7 @@
taxDetial.setTotalFee(insuranceApply.getCurrentFee());
taxDetial.setType(Constants.ZERO);
}
- taxDetailJoinMapper.insertBatchSomeColumn(taxDetialList);
+ taxDetailJoinMapper.insert(taxDetialList);
//瀛樺偍寰呭姙淇℃伅
@@ -701,7 +701,7 @@
}
}
if(CollectionUtils.isNotEmpty(taxDetailList)){
- taxDetailJoinMapper.insertBatchSomeColumn(taxDetailList);
+ taxDetailJoinMapper.insert(taxDetailList);
}else{
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犲彲寮�绁ㄦ暟鎹紝鎿嶄綔澶辫触");
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
index 11b1746..fa6fa88 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -991,7 +991,7 @@
);
}
- memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
+ memberInsuranceJoinMapper.insert(memberInsuranceList);
}
BigDecimal detailFee = Constants.reduceFee(solutions,solutions.getPrice().add(serverCost),insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime());
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
index 4f40b77..9a87958 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
@@ -788,7 +788,7 @@
pidanFile.setObjType(Constants.MultiFile.WTB_CA_DONE_PDF.getKey());
pidanFile.setType(Constants.TWO);
}
- multifileMapper.insertBatchSomeColumn(pidanFileList);
+ multifileMapper.insert(pidanFileList);
for (ApplyChange applyChange:applyChangeList) {
for (Multifile pidanFile:pidanFileList) {
--
Gitblit v1.9.3