From bcae1eeb59ff2094f14043a0488b1abb25130831 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 六月 2025 14:23:02 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 59 +++++++++++++++++++
server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java | 2
server/service/src/main/java/com/doumee/dao/business/model/Member.java | 21 +++++--
server/service/src/main/java/com/doumee/service/business/impl/CompanyUserApplyServiceImpl.java | 2
server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java | 15 ++++
server/service/src/main/java/com/doumee/config/shiro/ShiroRedisSessionDAO.java | 2
server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java | 2
server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java | 2
server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java | 11 +++
server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java | 4 +
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 44 ++++++--------
11 files changed, 128 insertions(+), 36 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 43f74a6..d88f5d4 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
@@ -4,6 +4,7 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
@@ -12,7 +13,8 @@
import com.doumee.service.business.ApplyDetailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -83,6 +85,17 @@
return ApiResponse.success(pageData);
}
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/pageForMini")
+ @RequiresPermissions("business:applydetail:query")
+ public ApiResponse<PageData<ApplyDetail>> pageForMini (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
+ PageData<ApplyDetail> pageData = applyDetailService.findPageForMini(pageWrap);
+ return ApiResponse.success(pageData);
+ }
+
@ApiOperation("鍒楄〃鏌ヨ")
@PostMapping("/findList")
@RequiresPermissions("business:applydetail:query")
diff --git a/server/service/src/main/java/com/doumee/config/shiro/ShiroRedisSessionDAO.java b/server/service/src/main/java/com/doumee/config/shiro/ShiroRedisSessionDAO.java
index aac166d..01e5cba 100644
--- a/server/service/src/main/java/com/doumee/config/shiro/ShiroRedisSessionDAO.java
+++ b/server/service/src/main/java/com/doumee/config/shiro/ShiroRedisSessionDAO.java
@@ -1,7 +1,7 @@
package com.doumee.config.shiro;
+import com.baomidou.mybatisplus.core.toolkit.SerializationUtils;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.SerializationUtils;
import org.apache.shiro.session.Session;
import org.apache.shiro.session.UnknownSessionException;
import org.apache.shiro.session.mgt.SimpleSession;
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java
index 19a52c8..e003a24 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/ApplyDetailPageDTO.java
@@ -28,6 +28,8 @@
@ApiModelProperty(value = "鍛樺伐涓婚敭")
private Integer memberId;
+ @ApiModelProperty(value = "浼佷笟涓婚敭")
+ private Integer companyId;
@ApiModelProperty(value = "鍛樺伐濮撳悕",hidden = true)
private String companyName;
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 b44a77e..f16575c 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
@@ -194,6 +194,10 @@
@TableField(exist = false)
private Integer insuranceId;
+ @ApiModelProperty(value = "骞撮緞", example = "1")
+ @TableField(exist = false)
+ private Long age;
+
@TableField(exist = false)
private String dataFirst;
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 1fa8b42..2976561 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
@@ -56,11 +56,9 @@
private Integer applyId;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- @ExcelColumn(name="淇濋櫓鐢熸晥姝㈡湡",index = 9,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
- @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index = 8,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
private Date startTime;
@ApiModelProperty(value = "韬唤璇佸彿鐮�")
@@ -80,17 +78,14 @@
private Integer sex;
@ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О")
- @ExcelColumn(name="淇濋櫓鏂规",index = 5,width = 10)
@TableField(exist = false)
private String solutionName;
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
- @ExcelColumn(name="娲鹃仯鍗曚綅",index = 6,width = 10)
@TableField(exist = false)
private String duName;
@ApiModelProperty(value = "鎵�灞炲伐绉嶅悕绉�")
- @ExcelColumn(name="鎵�灞炲伐绉�",index = 7,width = 20)
@TableField(exist = false)
private String workTypeName;
@@ -99,7 +94,6 @@
private String companyName;
@ApiModelProperty(value = "淇濋櫓鐘舵��:1=淇濋殰涓�;2=涓嶅湪淇�")
- @ExcelColumn(name="淇濋櫓鐘舵��",index = 1,valueMapping = "1=淇濋殰涓�;2=涓嶅湪淇�;",width = 6)
@TableField(exist = false)
private Integer solutionsStatus;
@@ -134,4 +128,19 @@
@TableField(exist = false)
private BigDecimal detailServerCost;
+ @ApiModelProperty(value = "宸叉姇淇濆崟", example = "1")
+ @ExcelColumn(name="宸叉姇淇濆崟",index = 5,width = 8)
+ @TableField(exist = false)
+ private Integer totalNum;
+
+ @ApiModelProperty(value = "淇濋殰涓�", example = "1")
+ @ExcelColumn(name="淇濋殰涓�",index = 6,width = 8)
+ @TableField(exist = false)
+ private Integer validNum;
+
+ @ApiModelProperty(value = "涓嶅湪淇�", example = "1")
+ @ExcelColumn(name="涓嶅湪淇�",index = 7,width = 8)
+ @TableField(exist = false)
+ private Integer invalidNum;
+
}
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 2d83d49..80ad474 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
@@ -90,6 +90,8 @@
PageData<ApplyDetail> findPageForCompany(PageWrap<ApplyDetailPageDTO> pageWrap);
+ PageData<ApplyDetail> findPageForMini(PageWrap<ApplyDetailPageDTO> pageWrap);
+
List<ApplyDetail> findListForCompany(ApplyDetailPageDTO applyDetailPageDTO);
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 c0f256c..ac53146 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
@@ -243,6 +243,7 @@
}
queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getDuId()),ApplyDetail::getDuId,applyDetailPageDTO.getDuId());
+ queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getCompanyId()),InsuranceApply::getCompanyId,applyDetailPageDTO.getCompanyId());
queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getWorkTypeId()),ApplyDetail::getWorktypeId,applyDetailPageDTO.getWorkTypeId());
queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getUnionApplyId()),ApplyDetail::getUnionApplyId,applyDetailPageDTO.getUnionApplyId());
queryWrapper.like(StringUtils.isNotBlank(applyDetailPageDTO.getMemberName()),Member::getName,applyDetailPageDTO.getMemberName());
@@ -299,6 +300,64 @@
@Override
+ public PageData<ApplyDetail> findPageForMini(PageWrap<ApplyDetailPageDTO> pageWrap) {
+ IPage<ApplyDetail> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+
+ MPJLambdaWrapper<ApplyDetail> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.selectAll(ApplyDetail.class);
+ queryWrapper.selectAs(DispatchUnit::getName,ApplyDetail::getDuName);
+ queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
+ queryWrapper.selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo);
+ queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName);
+ queryWrapper.selectAs(Solutions::getName,ApplyDetail::getSolutionName);
+ queryWrapper.selectAs(Solutions::getType,ApplyDetail::getSolutionType);
+ queryWrapper.selectAs(Company::getName,ApplyDetail::getCompanyName);
+ queryWrapper.selectAs(InsuranceApply::getStatus,ApplyDetail::getStatus);
+ 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(Company.class,Company::getId,InsuranceApply::getCompanyId);
+ queryWrapper.eq(ApplyDetail::getIsdeleted,Constants.ZERO);
+
+ ApplyDetailPageDTO applyDetailPageDTO = pageWrap.getModel();
+ queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getCompanyId()),InsuranceApply::getCompanyId,applyDetailPageDTO.getCompanyId());
+ queryWrapper.in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_DONE.getKey());
+ queryWrapper.and(StringUtils.isNotBlank(applyDetailPageDTO.getMemberName()),i->i.like(Member::getIdcardNo,applyDetailPageDTO.getMemberName()).or().like(Member::getName,applyDetailPageDTO.getMemberName()));
+
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(pageWrap.getSorts())){
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(ApplyDetail::getSortnum);
+ }
+ }
+ }else{
+ queryWrapper.orderByAsc(ApplyDetail::getSortnum);
+ }
+ PageData<ApplyDetail> pageData = PageData.from(applyDetailJoinMapper.selectJoinPage(page,ApplyDetail.class, queryWrapper));
+ if(pageData.getRecords()!=null){
+ int num = 1;
+ for (ApplyDetail d : pageData.getRecords()){
+ d.setSortnum(num++);
+ if(d.getEndTime().getTime()<System.currentTimeMillis()){
+ d.setStatus(0);
+ }else{
+ d.setStatus(1);
+ }
+ if(StringUtils.isNotBlank(d.getIdcardNo())){
+ d.setAge(Constants.getAgeByIdCard(d.getIdcardNo()));
+ }
+ }
+ }
+ return pageData;
+ }
+
+
+ @Override
public List<ApplyDetail> findListForCompany(ApplyDetailPageDTO applyDetailPageDTO) {
MPJLambdaWrapper<ApplyDetail> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(ApplyDetail.class);
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 bf238c9..c8785d1 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
@@ -22,7 +22,7 @@
import com.github.yulichang.base.MPJBaseMapper;
import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
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 5ea3e1e..a15d867 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
@@ -16,7 +16,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java
index 335ea94..3963599 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java
@@ -91,7 +91,16 @@
memberInsurance.setIsdeleted(Constants.ZERO);
QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
wrapper.orderByDesc("CREATE_DATE");
- return memberInsuranceMapper.selectList(wrapper);
+ List<MemberInsurance> memberInsuranceList = memberInsuranceMapper.selectList(wrapper);
+ for (MemberInsurance memberInsurance1:memberInsuranceList) {
+ if(memberInsurance1.getEndTime().getTime() < System.currentTimeMillis() ){
+ memberInsurance1.setIsValid(1);
+ }else{
+ memberInsurance1.setIsValid(0);
+ }
+
+ }
+ return memberInsuranceList;
}
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 68d4c4f..acc8c9a 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
@@ -229,50 +229,43 @@
LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
//浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
if(loginUserInfo.getType().equals(Constants.ONE)){
- queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+ queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId())
+ .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id where a.member_id = t.id and b.company_id = "+loginUserInfo.getCompanyId()+" and b.status in (" +
+ " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
+ " and a.end_time >= now() ) ", Member::getValidNum )
+
+ .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id where a.member_id = t.id and b.company_id = "+loginUserInfo.getCompanyId()+" and b.status in (" +
+ " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
+ " and a.end_time < now() ) ", Member::getInvalidNum );
}else{
if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
}else{
queryWrapper.eq(InsuranceApply::getCompanyId, -1);
}
- queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
+ queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId())
+ .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id where a.member_id = t.id and b.status in (" +
+ " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
+ " and a.end_time >= now() ) ", Member::getValidNum )
+ .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id where a.member_id = t.id and b.status in (" +
+ " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
+ " and a.end_time < now() ) ", Member::getInvalidNum );
}
queryWrapper.selectAll(Member.class)
- .selectAs(DispatchUnit::getName,Member::getDuName)
- .selectAs(Worktype::getName,Member::getWorkTypeName)
- .selectAs(Solutions::getName,Member::getSolutionName)
- .selectAs(Company::getName,Member::getCompanyName)
- .select(" case when now() between t.start_time and t.end_time then 1 else 2 end solutionsStatus ")
- .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)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.and(StringUtils.isNotBlank(memberQueryDTO.getKeywords()),
i->i.like(Member::getName, memberQueryDTO.getKeywords()).or().like(
Member::getIdcardNo,memberQueryDTO.getKeywords()
))
.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())
.like(StringUtils.isNotBlank(memberQueryDTO.getIdcardNo()),Member::getIdcardNo, memberQueryDTO.getIdcardNo())
- .like(StringUtils.isNotBlank(memberQueryDTO.getDuName()),DispatchUnit::getName, memberQueryDTO.getDuName())
- .eq(!Objects.isNull(memberQueryDTO.getDuId()),Member::getDuId, memberQueryDTO.getDuId())
- .eq(!Objects.isNull(memberQueryDTO.getSolutionsId()),Solutions::getBaseId, memberQueryDTO.getSolutionsId())
- .apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.ONE),"now() between t.start_time and t.end_time")
- .apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.TWO),"now() > t.end_time")
+
+ .apply(!Objects.isNull(memberQueryDTO.getSolutionsId())," t.id in( select a.member_id from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id " +
+ "inner join solutions s on b.solution_id = s.id where s.base_id = '"+memberQueryDTO.getSolutionsId()+"' ) ")
;
queryWrapper.orderByAsc(DispatchUnit::getName);
queryWrapper.orderByAsc(Member::getName);
-// 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));
Integer sn = 0;
@@ -282,6 +275,7 @@
if(StringUtils.isNotBlank(member.getIdcardNo())){
member.setAge(Constants.getAgeByIdCard(member.getIdcardNo()));
}
+ member.setTotalNum(member.getInvalidNum()+member.getValidNum());
}
return pageData;
}
--
Gitblit v1.9.3