LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udpate 分标委根据id查询成员增加会议id单位名称

Browse Source
This commit is contained in:
lijiarao
2021-09-27 10:43:22 +08:00
parent a20ad234d7
commit bc2587433a
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+22 -3
View File
@@ -6,11 +6,11 @@ import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.DictPoint;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.PasswordUtil;
import com.jero.data.entity.ChildrenFindByName;
@@ -21,9 +21,13 @@ import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
import com.jero.data.entity.FindByName;
import com.jero.data.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.data.service.IPayCaseCommitteeSubitemService;
import com.jero.meeting.entity.PayMeetingRemindRecord;
import com.jero.meeting.service.IPayMeetingRemindRecordService;
import com.jero.project.common.PayProjectCommon;
import io.swagger.annotations.ApiImplicitParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -49,7 +53,8 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
@Autowired
private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
@Resource
private IPayMeetingRemindRecordService payMeetingRemindRecordService;
@@ -98,12 +103,18 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
/**
* 列表查询
*/
@DictPoint
@AutoLog(value = "分标委成员表-列表查询")
@ApiOperation(value="分标委成员表-列表查询", notes="分标委成员表-列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(@RequestParam(name="id",required = true) String id) {
public Result<?> queryPageList(@RequestParam(name="id",required = true) String id,
@RequestParam(name="companyName",required = false) String companyName,
@RequestParam(name="meetingId",required = false) String meetingId) {
QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query();
queryWrapper.eq("pm.committee_id", id);
if (StringUtils.isNotBlank(companyName)){
queryWrapper.like("pm.company_name",companyName);
}
List<payCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemService.list2(queryWrapper);
if (!CollectionUtils.isEmpty(list)) {
try {
@@ -114,6 +125,14 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getEmail())) {
p.setEmail(PasswordUtil.decrypt(p.getEmail()));
}
if (StringUtils.isNotBlank(meetingId)){
LambdaQueryWrapper<PayMeetingRemindRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingRemindRecord::getId,p.getId());
int count = payMeetingRemindRecordService.count(wrapper);
if (count>0){
p.setRemind(PayProjectCommon.YES);
}
}
});
} catch (Exception e) {
log.error("手机号、邮箱解密异常！", e);
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/VO/payCaseCommitteeSubitemVO.java
+5
View File
@@ -1,5 +1,6 @@
package com.jero.data.entity.VO;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -29,4 +30,8 @@ public class payCaseCommitteeSubitemVO {
@ApiModelProperty(value = "职务")
private String post;
@ApiModelProperty(value = "是否已提醒")
@Dict(dicCode = "yn")
private Integer remind;
}