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

Merge remote-tracking branch 'origin/branch20211210' into branch20211210

Browse Source
This commit is contained in:
zhangqinlin
2021-12-23 13:45:01 +08:00
parent e28e3c1058 88e8f9f61d
commit 30352d99f5
8 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+3 -3
View File
@@ -528,8 +528,6 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
throw new JeroBootException("超出下载次数限制");
}
}
ossFileService.saveDownloadTimes(ossFile.getId(), loginUser.getId());
response.addHeader("Content-Disposition", "attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1"));
response.setContentType("application/force-download");// 设置强制下载不打开
if (type == null) {
@@ -547,7 +545,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
outputStream.write(buf, 0, len);
}
response.flushBuffer();
//统计下载和上传次数
//统计下载和预览次数
if ("download".equals(type)) {
Integer downloadNumber = ossFile.getDownloadNumber();
if (downloadNumber == null) {
@@ -556,6 +554,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
ossFile.setDownloadNumber(downloadNumber + 1);
}
ossFileService.updateAndPush(ossFile);
//增加下载次数
ossFileService.saveDownloadTimes(ossFile.getId(), loginUser.getId());
} else {
Integer viewNumber = ossFile.getViewNumber();
if (viewNumber == null) {
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+2 -2
View File
@@ -173,9 +173,9 @@
NULL AS check_result,
NULL AS check_in
FROM pay_meeting pm
WHERE pm.meeting_type = 2
WHERE (pm.meeting_type = 2
OR pm.meeting_type = 3
OR pm.meeting_type = 4
OR pm.meeting_type = 4)
and pm.id not in (SELECT pm.id
FROM pay_meeting pm
LEFT JOIN pay_meeting_situation pms ON pm.id = pms.meeting_id
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+13 -10
View File
@@ -633,7 +633,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
queryWrapper.orderByDesc("start_time");
//
//会议分类：1可报名/2已报名/3全部
String meetingSignUpType = request.getParameter("meetingSignUpType");
//会议报名状态
Integer signUpStatus = payMeeting.getSignUpStatus();
if (Objects.nonNull(signUpStatus)) {
switch (signUpStatus){
@@ -662,15 +665,16 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
case 7:
queryWrapper.eq("check_in",1);
break;
case 8:
queryWrapper.ge("register_deadline", now);
queryWrapper.ge("end_time", now);
break;
// 可报名与会议报名状态重复
//case 8:
// queryWrapper.ge("register_deadline", now);
// queryWrapper.ge("end_time", now);
// break;
}
}
//会议报名状态：1可报名/2已报名
String meetingSignUpType = request.getParameter("meetingSignUpType");
if (Objects.equals(meetingSignUpType, 1 + "")) {
//可报名或者报名状态选择可报名
if (Objects.equals(meetingSignUpType, 1 + "")||Objects.equals(signUpStatus,8)) {
//queryWrapper.ne("pms.company_contact_id",contactId);
queryWrapper.ge("register_deadline", now);
queryWrapper.ge("end_time", now);
@@ -686,8 +690,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
queryWrapper.groupBy("meeting_name");
queryWrapper.having("company_contact_ids not like concat('%',{0},'%') or company_contact_ids is null",contactId);
return baseMapper.pageListContract(page, queryWrapper, now);
} else if (Objects.equals(meetingSignUpType, 2 + "")
||Objects.nonNull(signUpStatus)) {
} else if (Objects.equals(meetingSignUpType, 2 + "")) {
queryWrapper.eq("pms.company_contact_id", contactId);
return baseMapper.pageListContract2(page, queryWrapper, now);
} else {
jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java
+3
View File
@@ -110,4 +110,7 @@ public class PayPaymentRecordSub implements Serializable {
@ApiModelProperty(value = "审核说明")
private String reviewInstructions;
@ApiModelProperty(value = "删除标记（1删除，0没删除）")
private Integer delFlag;
}
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+7 -2
View File
@@ -106,10 +106,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
*/
@Override
public Map<String,Object> amountReceivedList(String id, String projectType){
//列表
LambdaQueryWrapper<PayPaymentRecordSub> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayPaymentRecordSub::getProjectId, id);
wrapper.eq(PayPaymentRecordSub::getLastSign, LastSignEnum.LAST.getCode());//只查每个阶段最新的那条
wrapper.eq(PayPaymentRecordSub::getDelFlag, PayProjectCommon.NO);
wrapper.orderByAsc(PayPaymentRecordSub::getPaymentDate);
List<PayPaymentRecordSub> list = payPaymentCheckService.list(wrapper);
list.forEach(p-> {
@@ -253,6 +253,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
payPaymentRecordSub.setId(null);
payPaymentRecordSub.setLastSign(LastSignEnum.LAST.getCode());
payPaymentRecordSub.setDelFlag(PayProjectCommon.NO);
payPaymentCheckMapper.insert(payPaymentRecordSub);
//发消息
@@ -267,7 +268,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
if(!PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
throw new JeroBootException("只有拒绝的才可删除");
}
payPaymentRecordMapper.deleteById(payPaymentRecord.getId());
PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
payPaymentRecordSub.setId(payPaymentRecord.getId());
payPaymentRecordSub.setDelFlag(PayProjectCommon.YES);
payPaymentCheckMapper.updateById(payPaymentRecordSub);
}
/**
@@ -344,6 +348,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payPaymentRecordSub.setId(null);
payPaymentRecordSub.setLastSign(LastSignEnum.LAST.getCode());
payPaymentRecordSub.setDelFlag(PayProjectCommon.NO);
payPaymentCheckMapper.insert(payPaymentRecordSub);
//将之前的那条置为OLD
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+15
View File
@@ -9,6 +9,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.common.ProjectCommon;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.enums.LastSignEnum;
import com.jero.common.enums.ManagementMessageEnums;
import com.jero.common.enums.PaymentStatusEnum;
import com.jero.common.exception.JeroBootException;
@@ -34,6 +35,7 @@ import com.jero.member.service.ITbMemberProjectService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.payment.entity.PayPaymentRecord;
import com.jero.payment.entity.PayPaymentRecordSub;
import com.jero.payment.mapper.PayPaymentRecordMapper;
import com.jero.payment.service.IPayPaymentCheckService;
import com.jero.payment.service.IPayPaymentRecordService;
@@ -134,6 +136,13 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName()));
}
List<PayCommonProject> list = payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate,paidInvoicStatus);
//查审核记录表，每阶段最新的一条
LambdaQueryWrapper<PayPaymentRecordSub> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayPaymentRecordSub::getLastSign, LastSignEnum.LAST.getCode());
wrapper.eq(PayPaymentRecordSub::getDelFlag, PayProjectCommon.NO);
List<PayPaymentRecordSub> RecordSubList = payPaymentCheckService.list(wrapper);
for (PayCommonProject commonProject : list) {
//如果是会议类型，就查询会议的具体类型
if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))) {
@@ -142,6 +151,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
commonProject.setMeetingType(payMeeting.getMeetingType());
commonProject.setSituationId(id);
}
//插入审核状态，供前端判断是否显示审核按钮
for(PayPaymentRecordSub recordSub : RecordSubList){
if(commonProject.getId().equals(recordSub.getProjectId())){
commonProject.setCheckPaymentStatus(recordSub.getPaymentStatus());
}
}
}
return list;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+5
View File
@@ -241,4 +241,9 @@ public class PayCommonProject implements Serializable {
*/
@TableField(exist = false)
private String situationId;
/**
* 审核状态
*/
@TableField(exist = false)
private String checkPaymentStatus;
}
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
+3 -1
View File
@@ -185,7 +185,7 @@ public class CommonController {
outputStream.write(buf, 0, len);
}
response.flushBuffer();
//统计下载和上传次数
//统计下载和预览次数
if ("download".equals(type)) {
Integer downloadNumber = ossFile.getDownloadNumber();
if (downloadNumber == null) {
@@ -194,6 +194,8 @@ public class CommonController {
ossFile.setDownloadNumber(downloadNumber + 1);
}
ossFileService.updateAndPush(ossFile);
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
ossFileService.saveDownloadTimes(ossFile.getId(), loginUser.getId());
} else if ("view".equals(type)) {
Integer viewNumber = ossFile.getViewNumber();
if (viewNumber == null) {