fix 82829 会员管理-标协会员单位信息-查询条件缺少

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java

@@ -7,6 +7,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.format.DateParser;
 import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
@@ -61,9 +65,8 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<TbMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, req.getParameterMap());
 		Page<TbMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
-		IPage<TbMemberProjectSubitem> pageList = tbMemberProjectSubitemService.pageList(page, queryWrapper);
+		IPage<TbMemberProjectSubitem> pageList = tbMemberProjectSubitemService.pageList(page, req, tbMemberProjectSubitem);
 		for (TbMemberProjectSubitem record : pageList.getRecords()) {
 			record.setEmail(PasswordUtil.decrypt(record.getEmail()));
 			record.setMobile(PasswordUtil.decrypt(record.getMobile()));
@@ -246,9 +249,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	@RequiresPermissions("safeguardStardsMember:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) {
-		QueryWrapper<TbMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap());
+		List<TbMemberProjectSubitem> pageList = tbMemberProjectSubitemService.pageList(request,tbMemberProjectSubitem);
-
-		List<TbMemberProjectSubitem> pageList = tbMemberProjectSubitemService.pageList(queryWrapper);
 		List<TbMemberProjectSubitem> exportList;
 		// 过滤选中数据
 		String selections = request.getParameter("selections");

jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java

@@ -382,6 +382,17 @@ public class TbMemberProjectSubitem implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date invalidationDate;
 
+    /** 生效日期 */
+    @ApiModelProperty(value = "生效日期")
+    @TableField(exist = false)
+    private String effectiveDateStr;
+    /**
+     * 失效日期
+     */
+    @ApiModelProperty(value = "失效日期")
+    @TableField(exist = false)
+    private String invalidationDateStr;
+
     @ApiModelProperty(value = "年份")
     @TableField(exist = false)
     private String year;

jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java

@@ -14,10 +14,9 @@ import com.jero.common.enums.PaymentStatusEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.api.ISysBaseAPI;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
-import com.jero.common.util.AuthenticationUtils;
-import com.jero.common.util.PasswordUtil;
 import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayCompanyManagementService;
@@ -34,7 +33,6 @@ import com.jero.meeting.mapper.PayMeetingSituationMapper;
 import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.enums.MemberStatusEnum;
 import com.jero.member.mapper.TbMemberProjectSubitemMapper;
-import com.jero.member.service.ITbMemberProjectSubitemService;
 import com.jero.member.vo.CopyMemberVO;
 import com.jero.member.vo.EditMemberBenefitsVO;
 import com.jero.member.vo.QueryAggVO;
@@ -45,11 +43,9 @@ import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.payment.service.impl.PayConfirmPaymentRecordService;
 import com.jero.project.common.PayProjectCommon;
-import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.statistics.entity.MemberLineChartMap;
 import com.jero.statistics.entity.MemberLineChartVO;
 import com.jero.statistics.entity.MemberPieChartVO;
-import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -394,22 +390,39 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 		return tbMemberProjectSubitemMapper.queryListByCompany(page, companyId, projectType,pack,packYear);
 	}
 
-    public IPage<TbMemberProjectSubitem> pageList(Page<TbMemberProjectSubitem> page, QueryWrapper<TbMemberProjectSubitem> queryWrapper) {
+    public IPage<TbMemberProjectSubitem> pageList(Page<TbMemberProjectSubitem> page, HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) {
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		QueryWrapper<TbMemberProjectSubitem> queryWrapper = generateQueryWrapper(request, tbMemberProjectSubitem);
-		if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) {
+
-			queryWrapper.eq("tmp.director_id",sysUser.getId());
+		return baseMapper.pageList(page,queryWrapper);
-		}
-        return baseMapper.pageList(page,queryWrapper);
     }
 
-	public List<TbMemberProjectSubitem> pageList(QueryWrapper<TbMemberProjectSubitem> queryWrapper) {
+	public List<TbMemberProjectSubitem> pageList(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) {
+		QueryWrapper<TbMemberProjectSubitem> queryWrapper = generateQueryWrapper(request, tbMemberProjectSubitem);
+		return baseMapper.pageList(queryWrapper);
+	}
+
+	private QueryWrapper<TbMemberProjectSubitem> generateQueryWrapper(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem){
+		QueryWrapper<TbMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap());
+		String invalidationDateStr = tbMemberProjectSubitem.getInvalidationDateStr();
+		String effectiveDateStr = tbMemberProjectSubitem.getEffectiveDateStr();
+		if (StringUtils.isNotBlank(invalidationDateStr)){
+			DateTime invalidationDate = DateUtil.parse(invalidationDateStr, DatePattern.NORM_MONTH_PATTERN);
+			queryWrapper.eq("year(invalidation_date)",invalidationDate.year());
+			queryWrapper.eq("month(invalidation_date)",invalidationDate.month()+1);
+		}
+		if (StringUtils.isNotBlank(effectiveDateStr)){
+			DateTime effectiveDate = DateUtil.parse(effectiveDateStr, DatePattern.NORM_MONTH_PATTERN);
+			queryWrapper.eq("year(effective_date)",effectiveDate.year());
+			queryWrapper.eq("month(effective_date)",effectiveDate.month()+1);
+		}
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) {
 			queryWrapper.eq("tmp.director_id",sysUser.getId());
 		}
-		return baseMapper.pageList(queryWrapper);
+		return queryWrapper;
 	}
 
+
 	public void ticketCollection(String id) {
 		LambdaUpdateWrapper<TbMemberProjectSubitem> updateWrapper = new LambdaUpdateWrapper<>();
 		updateWrapper.eq(TbMemberProjectSubitem::getId,id);