From 87cc98263db6d1eeac48d0c06852c559cd0838ea Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 20 一月 2024 09:37:59 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 38 +++++++++
server/service/src/main/java/com/doumee/dao/business/model/Member.java | 4 +
server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 8 +-
server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java | 11 ++
server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java | 7 +
server/company/src/main/java/com/doumee/api/business/MemberController.java | 14 ++-
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 55 ++++++++++++-
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 31 +++++--
server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java | 8 ++
server/service/src/main/java/com/doumee/service/business/MemberService.java | 2
server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyOptDTO.java | 3
server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java | 2
server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java | 20 ++++
14 files changed, 179 insertions(+), 26 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 94db26c..a3710bd 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
@@ -88,4 +88,15 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(applyDetailService.findById(id));
}
+
+
+ @ApiOperation("鏌ヨ鍛樺伐鎶曚繚璁板綍")
+ @GetMapping("/getMemberApplyList")
+ public ApiResponse<List<ApplyDetail>> getMemberApplyList(@RequestParam Integer memberId) {
+ return ApiResponse.success(applyDetailService.getMemberApplyList(memberId));
+ }
+
+
+
+
}
diff --git a/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index 2790cf0..593bf81 100644
--- a/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -91,10 +91,10 @@
}
- @ApiOperation("浼佷笟鐢宠閫�鍥�")
- @PostMapping("/applyReturn")
- public ApiResponse applyReturn (@RequestBody InsuranceApplyOptDTO insuranceApplyOptDTO) {
- insuranceApplyService.applyReturn(insuranceApplyOptDTO);
+ @ApiOperation("鐢宠璁板綍鐘舵�佸鐞�")
+ @PostMapping("/applyOpt")
+ public ApiResponse applyOpt (@RequestBody InsuranceApplyOptDTO insuranceApplyOptDTO) {
+ insuranceApplyService.applyOpt(insuranceApplyOptDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
diff --git a/server/company/src/main/java/com/doumee/api/business/MemberController.java b/server/company/src/main/java/com/doumee/api/business/MemberController.java
index f2ff881..4d134c9 100644
--- a/server/company/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/company/src/main/java/com/doumee/api/business/MemberController.java
@@ -71,18 +71,24 @@
return ApiResponse.success(null);
}
+
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:member:query")
- public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {
- return ApiResponse.success(memberService.findPage(pageWrap));
+ public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<MemberQueryDTO> pageWrap) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.getModel().setCompanyId(user.getCompanyId());
+ return ApiResponse.success(memberService.findPageForCompany(pageWrap));
}
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:member:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "鐢ㄥ伐淇℃伅琛�", response);
+ public void exportExcel (@RequestBody PageWrap<MemberQueryDTO> pageWrap, HttpServletResponse response) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.getModel().setCompanyId(user.getCompanyId());
+ ExcelExporter.build(Member.class).export(memberService.findPageForCompany(pageWrap).getRecords(), "鐢ㄥ伐淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
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 b8bf63d..84598f6 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
@@ -663,7 +663,7 @@
FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�"),
UPLOAD_INSURANCE(5, "宸蹭笂浼犱繚鍗�"),
COMPANY_APPLY_RETURN(6, "浼佷笟鐢宠閫�鍥�"),
- COMPANY_APPLY_CLOSE(7, "浼佷笟鍏抽棴鐢宠"),
+ PLATFORM_AGREE(7, "骞冲彴鍚屾剰閫�鍥�"),
CLOSE(8, "璁㈠崟鍏抽棴"),
;
// 鎴愬憳鍙橀噺
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyOptDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyOptDTO.java
index d9de1e6..7b48f9f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyOptDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyOptDTO.java
@@ -17,4 +17,7 @@
@ApiModelProperty(value = "鎿嶄綔璇存槑")
private String optIllustration;
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷锛�1=鐢宠閫�鍥烇紱2=鍏抽棴")
+ private Integer optType;
+
}
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 f8418cd..bb8c8cf 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
@@ -14,6 +14,14 @@
@ApiModelProperty(value = "韬唤璇佸彿鐮�")
private String idCard;
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅涓婚敭")
+ private Integer duId;
+
+ @ApiModelProperty(value = "淇濋櫓鏂规涓婚敭")
+ private Integer solutionsId;
+
+ @ApiModelProperty(value = "淇濋櫓鐘舵��:0=鍏ㄩ儴;1=淇濋殰涓�;2=涓嶅湪淇�")
+ private Integer solutionsStatus;
@ApiModelProperty(value = "闇�杩囨护鏁版嵁闆嗗悎")
private List<Integer> memberIds;
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 a49a2be..0ecb3e6 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
@@ -97,14 +97,30 @@
@ExcelColumn(name="褰撳墠璐圭敤")
private BigDecimal currentFee;
- @ApiModelProperty(value = "鍛樺伐鍚嶇О")
+ @ApiModelProperty(value = "鏉ユ簮涓婚敭锛坅pply_chagne_detail锛夊姞鍑忎繚鐢熸垚瀛樺湪", example = "1")
+ @ExcelColumn(name="鏉ユ簮涓婚敭锛坅pply_chagne_detail锛夊姞鍑忎繚鐢熸垚瀛樺湪")
+ private Integer fromId;
+
+ @ApiModelProperty(value = "淇濆崟鍙�")
@TableField(exist = false)
- private String memberName;
+ private String applyCode;
+
+ @ApiModelProperty(value = "鏂规鍚嶇О")
+ @TableField(exist = false)
+ private String solutionName;
+
+ @ApiModelProperty(value = "鎵瑰崟鍙�")
+ @TableField(exist = false)
+ private String validCode;
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
@TableField(exist = false)
private String duName;
+ @ApiModelProperty(value = "鍛樺伐鍚嶇О")
+ @TableField(exist = false)
+ private String memberName;
+
@ApiModelProperty(value = "宸ョ鍚嶇О")
@TableField(exist = false)
private String workTypeName;
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Member.java b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
index 17bbcc4..3d0d6fd 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -92,6 +92,10 @@
@ExcelColumn(name="鎬у埆 0鐢� 1濂�")
private Integer sex;
+ @ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О")
+ @TableField(exist = false)
+ private String solutionName;
+
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
@TableField(exist = false)
private String duName;
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 11baa4f..ffd0d37 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
@@ -99,4 +99,11 @@
* @return long
*/
long count(ApplyDetail applyDetail);
+
+ /**
+ * 鏌ヨ鍛樺伐鎶曚繚璁板綍
+ * @param memberId
+ * @return
+ */
+ List<ApplyDetail> getMemberApplyList(Integer memberId);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java b/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
index a926df7..e5ca65b 100644
--- a/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
+++ b/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
@@ -99,5 +99,5 @@
InsuranceApply findDetail(Integer id);
- void applyReturn(InsuranceApplyOptDTO insuranceApplyOptDTO);
+ void applyOpt(InsuranceApplyOptDTO insuranceApplyOptDTO);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/MemberService.java b/server/service/src/main/java/com/doumee/service/business/MemberService.java
index f553fd8..70da9b5 100644
--- a/server/service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/service/src/main/java/com/doumee/service/business/MemberService.java
@@ -88,6 +88,8 @@
*/
PageData<Member> findPage(PageWrap<Member> pageWrap);
+ PageData<Member> findPageForCompany(PageWrap<MemberQueryDTO> 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 2c6ed89..20d8c43 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
@@ -173,8 +173,18 @@
queryWrapper.selectAs(DispatchUnit::getName,ApplyDetail::getDuName);
queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName);
+ queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId);
+ queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId);
+ queryWrapper.leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId);
+
+
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),
@@ -207,4 +217,32 @@
QueryWrapper<ApplyDetail> wrapper = new QueryWrapper<>(applyDetail);
return applyDetailMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public List<ApplyDetail> getMemberApplyList(Integer memberId) {
+ List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,
+ new MPJLambdaWrapper<ApplyDetail>()
+ .selectAll(ApplyDetail.class)
+ .selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
+ .selectAs(Worktype::getName,ApplyDetail::getWorkTypeName)
+ .selectAs(Member::getName,ApplyDetail::getMemberName)
+ .selectAs(Solutions::getName,ApplyDetail::getSolutionName)
+ .selectAs(ApplyChange::getValidCode,ApplyDetail::getValidCode)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+ .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
+ .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
+ .leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId)
+ .leftJoin(ApplyChagneDetail.class,ApplyChagneDetail::getId,ApplyDetail::getFromId)
+ .leftJoin(ApplyChange.class,ApplyChange::getId,ApplyChagneDetail::getApplyChangeId)
+ .eq(ApplyDetail::getMemberId,memberId)
+ .orderByAsc(ApplyDetail::getCreateDate)
+ );
+ return applyDetailList;
+ }
+
+
+
+
}
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 3860d1e..8940095 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
@@ -337,7 +337,7 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void applyReturn(InsuranceApplyOptDTO insuranceApplyOptDTO){
+ public void applyOpt(InsuranceApplyOptDTO insuranceApplyOptDTO){
if(Objects.isNull(insuranceApplyOptDTO)
||Objects.isNull(insuranceApplyOptDTO.getApplyId())
||StringUtils.isBlank(insuranceApplyOptDTO.getOptIllustration())){
@@ -354,15 +354,26 @@
if(insuranceApply.getIsdeleted().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�");
}
- if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN.getKey())){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"閫�鍥炵敵璇蜂腑锛岃鍕块噸澶嶆搷浣�");
+ Constants.InsuranceApplyStatus insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN;
+ if(insuranceApplyOptDTO.getOptType().equals(Constants.ONE)){
+ if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN.getKey())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"閫�鍥炵敵璇蜂腑锛岃鍕块噸澶嶆搷浣�");
+ }
+ if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())
+ ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
+ ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
+ }
+ }else if(insuranceApplyOptDTO.getOptType().equals(Constants.TWO)){
+ insuranceApplyStatus = Constants.InsuranceApplyStatus.CLOSE;
+ if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.CLOSE.getKey())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"宸插叧闂紝璇峰嬁閲嶅鎿嶄綔");
+ }
+ if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_AGREE.getKey())
+ ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey()))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
+ }
}
- if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())
- ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
- ||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());
@@ -370,8 +381,8 @@
insuranceApplyMapper.updateById(insuranceApply);
//瀛樺偍鏃ュ織鏁版嵁
this.saveApplyLog(insuranceApply,insuranceApplyStatus,null);
-
}
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 94379e9..0e9f7e3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1,16 +1,15 @@
package com.doumee.service.business.impl;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dto.MemberQueryDTO;
import com.doumee.dao.business.join.MemberJoinMapper;
-import com.doumee.dao.business.model.DispatchUnit;
-import com.doumee.dao.business.model.DuWorktype;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.Worktype;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -18,9 +17,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -40,6 +42,8 @@
@Override
public Integer create(Member member) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ member.setCompanyId(loginUserInfo.getCompanyId());
memberMapper.insert(member);
return member.getId();
}
@@ -157,6 +161,48 @@
return PageData.from(memberMapper.selectPage(page, queryWrapper));
}
+
+
+ @Override
+ public PageData<Member> findPageForCompany(PageWrap<MemberQueryDTO> pageWrap) {
+ IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ MemberQueryDTO memberQueryDTO = pageWrap.getModel();
+ queryWrapper.selectAll(Member.class)
+ .selectAs(DispatchUnit::getName,Member::getDuName)
+ .selectAs(Worktype::getName,Member::getWorkTypeName)
+ .selectAs(Solutions::getName,Member::getSolutionName)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,Member::getApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+ .leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId)
+ .leftJoin(Worktype.class,Worktype::getId,Member::getWorktypeId)
+ .eq(Member::getIsdeleted, Constants.ZERO)
+ .eq(Member::getCompanyId, memberQueryDTO.getCompanyId())
+ .like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName())
+ .like(StringUtils.isNotBlank(memberQueryDTO.getIdCard()),Member::getIdcardNo, memberQueryDTO.getIdCard())
+ .eq(!Objects.isNull(memberQueryDTO.getDuId()),Member::getDuId, memberQueryDTO.getDuId())
+ .eq(!Objects.isNull(memberQueryDTO.getSolutionsId()),Solutions::getId, memberQueryDTO.getSolutionsId())
+ .ge(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&!memberQueryDTO.getSolutionsStatus().equals(Constants.ZERO),
+ Member::getStartTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 00:00:00")
+ .le(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.ONE),
+ Member::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 23:59:59")
+ .ge(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.TWO),
+ Member::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 23:59:59")
+ ;
+
+
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ PageData<Member> pageData = PageData.from(memberJoinMapper.selectJoinPage(page,Member.class, queryWrapper));
+ return pageData;
+ }
+
@Override
public long count(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
@@ -174,6 +220,7 @@
.notIn(CollectionUtils.isNotEmpty(memberQueryDTO.getMemberIds()),Member::getId,memberQueryDTO.getMemberIds())
.eq(!Objects.isNull(memberQueryDTO.getCompanyId()),Member::getCompanyId,memberQueryDTO.getCompanyId())
.eq(Member::getIsdeleted, Constants.ZERO)
+ .like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName())
.notExists(!Objects.isNull(memberQueryDTO.getInsuranceApplyId()),
" select 1 from apply_detail ad where ad.applyId = "+memberQueryDTO.getInsuranceApplyId()+" and ad.END_TIME > now() and ad.isdeleted = 0 " +
" and ad.member_id = t.id ")
--
Gitblit v1.9.3