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

update 分标委会议,理事会会议-发布提醒列表查询

Browse Source
This commit is contained in:
lijiarao
2023-02-17 10:37:41 +08:00
parent 35ccc43c33
commit d027d19ca8
12 changed files with 82 additions and 50 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
+23 -12
View File
@@ -167,13 +167,24 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
@GetMapping(value = "/list") @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="companyName",required = false) String companyName,
@RequestParam(name="meetingId",required = false) String meetingId) { @RequestParam(name="meetingId",required = false) String meetingId,
@RequestParam(name="remind",required = false) String remind) {
QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query(); QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query();
queryWrapper.eq("pm.committee_id", id); queryWrapper.eq("pm.committee_id", id);
if (StringUtils.isNotBlank(companyName)){ if (StringUtils.isNotBlank(companyName)){
queryWrapper.like("pm.company_name",companyName); queryWrapper.like("pm.company_name",companyName);
} }
List<payCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemService.listTwo(queryWrapper); if (StringUtils.isNotBlank(meetingId)) {
if (Objects.equals("0",remind)) {
queryWrapper.isNull("pmrr.id");
}
if (Objects.equals("1",remind)) {
queryWrapper.isNotNull("pmrr.id");
}
}
List<payCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemService.listTwo(queryWrapper,meetingId);
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
try { try {
list.forEach(p -> { list.forEach(p -> {
@@ -183,16 +194,16 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getEmail())) { if (!org.apache.commons.lang3.StringUtils.isBlank(p.getEmail())) {
p.setEmail(PasswordUtil.decrypt(p.getEmail())); p.setEmail(PasswordUtil.decrypt(p.getEmail()));
} }
if (StringUtils.isNotBlank(meetingId)){ //if (StringUtils.isNotBlank(meetingId)){
LambdaQueryWrapper<PayMeetingRemindRecord> wrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<PayMeetingRemindRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId()); // wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId());
int count = payMeetingRemindRecordService.count(wrapper); // int count = payMeetingRemindRecordService.count(wrapper);
if (count>0){ // if (count>0){
p.setRemind(PayProjectCommon.YES); // p.setRemind(PayProjectCommon.YES);
}else { // }else {
p.setRemind(PayProjectCommon.NO); // p.setRemind(PayProjectCommon.NO);
} // }
} //}
}); });
} catch (Exception e) { } catch (Exception e) {
log.error("手机号、邮箱解密异常！", e); log.error("手机号、邮箱解密异常！", e);
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
+22 -12
View File
@@ -226,29 +226,39 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
@GetMapping(value = "/list") @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="companyName",required = false) String companyName,
@RequestParam(name="meetingId",required = false) String meetingId) { @RequestParam(name="meetingId",required = false) String meetingId,
@RequestParam(name="remind",required = false) String remind) {
QueryWrapper<subCouncil> queryWrapper = Wrappers.query(); QueryWrapper<subCouncil> queryWrapper = Wrappers.query();
queryWrapper.eq("pm.council_id", id); queryWrapper.eq("pm.council_id", id);
if (StringUtils.isNotBlank(companyName)){ if (StringUtils.isNotBlank(companyName)){
queryWrapper.like("pm.company_name",companyName); queryWrapper.like("pm.company_name",companyName);
} }
List<subCouncil> list = payCaseCouncilSubitemService.listTwo(queryWrapper); if (StringUtils.isNotBlank(meetingId)) {
if (Objects.equals("0",remind)) {
queryWrapper.isNull("pmrr.id");
}
if (Objects.equals("1",remind)) {
queryWrapper.isNotNull("pmrr.id");
}
}
List<subCouncil> list = payCaseCouncilSubitemService.listTwo(queryWrapper,meetingId);
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
try { try {
list.forEach(p -> { list.forEach(p -> {
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) { if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) {
p.setPhone(PasswordUtil.decrypt(p.getPhone())); p.setPhone(PasswordUtil.decrypt(p.getPhone()));
} }
if (StringUtils.isNotBlank(meetingId)){ //if (StringUtils.isNotBlank(meetingId)){
LambdaQueryWrapper<PayMeetingRemindRecord> wrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<PayMeetingRemindRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId()); // wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId());
int count = payMeetingRemindRecordService.count(wrapper); // int count = payMeetingRemindRecordService.count(wrapper);
if (count>0){ // if (count>0){
p.setRemind(PayProjectCommon.YES); // p.setRemind(PayProjectCommon.YES);
}else { // }else {
p.setRemind(PayProjectCommon.NO); // p.setRemind(PayProjectCommon.NO);
} // }
} //}
}); });
} catch (Exception e) { } catch (Exception e) {
log.error("手机号、邮箱解密异常！", e); log.error("手机号、邮箱解密异常！", e);
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
+1 -3
View File
@@ -2,7 +2,6 @@ package com.jero.data.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,7 +11,6 @@ import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import javax.validation.Valid;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -26,7 +24,7 @@ public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitt
IPage<FindByName> listThree (Page<FindByName> page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param("userId") String userId); IPage<FindByName> listThree (Page<FindByName> page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param("userId") String userId);
List<payCaseCommitteeSubitemVO> listTwo (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper); List<payCaseCommitteeSubitemVO> listTwo(@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper,@Param("meetingId") String meetingId);
List<ChooseExcelWorkingGroup> listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("councilName") String councilName); List<ChooseExcelWorkingGroup> listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("councilName") String councilName);
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java
+1 -1
View File
@@ -27,6 +27,6 @@ public interface PayCaseCouncilSubitemMapper extends BaseMapper<PayCaseCouncilSu
IPage<councilList> listThreeTwo(Page<councilList> page, @Param("id")String id,@Param("councilNames") String councilNames); IPage<councilList> listThreeTwo(Page<councilList> page, @Param("id")String id,@Param("councilNames") String councilNames);
List<subCouncil> listTwo(@Param(Constants.WRAPPER) QueryWrapper<subCouncil> queryWrapper); List<subCouncil> listTwo(@Param(Constants.WRAPPER) QueryWrapper<subCouncil> queryWrapper,@Param("meetingId") String meetingId);
} }
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+13 -6
View File
@@ -87,12 +87,19 @@
</select> </select>
<select id="listTwo" resultType="com.jero.data.entity.VO.payCaseCommitteeSubitemVO"> <select id="listTwo" resultType="com.jero.data.entity.VO.payCaseCommitteeSubitemVO">
SELECT pm.id as id,pt.id as contactId, pt.name as contactsName,pm.company_name as companyName,pt.post as post,pt.phone as phoneNamber,pt.email SELECT pm.id as id,
from pt.id as contactId,
pay_case_committee pe pt.name as contactsName,
left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id) pm.company_name as companyName,
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) pt.post as post,
${ew.customSqlSegment} pt.phone as phoneNamber,
pt.email as email,
if(pmrr.id,1,0) as remind
from pay_case_committee pe
left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
left join (SELECT * from pay_meeting_remind_record where meeting_id = #{meetingId}) pmrr on pmrr.subitem_id = pm.id
${ew.customSqlSegment}
</select> </select>
<select id="chooseExcel" resultType="com.jero.data.entity.ChooseExcelWorkingGroup"> <select id="chooseExcel" resultType="com.jero.data.entity.ChooseExcelWorkingGroup">
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+12 -6
View File
@@ -143,11 +143,17 @@
</select> </select>
<select id="listTwo" resultType="com.jero.data.entity.subCouncil"> <select id="listTwo" resultType="com.jero.data.entity.subCouncil">
SELECT pm.id as id, pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone SELECT pm.id as id,
from pt.name as peopleName,
pay_case_council pe pm.company_name as companyName,
left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id) pt.post as post,
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) pt.phone as phone,
${ew.customSqlSegment} if(pmrr.id, 1, 0) as remind
from pay_case_council pe
left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
left join (SELECT * from pay_meeting_remind_record where meeting_id = #{meetingId}) pmrr
on pmrr.subitem_id = pm.id
${ew.customSqlSegment}
</select> </select>
</mapper> </mapper>
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
+1 -1
View File
@@ -24,7 +24,7 @@ public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitt
List<PayCaseCommitteeSubitem> selectList(LambdaQueryWrapper<PayCaseCommitteeSubitem> queryWrapper); List<PayCaseCommitteeSubitem> selectList(LambdaQueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
List<payCaseCommitteeSubitemVO> listTwo(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper); List<payCaseCommitteeSubitemVO> listTwo(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper, String meetingId);
IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName,String userId); IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName,String userId);
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java
+1 -1
View File
@@ -25,6 +25,6 @@ public interface IPayCaseCouncilSubitemService extends IService<PayCaseCouncilSu
IPage<councilList> listThreeTwo(Page<councilList> page, String id, String councilNames); IPage<councilList> listThreeTwo(Page<councilList> page, String id, String councilNames);
List<subCouncil> listTwo(QueryWrapper<subCouncil> queryWrapper); List<subCouncil> listTwo(QueryWrapper<subCouncil> queryWrapper, String meetingId);
} }
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
+2 -2
View File
@@ -37,8 +37,8 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommi
@Override @Override
public List<payCaseCommitteeSubitemVO> listTwo(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper) { public List<payCaseCommitteeSubitemVO> listTwo(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper, String meetingId) {
return payCaseCommitteeSubitemMapper.listTwo(queryWrapper); return payCaseCommitteeSubitemMapper.listTwo(queryWrapper,meetingId);
} }
@Override @Override
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java
+2 -2
View File
@@ -46,8 +46,8 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl<PayCaseCouncil
} }
@Override @Override
public List<subCouncil> listTwo(QueryWrapper<subCouncil> queryWrapper) { public List<subCouncil> listTwo(QueryWrapper<subCouncil> queryWrapper, String meetingId) {
return payCaseCouncilSubitemMapper.listTwo(queryWrapper); return payCaseCouncilSubitemMapper.listTwo(queryWrapper,meetingId);
} }
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java
+2 -2
View File
@@ -229,8 +229,8 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "发布提醒", notes = "发布提醒") @ApiOperation(value = "发布提醒", notes = "发布提醒")
@PostMapping(value = "/publishReminder") @PostMapping(value = "/publishReminder")
public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) { public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) {
payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13,"C_OPEN_TYPE13"); List<String> strings = payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13, "C_OPEN_TYPE13");
return Result.OK(); return Result.OK("发布成功",strings);
} }
} }
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java
+2 -2
View File
@@ -214,8 +214,8 @@ public class CouncilMeetingController extends JeroController<PayMeeting, IPayMee
@ApiOperation(value = "发布提醒", notes = "发布提醒") @ApiOperation(value = "发布提醒", notes = "发布提醒")
@PostMapping(value = "/publishReminder") @PostMapping(value = "/publishReminder")
public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) { public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) {
payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13,"C_OPEN_TYPE13"); List<String> strings = payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13, "C_OPEN_TYPE13");
return Result.OK(); return Result.OK("发布成功",strings);
} }
} }