From c7be7e1fcd9bb0e813b78b08cd45191883af9ce3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 19 一月 2024 15:34:06 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 73 +++++++++++++++++++++++++++++++++++-
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 12 +++++-
server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java | 4 +-
server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java | 4 ++
server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java | 6 ++
server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java | 7 +++
6 files changed, 99 insertions(+), 7 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java b/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java
index 226358b..94db26c 100644
--- a/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java
+++ b/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java
@@ -72,14 +72,14 @@
@PostMapping("/page")
@RequiresPermissions("business:applydetail:query")
public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) {
- return ApiResponse.success(applyDetailService.findPage(pageWrap));
+ return ApiResponse.success(applyDetailService.findPageForCompany(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:applydetail:exportExcel")
public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(ApplyDetail.class).export(applyDetailService.findPage(pageWrap).getRecords(), "鎶曚繚鐢宠鏄庣粏淇℃伅琛�", response);
+ ExcelExporter.build(ApplyDetail.class).export(applyDetailService.findPageForCompany(pageWrap).getRecords(), "鎶曚繚鐢宠鏄庣粏淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
index 828b623..36e3e76 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
@@ -28,12 +28,19 @@
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡寮�濮�")
private Date startTimeS;
+
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡缁撴潫")
private Date startTimeE;
@ApiModelProperty(value = "鍗曞彿")
private String code;
+ @ApiModelProperty(value = "鎻愪氦鏃ユ湡寮�濮�")
+ private Date createTimeS;
+
+ @ApiModelProperty(value = "鎻愪氦鏃ユ湡缁撴潫")
+ private Date createTimeE;
+
@ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1骞冲彴閫�鍥炰繚鍗曪紙宸查��鍥烇級 2宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔狅紙寰呯缃诧級 3宸茬绔犲緟涓婁紶淇濋櫓鍗曪紙寰呭嚭鍗曪級 4淇濆崟鍑哄叿澶辫触閫�鍥烇紙宸查��鍥烇級 5宸蹭笂浼犱繚鍗曪紙淇濋殰涓級6浼佷笟鐢宠閫�鍥炰腑 7骞冲彴鍚屾剰閫�鍥烇紙宸查��鍥烇級 8浼佷笟鍏抽棴 锛堝凡鍏抽棴锛�", example = "1")
private Integer status;
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java
index c775b5d..f8418cd 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java
@@ -11,6 +11,10 @@
@ApiModelProperty(value = "鍛樺伐鍚嶇О")
private String name;
+ @ApiModelProperty(value = "韬唤璇佸彿鐮�")
+ private String idCard;
+
+
@ApiModelProperty(value = "闇�杩囨护鏁版嵁闆嗗悎")
private List<Integer> memberIds;
diff --git a/server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java b/server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java
index f1cc91f..11baa4f 100644
--- a/server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java
+++ b/server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java
@@ -86,7 +86,11 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<ApplyDetail>
*/
- PageData<ApplyDetail> findPage(PageWrap<ApplyDetailPageDTO> pageWrap);
+ PageData<ApplyDetail> findPage(PageWrap<ApplyDetail> pageWrap);
+
+ PageData<ApplyDetail> findPageForCompany(PageWrap<ApplyDetailPageDTO> pageWrap);
+
+
/**
* 鏉′欢缁熻
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 ff71806..2c6ed89 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
@@ -94,9 +94,78 @@
QueryWrapper<ApplyDetail> wrapper = new QueryWrapper<>(applyDetail);
return applyDetailMapper.selectList(wrapper);
}
-
+
+
+
@Override
- public PageData<ApplyDetail> findPage(PageWrap<ApplyDetailPageDTO> pageWrap) {
+ public PageData<ApplyDetail> findPage(PageWrap<ApplyDetail> pageWrap) {
+ IPage<ApplyDetail> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<ApplyDetail> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(ApplyDetail::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(ApplyDetail::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(ApplyDetail::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(ApplyDetail::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getRemark() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getRemark, pageWrap.getModel().getRemark());
+ }
+ if (pageWrap.getModel().getSortnum() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getSortnum, pageWrap.getModel().getSortnum());
+ }
+ if (pageWrap.getModel().getApplyId() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getApplyId, pageWrap.getModel().getApplyId());
+ }
+ if (pageWrap.getModel().getMemberId() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getMemberId, pageWrap.getModel().getMemberId());
+ }
+ if (pageWrap.getModel().getEndTime() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getEndTime, pageWrap.getModel().getEndTime());
+ }
+ if (pageWrap.getModel().getStartTime() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getStartTime, pageWrap.getModel().getStartTime());
+ }
+ if (pageWrap.getModel().getDuId() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getDuId, pageWrap.getModel().getDuId());
+ }
+ if (pageWrap.getModel().getWorktypeId() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getWorktypeId, pageWrap.getModel().getWorktypeId());
+ }
+ if (pageWrap.getModel().getFee() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getFee, pageWrap.getModel().getFee());
+ }
+ if (pageWrap.getModel().getSex() != null) {
+ queryWrapper.lambda().eq(ApplyDetail::getSex, pageWrap.getModel().getSex());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(applyDetailMapper.selectPage(page, queryWrapper));
+ }
+
+
+
+ @Override
+ public PageData<ApplyDetail> findPageForCompany(PageWrap<ApplyDetailPageDTO> pageWrap) {
IPage<ApplyDetail> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<ApplyDetail> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
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 4cbbb7a..0942fdd 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
@@ -277,6 +277,13 @@
if (pageWrap.getModel().getStartTimeE() != null) {
queryWrapper.le(InsuranceApply::getStartTime, Utils.Date.getEnd(pageWrap.getModel().getStartTimeE()));
}
+ if (pageWrap.getModel().getCreateTimeS() != null) {
+ queryWrapper.ge(InsuranceApply::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateTimeS()));
+ }
+ if (pageWrap.getModel().getCreateTimeE() != null) {
+ queryWrapper.le(InsuranceApply::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateTimeE()));
+ }
+
if (pageWrap.getModel().getCode() != null) {
queryWrapper.eq(InsuranceApply::getCode, pageWrap.getModel().getCode());
}
@@ -356,13 +363,14 @@
||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
}
+ Constants.InsuranceApplyStatus insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN;
+ insuranceApply.setStatus(insuranceApplyStatus.getKey());
insuranceApply.setCheckDate(new Date());
insuranceApply.setCheckInfo(insuranceApplyOptDTO.getOptIllustration());
insuranceApply.setCheckUserId(loginUserInfo.getId());
insuranceApplyMapper.updateById(insuranceApply);
-
//瀛樺偍鏃ュ織鏁版嵁
- this.saveApplyLog(insuranceApply,Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN,null);
+ this.saveApplyLog(insuranceApply,insuranceApplyStatus,null);
}
--
Gitblit v1.9.3