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

Merge remote-tracking branch 'origin/branch2022-1-4' into branch2022-1-4

Browse Source
This commit is contained in:
baozhipeng
2022-02-12 14:47:39 +08:00
parent 84c886649d 974822b65b
commit 0200f6f5b6
27 changed files with 162 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/2022-1-4变更.sql
+16
View File
@@ -28,3 +28,19 @@ ALTER TABLE `pay_meeting`
MODIFY COLUMN `council_id` varchar(50) NULL DEFAULT NULL COMMENT '理事会项目id' AFTER `standards_id`,
MODIFY COLUMN `council_name` varchar(50) NULL DEFAULT NULL COMMENT '理事会项目名称' AFTER `council_id`;
create table wx_secret
(
login_type varchar(255) null,
secret varchar(255) null
);
INSERT INTO wx_secret (login_type, secret) VALUES ('dev', 'db3482f68206b077ca67041f47462c3229d22c277308d96c02c72a128aee0f3fdd05ac2f70d22539');
INSERT INTO wx_secret (login_type, secret) VALUES ('prod', '51daf9829b6b487f99693a2032cda10abde40319b6ffdc61886b921e7eaa40c5ae3e49a5b13a2a31');
-- 2022-1-24新增
ALTER TABLE `pay_meeting`
MODIFY COLUMN `meeting_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '会议内容' AFTER `estimated_number`;
-- 2022-2-12
INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1492310294221639681', '1431145150766923778', '证书费用', '20', '', 20, 1, 'LKGLZ', '2022-02-12 09:31:14' );
ALTER TABLE `income_payments`.`tb_certificate_payment`
MODIFY COLUMN `charge_use` tinyint(1) NULL DEFAULT 20 COMMENT '来款用途（字典表）' AFTER `mail`;
update tb_certificate_payment set charge_use = 20 where 1 = 1;
jero-boot-incoming-payment/src/main/java/com/jero/aspect/annotation/CompanyNameTranslate.java
+1 -1
View File
@@ -23,5 +23,5 @@ public @interface CompanyNameTranslate {
/**
* 拼接内容
*/
String splicing() default " (待审核)";
String splicing() default " (未审核)";
}
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+18 -1
View File
@@ -35,6 +35,7 @@ import com.jero.project.entity.PayWorkingGroupDistributionRecord;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.temporary.common.PayCompanyManagementTemporaryCommon;
import com.jero.temporary.entity.PayCompanyManagementTemporary;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -43,6 +44,7 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
@@ -182,7 +184,16 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
if(Objects.isNull(payCompanyManagement)){
throw new JeroBootException("企业不存在！");
}
projectDetailVO.setCompanyName(payCompanyManagement.getCompanyName());
if(Objects.equals(payCompanyManagement.getStatus(), PayCompanyManagementTemporaryCommon.STATUS2)){
projectDetailVO.setCompanyName(payCompanyManagement.getCompanyName() + PayCompanyManagementTemporaryCommon.CHECK);
}else{
projectDetailVO.setCompanyName(payCompanyManagement.getCompanyName());
}
projectDetailVO.setCompanyPhone(PasswordUtil.decrypt(payCompanyManagement.getCompanyPhone()));
projectDetailVO.setDutyCode(payCompanyManagement.getDutyCode());
projectDetailVO.setBankAccountName(payCompanyManagement.getBankAccountName());
projectDetailVO.setBankAccount(payCompanyManagement.getBankAccount());
projectDetailVO.setOpeningBank(payCompanyManagement.getOpeningBank());
projectDetailVO.setPostalCodeCompany(payCompanyManagement.getPostalCode());
projectDetailVO.setCompanyAddress(payCompanyManagement.getCompanyAddress());
PayContactsManagement payContactsManagement = payContactsManagementService.getById(payCommonProject.getContactsTemporaryId());
@@ -209,9 +220,15 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
if(Objects.isNull(payCompanyManagementTemporary)){
throw new JeroBootException("企业不存在！");
}
projectDetailVO.setCompanyName(payCompanyManagementTemporary.getCompanyName());
projectDetailVO.setPostalCodeCompany(payCompanyManagementTemporary.getPostalCode());
projectDetailVO.setCompanyAddress(payCompanyManagementTemporary.getCompanyAddress());
projectDetailVO.setCompanyPhone(PasswordUtil.decrypt(payCompanyManagementTemporary.getCompanyPhone()));
projectDetailVO.setDutyCode(payCompanyManagementTemporary.getDutyCode());
projectDetailVO.setBankAccountName(payCompanyManagementTemporary.getBankAccountName());
projectDetailVO.setBankAccount(payCompanyManagementTemporary.getBankAccount());
projectDetailVO.setOpeningBank(payCompanyManagementTemporary.getOpeningBank());
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsTemporaryId());
if(Objects.isNull(payContactsManagementTemporary)){
throw new JeroBootException("联系人不存在！");
jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
+17
View File
@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -91,6 +93,21 @@ public class ProjectDetailVO implements Serializable {
@ApiModelProperty(value = "企业地址")
private String companyAddress;
@ApiModelProperty(value = "公司电话")
private String companyPhone;
@ApiModelProperty(value = "信用代码")
private String dutyCode;
@ApiModelProperty(value = "银行户名")
private String bankAccountName;
@ApiModelProperty(value = "开户行")
private String openingBank;
@ApiModelProperty(value = "银行账号")
private String bankAccount;
/**
* 企业联系人
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
+10 -1
View File
@@ -14,6 +14,8 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.*;
import com.jero.company.entity.PayCompanyManagement;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.entity.WxSecret;
import com.jero.company.mapper.WxSecretMapper;
import com.jero.company.service.IPayCompanyManagementService;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.company.vo.CompanyLoginVO;
@@ -61,6 +63,8 @@ public class CompanyLoginController {
private ISysDictService sysDictService;
@Resource
private BaseCommonService baseCommonService;
@Resource
private WxSecretMapper wxSecretMapper;
@Value("${defaultPassword}")
private String defaultPassword;
/**
@@ -257,7 +261,12 @@ public class CompanyLoginController {
*/
@ApiOperation("微信登录凭证校验")
@GetMapping(value = "/jscode2session")
public Result<JSONObject> jscode2session(Jscode2sessionVO jscode2sessionVO) {
public Result<JSONObject> jscode2session(Jscode2sessionVO jscode2sessionVO,String type) {
QueryWrapper<WxSecret> wrapper = new QueryWrapper<>();
wrapper.eq("login_type",type);
WxSecret wxSecret = wxSecretMapper.selectOne(wrapper);
String secret = PasswordUtil.decrypt(wxSecret.getSecret());
jscode2sessionVO.setSecret(secret);
Map hashMap = JSONObject.parseObject(JSONObject.toJSONString(jscode2sessionVO), Map.class);
String result = HttpUtil.get("https://api.weixin.qq.com/sns/jscode2session",hashMap);
return Result.OK(JSONObject.parseObject(result));
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
+2 -1
View File
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.jero.common.aspect.annotation.Dict;
import com.jero.common.util.superSearch.ConstantUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -78,7 +79,7 @@ public class PayContactsManagement implements Serializable {
@Excel(name = "手机号", width = 15)
@ApiModelProperty(value = "手机号")
@NotEmpty(message = "手机号不能为空")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误")
@Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号格式错误")
private String phone;
/**邮箱*/
@Excel(name = "邮箱", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/WxSecret.java
+19
View File
@@ -0,0 +1,19 @@
package com.jero.company.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* @author liJiaRao
* @date 2022-01-19 13:56
*/
@Data
@TableName(value = "wx_secret")
public class WxSecret {
@TableField(value = "login_type")
private String loginType;
@TableField(value = "secret")
private String secret;
}
jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/WxSecretMapper.java
+11
View File
@@ -0,0 +1,11 @@
package com.jero.company.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.company.entity.WxSecret;
/**
* @author liJiaRao
* @date 2022-01-19 13:56
*/
public interface WxSecretMapper extends BaseMapper<WxSecret> {
}
jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/WxSecretMapper.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.company.mapper.WxSecretMapper">
<resultMap id="BaseResultMap" type="com.jero.company.entity.WxSecret">
<!--@mbg.generated-->
<!--@Table wx_secret-->
<result column="login_type" jdbcType="VARCHAR" property="loginType" />
<result column="secret" jdbcType="VARCHAR" property="secret" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
login_type, secret
</sql>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyLoginVO.java
+2 -1
View File
@@ -2,6 +2,7 @@ package com.jero.company.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.jero.common.util.superSearch.ConstantUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -19,7 +20,7 @@ public class CompanyLoginVO {
/**手机号*/
@ApiModelProperty(value = "手机号")
@NotEmpty(message = "手机号不能为空！")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
@Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误")
private String phone;
/**
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+4 -4
View File
@@ -163,7 +163,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
log.info("收入合同-添加异常",e);
throw new JeroBootException("合同编号已存在！");
}
try {
/*try {
LambdaQueryWrapper<PayIncomeContract> query = new LambdaQueryWrapper<>();
query.eq(PayIncomeContract::getContractName,payIncomeContract.getContractName());
PayIncomeContract payIncomeContractNew = payIncomeContractService.getOne(query);
@@ -173,7 +173,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}catch (Exception e){
log.info("收入合同-添加异常",e);
throw new JeroBootException("合同名称已存在！");
}
}*/
setPayIncomeContractAdd(payIncomeContract);
payIncomeContract.setStatus(PayIncomeContractCommon.STATUS1);
payIncomeContractService.save(payIncomeContract);
@@ -284,7 +284,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
log.info("收入合同-添加异常",e);
throw new JeroBootException("合同编号已存在！");
}
try {
/*try {
LambdaQueryWrapper<PayIncomeContract> query = new LambdaQueryWrapper<>();
query.eq(PayIncomeContract::getContractName,payIncomeContract.getContractName());
PayIncomeContract payIncomeContractNew = payIncomeContractService.getOne(query);
@@ -294,7 +294,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}catch (Exception e){
log.info("收入合同-添加异常",e);
throw new JeroBootException("合同名称已存在！");
}
}*/
// 删除历史
LambdaQueryWrapper<PayIncomeContractInstallment> queryPayIncomeContractInstallment = new LambdaQueryWrapper<>();
queryPayIncomeContractInstallment.eq(PayIncomeContractInstallment::getContractId,payIncomeContract.getId());
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+4 -4
View File
@@ -45,7 +45,7 @@
order by pe.create_time desc
</select>
<select id="listForChildren" resultType="com.jero.data.entity.ChildrenFindByName">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as childrenId
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(未审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as childrenId
from
pay_case_committee_subitem pm
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
@@ -63,7 +63,7 @@
<select id="listForExcel" resultType="com.jero.data.entity.ChooseExcelWorkingGroup">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(未审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
from
pay_case_committee pe
left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
@@ -94,7 +94,7 @@
</select>
<select id="chooseExcel" resultType="com.jero.data.entity.ChooseExcelWorkingGroup">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(未审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
from
pay_case_committee pe
left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
@@ -144,7 +144,7 @@
order by pe.create_time desc
</select>
<select id="listForChildrenTwo" resultType="com.jero.data.entity.ChildrenFindByName">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as childrenId
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(未审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as childrenId
from
pay_case_committee_subitem pm
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+4 -4
View File
@@ -45,7 +45,7 @@
order by pe.create_time desc
</select>
<select id="listForChildren" resultType="com.jero.data.entity.subCouncil">
SELECT pm.id as id,pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.phone as phone,pt.post as post
SELECT pm.id as id,pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(未审核)')) as companyName,pt.phone as phone,pt.post as post
from
pay_case_council_subitem pm
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
@@ -63,7 +63,7 @@
<select id="listForExcel" resultType="com.jero.data.entity.ChooseExcelCouncil">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(未审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
from
pay_case_council pe
left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
@@ -85,7 +85,7 @@
</select>
<select id="chooseExcel" resultType="com.jero.data.entity.ChooseExcelCouncil">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(未审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
from
pay_case_council pe
left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
@@ -135,7 +135,7 @@
order by pe.create_time desc
</select>
<select id="listForChildrenTwo" resultType="com.jero.data.entity.subCouncil">
SELECT pm.id as id,pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.phone as phone,pt.post as post
SELECT pm.id as id,pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(未审核)')) as companyName,pt.phone as phone,pt.post as post
from
pay_case_council_subitem pm
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+3
View File
@@ -716,6 +716,9 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) {
p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile()));
}
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPrincipalPhone())) {
p.setPrincipalPhone(PasswordUtil.decrypt(p.getPrincipalPhone()));
}
});
} catch (Exception e) {
log.error("手机号解密异常！", e);
jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
+4
View File
@@ -167,4 +167,8 @@ public class PayMailBill implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "项目类型")
private Integer projectType;
@TableField(exist = false)
@ApiModelProperty(value = "项目负责人手机号")
private java.lang.String principalPhone;
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+5 -3
View File
@@ -64,6 +64,8 @@
project_name as projectName,
bill_no AS billNo,
pmb.invoice_amount as invoiceAmount,
principal_id ,
su.phone as principal_phone,
principal_name as principalName,
charge_company_name as chargeCompanyName,
contact_name as contactName,
@@ -71,16 +73,16 @@
post_status as postStatus,
send_method as sendMethod ,
pmbp.project_id as projectId,
create_time,
pmb.create_time,
postal_code as postalCode,
mailer,
post_no as postNo,
send_date as sendDate,
contact_address as contactAddress,
pmb.remark
from pay_mail_bill pmb left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id)
from pay_mail_bill pmb left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id) left join sys_user su on pmb.principal_id = su.id
${ew.customSqlSegment}
group by pmb.id ORDER BY post_status ASC,create_time DESC
group by pmb.id ORDER BY pmb.post_status ASC,pmb.create_time DESC
</select>
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+2 -1
View File
@@ -330,6 +330,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation.setIdentity(MeetingSubitemCommon.JIA_BIN);
}
//处理校验参会人信息
payMeetingSituation.setAmountReceivable(new BigDecimal("0"));
PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
saveMeetingSituation(payMeetingSituation1);
//处理打包
@@ -1167,7 +1168,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
}
payMeetingSituation1.setOrderCode(orderCode);
payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice()==null?0:payMeetingSituation.getNeedInvoice());
//如果是标协会议判断会员类型
if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)) {
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java
+3
View File
@@ -5,6 +5,8 @@ import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.aspect.annotation.CompanyNameTranslate;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.member.entity.TbCertificatePayment;
@@ -46,6 +48,7 @@ public class TbCertificatePaymentController extends JeroController<TbCertificate
* @param req
* @return
*/
@CompanyNameTranslate
@AutoLog(value = "证书缴费表-分页列表查询")
@ApiOperation(value="证书缴费表-分页列表查询", notes="证书缴费表-分页列表查询")
@GetMapping(value = "/page")
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
+3
View File
@@ -5,6 +5,8 @@ import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.aspect.annotation.CompanyNameTranslate;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.PasswordUtil;
@@ -41,6 +43,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
/**
* 分页列表查询
*/
@CompanyNameTranslate
@RequiresPermissions("safeguardStardsMember:search")
@ApiOperation(value="标协会员项目成员表-分页列表查询", notes="标协会员项目成员表-分页列表查询")
@GetMapping(value = "/page")
jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
+6 -1
View File
@@ -242,8 +242,13 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
if(Objects.isNull(payPackCompany.getPackChargeTotal())){
payPackCompany.setPackChargeTotal(new BigDecimal("0.00"));
}
LambdaQueryWrapper<PayPackCompanyProject> packCompanyProjectLambdaQueryWrapper = new LambdaQueryWrapper<>();
packCompanyProjectLambdaQueryWrapper.eq(PayPackCompanyProject::getPackId,id);
List<PayPackCompanyProject> packCompanyProjectList = payPackCompanyProjectService.list(packCompanyProjectLambdaQueryWrapper);
List<String> projectIdList = packCompanyProjectList.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
queryPayMailBillProject.eq(PayMailBillProject::getBillId,id);
queryPayMailBillProject.in(PayMailBillProject::getProjectId,projectIdList);
List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject);
if(!CollectionUtils.isEmpty(listPayMailBillProject)){
BigDecimal d = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
jero-boot-module-system/src/main/java/com/jero/modules/pay/company/entity/PayContactsManagement.java
+2 -1
View File
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.jero.common.aspect.annotation.Dict;
import com.jero.common.util.superSearch.ConstantUtils;
import com.jero.modules.system.volid.group.CreateGroup;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -66,7 +67,7 @@ public class PayContactsManagement implements Serializable {
@Excel(name = "手机号", width = 15)
@ApiModelProperty(value = "手机号")
@NotEmpty(message = "手机号不能为空！")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
@Pattern(regexp = ConstantUtils.TEL_PHONE ,message = "手机号码格式错误")
private String phone;
/**邮箱*/
@Excel(name = "邮箱", width = 15)
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java
+2 -1
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.util.superSearch.ConstantUtils;
import lombok.Data;
import com.jero.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -61,7 +62,7 @@ public class SysDepart implements Serializable {
private String orgCode;
/**手机号*/
@Excel(name="手机号",width=15,orderNum = "5")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
@Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误")
private String mobile;
/**传真*/
private String fax;
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+2 -1
View File
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.jero.common.aspect.annotation.Dict;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.superSearch.ConstantUtils;
import com.jero.modules.system.volid.group.CreateGroup;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
@@ -101,7 +102,7 @@ public class SysUser implements Serializable {
*/
@Excel(name = "手机号码", width = 15)
@NotBlank(message = "手机号码不能为空")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
@Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误")
private String phone;
/**
jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.jero.modules.system.model;
import com.jero.common.aspect.annotation.Dict;
import com.jero.common.util.superSearch.ConstantUtils;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -39,7 +40,7 @@ public class SysDepartExcel {
private String orgCode;
/**手机号*/
@Excel(name="手机号",width=15,orderNum = "5")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误")
@Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号格式错误")
private String mobile;
/**传真*/
private String fax;
jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartImportExcel.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.jero.modules.system.model;
import com.jero.common.aspect.annotation.Dict;
import com.jero.common.util.superSearch.ConstantUtils;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -39,7 +40,7 @@ public class SysDepartImportExcel {
private String orgCode;
/**手机号*/
@Excel(name="手机号",width=15,orderNum = "5")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误")
@Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号格式错误")
private String mobile;
/**传真*/
private String fax;
jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysLoginVO.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.jero.modules.system.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.jero.common.util.superSearch.ConstantUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,7 +21,7 @@ public class SysLoginVO {
/**手机号*/
@ApiModelProperty(value = "手机号")
@NotEmpty(message = "手机号不能为空！")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
@Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误")
private String phone;
/**
jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.jero.modules.system.vo;
import com.jero.common.aspect.annotation.Dict;
import com.jero.common.util.superSearch.ConstantUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -34,7 +35,7 @@ public class SysUserTemplate {
*/
@Excel(name = "手机号码", width = 15)
@NotBlank(message = "手机号不能为空！")
@Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误")
@Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误")
private String phone;
/**