diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index 2fe15628..88837f31 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -155,6 +155,9 @@ public class PayCompanyManagementController extends JeroController 50){ return Result.error("企业名称长度不能大于50个字符！"); } + if(!StringUtils.isBlank(payCompanyManagement.getMemberNature()) && !"2".equals(payCompanyManagement.getMemberNature())){ + return Result.error("理事会标识错误"); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = payCompanyManagementService.page(page, queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index ee947e23..1e9f4f37 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -22,7 +22,6 @@ import com.jero.company.service.IPayContactsManagementService; import com.jero.data.entity.*; import com.jero.data.entity.DTO.PayCaseCommitteeSubitemDTO; import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; -import com.jero.data.mapper.PayCaseCommitteeSubitemMapper; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.mail.commont.constant; @@ -30,11 +29,8 @@ import com.jero.meeting.entity.PayMeetingRemindRecord; import com.jero.meeting.service.IPayMeetingRemindRecordService; import com.jero.project.common.PayProjectCommon; import com.jero.util.AmountUtil; -import com.jero.util.SearchUtil; -import io.swagger.annotations.ApiImplicitParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jetbrains.annotations.NotNull; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 940f2c07..6cc9ae1c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -1184,6 +1184,23 @@ GROUP BY tmps1.id) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id) left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) group by tmp.director_id + + union all + SELECT + tmp.director_id as principalId, + tmp.director_name as principalName, + sum(tmps.allMoney) as allMoney, + sum(tmps.comeAllMoney) as comeAllMoney, + tmp.create_time as createTime + FROM tb_member_project tmp right join ( + select id,project_id,SUM(amount_receivable) AS + allMoney,SUM(paid_amount) AS comeAllMoney,max(tmps2.payment_date) as payment_date + from + (select tmps1.id,tmps1.project_id,amount_receivable,paid_amount,max(ppr.payment_date) as payment_date from tb_certificate_payment tmps1 + inner join pay_payment_record ppr on(tmps1.id=ppr.project_id) + GROUP BY tmps1.id) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id) + left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) + group by tmp.director_id ) pp group by pp.principalId order by pp.createTime) ppp order by ppp.comeAllMoney ) pppp left join sys_user su on(pppp.principalId=su.id) left join sys_depart sd on(su.org_code=sd.org_code) group by sd.org_code order by pppp.comeAllMoney desc limit 10 @@ -1531,6 +1548,23 @@ GROUP BY tmps1.id) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id) left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) group by tmp.director_id + + union all + SELECT + tmp.director_id as principalId, + tmp.director_name as principalName, + sum(tmps.allMoney) as allMoney, + sum(tmps.comeAllMoney) as comeAllMoney, + tmp.create_time as createTime + FROM tb_member_project tmp right join ( + select id,project_id,SUM(amount_receivable) AS + allMoney,SUM(paid_amount) AS comeAllMoney,max(tmps2.payment_date) as payment_date + from + (select tmps1.id,tmps1.project_id,amount_receivable,paid_amount,max(ppr.payment_date) as payment_date from tb_certificate_payment tmps1 + inner join pay_payment_record ppr on(tmps1.id=ppr.project_id) + GROUP BY tmps1.id) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id) + left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) + group by tmp.director_id ) pp group by pp.principalId order by pp.createTime) ppp order by ppp.comeAllMoney desc limit 10 @@ -2318,6 +2352,22 @@ group by tmp1s.id) tpms left join tb_member_project tmp on(tmp.id=tpms.project_id) group by tpms.company_id) ppp + union all + + SELECT + company_id as chargeCompanyTemporaryId, + company_name as chargeCompanyTemporaryName, + allMoney, + comeAllMoney, + createTime + FROM (select SUM(amount_receivable) AS + allMoney,SUM(paid_amount) AS comeAllMoney,tpms.create_time as createTime ,company_id,company_name + from(select amount_receivable,paid_amount,tmp1s.create_time,company_id,company_name,tmp1s.project_id + from tb_certificate_payment tmp1s + inner join pay_payment_record ppr on(tmp1s.id=ppr.project_id) + group by tmp1s.id) tpms + left join tb_member_project tmp on(tmp.id=tpms.project_id) + group by tpms.company_id) tcps ) pp group by pp.chargeCompanyTemporaryId order by pp.createTime) ppp order by ppp.comeAllMoney desc limit 10 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index 63e5e107..93934dc0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -6,38 +6,18 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; -import com.jero.common.system.vo.SysDepartModel; -import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.oConvertUtils; import com.jero.mail.commont.constant; -import com.jero.meeting.service.IPayMeetingSituationService; -import com.jero.member.service.IPayMemberProjectService; -import com.jero.member.service.IPayMemberProjectSubitemService; -import com.jero.member.service.ITbMemberProjectService; -import com.jero.member.service.ITbMemberProjectSubitemService; -import com.jero.modules.system.entity.SysDepart; -import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.ISysDepartService; -import com.jero.modules.system.service.ISysRoleService; import com.jero.modules.system.service.ISysUserService; -import com.jero.modules.system.util.UserUtil; -import com.jero.project.entity.PayCommonProject; -import com.jero.project.entity.PayWorkGroupSubletStatistics; -import com.jero.project.entity.PayWorkingGroupStatistics; -import com.jero.project.entity.PayWorkingGroupSubletSearch; -import com.jero.project.service.IPayCommonProjectService; import com.jero.project.service.IPayWorkingGroupService; -import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.statistics.entity.AllProjectStatistics; import com.jero.statistics.entity.AllProjectStatisticsSearch; import com.jero.util.AmountUtil; -import com.jero.util.SearchUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -49,8 +29,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 5a8bbcf7..0fd3bbaf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -1,30 +1,21 @@ package com.jero.statistics.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.oConvertUtils; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.service.IPayCompanyManagementService; -import com.jero.mail.commont.constant; -import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.project.service.IPayWorkingGroupService; import com.jero.statistics.entity.*; import com.jero.util.AmountUtil; -import com.jero.util.SearchUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -36,7 +27,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import java.text.DecimalFormat; import java.util.*; -import java.util.stream.Collectors; /** * @author zql diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java index 18eef3cd..08a019a1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java @@ -1,20 +1,12 @@ package com.jero.statistics.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.ComboModel; -import com.jero.common.system.vo.DictModel; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.oConvertUtils; -import com.jero.mail.commont.constant; -import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.project.entity.PayWorkGroupSubletStatistics; import com.jero.project.entity.PayWorkingGroupSearch; @@ -22,18 +14,13 @@ import com.jero.project.entity.PayWorkingGroupStatistics; import com.jero.project.entity.PayWorkingGroupSubletSearch; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemService; -import com.jero.statistics.entity.CompanyComeMoneyDetail; import com.jero.util.AmountUtil; -import com.jero.util.SearchUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.apache.poi.hssf.record.DVALRecord; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -41,7 +28,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import java.text.DecimalFormat; import java.util.*; -import java.util.stream.Collectors; /** * @author zql diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/util/SearchUtil.java b/jero-boot-incoming-payment/src/main/java/com/jero/util/SearchUtil.java deleted file mode 100644 index c844ea01..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/util/SearchUtil.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jero.util; - -import org.apache.commons.lang3.ObjectUtils; - -/** - * @author zql - * @date 2021/10/9 10:46 - */ -public class SearchUtil { - - public static String exchenge(String string){ - if(!ObjectUtils.isEmpty(string)){ - string = string.replaceAll("/", "//") ; - string = string.replaceAll("_", "/_") ; - string = string.replaceAll("%", "/%") ; - } -return string; - } -}