diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java index 2bc07101..7e5c4723 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java @@ -3,14 +3,17 @@ package com.jero.data.controller; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; @@ -23,7 +26,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.mail.commont.constant; +import com.jero.meeting.entity.PayMeetingRemindRecord; +import com.jero.meeting.service.IPayMeetingRemindRecordService; import com.jero.modules.system.util.SecurityUtil; +import com.jero.project.common.PayProjectCommon; import com.jero.util.AmountUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -51,6 +57,8 @@ import io.swagger.annotations.ApiOperation; public class PayCaseCouncilSubitemController extends JeroController { @Autowired private IPayCaseCouncilSubitemService payCaseCouncilSubitemService; + @Resource + private IPayMeetingRemindRecordService payMeetingRemindRecordService; /** * 理事会成员表 @@ -188,23 +196,45 @@ public class PayCaseCouncilSubitemController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { -// PayCaseCouncilSubitem payCaseCouncilSubitem = payCaseCouncilSubitemService.getById(id); -// if(payCaseCouncilSubitem==null) { -// return Result.error("未找到对应数据"); -// } -// return Result.OK(payCaseCouncilSubitem); -// } + + /** + * 理事会成员表 + */ + @DictPoint + @ApiOperation(value="理事会成员表-列表查询", notes="理事会成员表-列表查询") + @GetMapping(value = "/list") + 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 queryWrapper = Wrappers.query(); + queryWrapper.eq("pm.council_id", id); + if (StringUtils.isNotBlank(companyName)){ + queryWrapper.like("pm.company_name",companyName); + } + List list = payCaseCouncilSubitemService.listTwo(queryWrapper); + if (!CollectionUtils.isEmpty(list)) { + try { + list.forEach(p -> { + if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) { + p.setPhone(PasswordUtil.decrypt(p.getPhone())); + } + if (StringUtils.isNotBlank(meetingId)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId()); + int count = payMeetingRemindRecordService.count(wrapper); + if (count>0){ + p.setRemind(PayProjectCommon.YES); + }else { + p.setRemind(PayProjectCommon.NO); + } + } + }); + } catch (Exception e) { + log.error("手机号、邮箱解密异常！", e); + } + } + return Result.OK(list); + } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java index 89db64c4..2659a767 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java @@ -1,5 +1,6 @@ package com.jero.data.entity; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,6 +24,10 @@ public class subCouncil implements Serializable { @ApiModelProperty(value = "职位") private String post; + @ApiModelProperty(value = "是否已提醒") + @Dict(dicCode = "yn") + private Integer remind; + public subCouncil(String id, String companyName, String peopleName, String phone, String post) { this.id = id; this.companyName = companyName; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java index c51cb490..25b87954 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java @@ -1,12 +1,11 @@ package com.jero.data.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.data.entity.ChooseExcelCouncil; -import com.jero.data.entity.FindByName; -import com.jero.data.entity.PayCaseCouncilSubitem; +import com.jero.data.entity.*; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.data.entity.councilList; import org.apache.ibatis.annotations.Param; import java.util.ArrayList; @@ -27,4 +26,7 @@ public interface PayCaseCouncilSubitemMapper extends BaseMapper listForExcel(@Param("contactsNames")String contactsNames, @Param("companyNames")String companyNames,@Param("councilNames") String councilNames); IPage listThreeTwo(Page page, @Param("id")String id,@Param("councilNames") String councilNames); + + List listTwo(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml index 0d1c9610..408cd9b3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml @@ -133,4 +133,13 @@ left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id) where pm.council_id = #{pid} order by pm.create_time desc + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java index be368776..efd375ab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java @@ -1,12 +1,10 @@ package com.jero.data.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.data.entity.ChooseExcelCouncil; -import com.jero.data.entity.FindByName; -import com.jero.data.entity.PayCaseCouncilSubitem; +import com.jero.data.entity.*; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.data.entity.councilList; import java.util.ArrayList; import java.util.List; @@ -27,4 +25,6 @@ public interface IPayCaseCouncilSubitemService extends IService listThreeTwo(Page page, String id, String councilNames); + List listTwo(QueryWrapper queryWrapper); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java index b5303955..d029ae1d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java @@ -1,11 +1,9 @@ package com.jero.data.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.data.entity.ChooseExcelCouncil; -import com.jero.data.entity.FindByName; -import com.jero.data.entity.PayCaseCouncilSubitem; -import com.jero.data.entity.councilList; +import com.jero.data.entity.*; import com.jero.data.mapper.PayCaseCouncilSubitemMapper; import com.jero.data.service.IPayCaseCouncilSubitemService; import org.springframework.stereotype.Service; @@ -47,5 +45,10 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl listTwo(QueryWrapper queryWrapper) { + return payCaseCouncilSubitemMapper.listTwo(queryWrapper); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java index 6ead26d5..41997622 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java @@ -93,13 +93,17 @@ public class PayProjectCommon { public static final Integer YES = 1; /** - * 项目类型1:工作组，2：分标委 + * 项目类型1:工作组，2：分标委, 3:理事会 */ public final static Integer PROJECT_TYPE_FILE1 = 1; /** - * 项目类型1:工作组，2：分标委 + * 项目类型1:工作组，2：分标委, 3:理事会 */ public final static Integer PROJECT_TYPE_FILE2 = 2; + /** + * 项目类型1:工作组，2：分标委, 3:理事会 + */ + public final static Integer PROJECT_TYPE_FILE3 =3; /** * 需要发票（1：增值税普通发票，2：增值税专用发票，0：否，3：需要发票（小程序需要）） */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java index db9444c5..0dc64671 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java @@ -197,6 +197,7 @@ public class PayResearchProjectController extends JeroController