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

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

Browse Source
This commit is contained in:
梁琦涛
2021-10-21 14:39:22 +08:00
parent 4707ba0a40 59437c8013
commit 37cd9b1acc
6 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+4 -1
View File
@@ -166,7 +166,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//处理打包情况
//handlePack(payMeetingSituation1);
signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);
//如果关联合同就不发消息
if (StringUtils.isBlank(payMeetingSituation1.getContractId())) {
signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);
}
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
+9 -7
View File
@@ -107,12 +107,13 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
@ApiOperation(value="会员项目表-收入合同列表分页查询", notes="会员项目表-收入合同列表分页查询")
@GetMapping(value = "/queryListByCompany")
public Result<?> queryListByCompany(
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name = "companyId") String companyId,
@RequestParam(name = "contractId") String contractId,
@RequestParam(name = "projectType") String projectType,
@RequestParam(name = "memberName",required = false) String memberName) {
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "companyId") String companyId,
@RequestParam(name = "contractId") String contractId,
@RequestParam(name = "projectType") String projectType,
@RequestParam(name = "projectName",required = false) String projectName,
@RequestParam(name = "memberName", required = false) String memberName) {
if(StringUtils.isBlank(companyId)){
return Result.error("企业id不能为空！");
@@ -124,7 +125,8 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
// 会员
if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE4)){
Page<PayMemberProject> page = new Page<>(pageNo, pageSize);
IPage<PayMemberProject> list = memberProjectService.queryListByCompany(page,companyId,memberName,PayProjectCommon.PROJECT_TYPE4,payIncomeContract.getPack(),payIncomeContract.getPackYear());
projectName = oConvertUtils.replaceAllPercent(projectName);
IPage<PayMemberProject> list = memberProjectService.queryListByCompany(page,companyId,projectName,PayProjectCommon.PROJECT_TYPE4,payIncomeContract.getPack(),payIncomeContract.getPackYear());
return Result.OK(list);
}
// 标协会员
jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectMapper.java
+2 -7
View File
@@ -4,13 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.member.entity.PayMemberProject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.project.entity.PayWorkGroupSubletStatistics;
import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.statistics.entity.AllProjectStatisticsSearch;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 会员项目表
* @Author: jero-boot
@@ -23,10 +18,10 @@ public interface PayMemberProjectMapper extends BaseMapper<PayMemberProject> {
* @Author lqt
* @Date 2021/9/17
* @Param companyId 企业id
* @Param memberName 会员名称
* @Param projectName 会员名称
* @Param projectType 项目类型
* @Return
* @Exception
*/
IPage<PayMemberProject> queryListByCompany(Page<PayMemberProject> page,@Param("companyId") String companyId,@Param("memberName") String memberName,@Param("projectType") String projectType,@Param("pack") Integer pack,@Param("packYear") String packYear);
IPage<PayMemberProject> queryListByCompany(Page<PayMemberProject> page, @Param("companyId") String companyId, @Param("projectName") String projectName, @Param("projectType") String projectType, @Param("pack") Integer pack, @Param("packYear") String packYear);
}
jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectMapper.xml
+2 -2
View File
@@ -25,8 +25,8 @@
LEFT JOIN pay_income_contract_associated pica ON pica.project_id = pmps.id
WHERE pmps.company_id =#{companyId} AND pmp.id IS NOT NULL AND pmp.id != ''
AND (pica.id is null OR pica.id = '')
<if test="memberName != '' and memberName != null">
AND pmp.project_name like concat('%',concat(#{memberName},'%'))
<if test="projectName != '' and projectName != null">
AND pmp.project_name like concat('%',#{projectName},'%')
</if>
<if test="pack == 1 and packYear != '' and packYear != null">
AND (ppc.pack_year=#{packYear} or ppc.id is null OR ppc.id ='')
jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java
+1 -6
View File
@@ -5,11 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.member.entity.PayMemberProject;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.project.entity.PayWorkGroupSubletStatistics;
import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.statistics.entity.AllProjectStatisticsSearch;
import com.jero.project.common.PayProjectCommon;
import java.util.List;
@@ -87,5 +82,5 @@ public interface IPayMemberProjectService extends IService<PayMemberProject> {
* @Return
* @Exception
*/
IPage<PayMemberProject> queryListByCompany(Page<PayMemberProject> page,String companyId,String memberName,String projectType,Integer pack,String packYear);
IPage<PayMemberProject> queryListByCompany(Page<PayMemberProject> page, String companyId, String projectName, String projectType, Integer pack, String packYear);
}
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java
+2 -10
View File
@@ -5,7 +5,6 @@ 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.common.exception.JeroBootException;
import com.jero.contract.entity.PayIncomeContractAssociated;
import com.jero.contract.service.IPayIncomeContractAssociatedService;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.member.entity.PayMemberProject;
@@ -15,17 +14,10 @@ import com.jero.member.service.IPayMemberProjectService;
import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.project.entity.PayWorkGroupSubletStatistics;
import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.statistics.entity.AllProjectStatisticsSearch;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayWorkingGroupSubItem;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
@@ -158,7 +150,7 @@ public class PayPayMemberProjectServiceImpl extends ServiceImpl<PayMemberProject
@Override
public IPage<PayMemberProject> queryListByCompany(Page<PayMemberProject> page,String companyId, String memberName, String projectType,Integer pack,String packYear) {
return payMemberProjectMapper.queryListByCompany(page,companyId,memberName,projectType, pack, packYear);
public IPage<PayMemberProject> queryListByCompany(Page<PayMemberProject> page, String companyId, String projectName, String projectType, Integer pack, String packYear) {
return payMemberProjectMapper.queryListByCompany(page,companyId, projectName,projectType, pack, packYear);
}
}