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
2022-04-25 17:57:42 +08:00
parent 445784f520
commit 07c26d6021
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
+1 -1
View File
@@ -249,7 +249,7 @@ public class CompanyLoginController {
//update-begin--Author:wangshuai Date:20200714 for：登录日志没有记录人员
LoginUser loginUser = new LoginUser();
BeanUtils.copyProperties(contactsManagement, loginUser);
baseCommonService.addLog("手机号: " + contactsManagement.getPhone() + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser);
baseCommonService.addLog("用户: " + contactsManagement.getPhone() + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser);
//update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员
return result;
}
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
-1
View File
@@ -87,7 +87,6 @@ public class PayCompanyManagement implements Serializable {
@ApiModelProperty(value = "银行账号")
@NotEmpty(message = "银行账号不能为空")
@Size(max = 50, message = "银行账号长度不能大于50个字符")
@Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误")
private String bankAccount;
/**企业角色1:普通企业、2：会员企业*/
@ApiModelProperty(value = "企业角色")
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+4 -4
View File
@@ -774,9 +774,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}
}
//会议分类：1可报名/2已报名/3全部
Integer meetingSignUpType = Integer.valueOf(request.getParameter("meetingSignUpType"));
String meetingSignUpType = request.getParameter("meetingSignUpType");
//可报名或者报名状态选择可报名 1可报名/2已报名/0全部/4 app全部(可报名和进行中)
if (Objects.equals(meetingSignUpType, 1)||Objects.equals(signUpStatus,8)) {
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);
@@ -788,10 +788,10 @@ 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 )) {
} else if (Objects.equals(meetingSignUpType, "2" )) {
queryWrapper.eq("pms.company_contact_id", contactId);
return baseMapper.pageListContract2(page, queryWrapper, now);
} else if (Objects.equals(meetingSignUpType, 0)){
} else if (Objects.equals(meetingSignUpType, "0")){
return baseMapper.pageListContract3(page, queryWrapper, now, contactId);
}else {
queryWrapper.ge("end_time", now);