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

2021-11-04 00:10:49 +08:00
parent 21681d206a 4fcc5ff99c
commit 8150bb4f25
5 changed files with 102 additions and 73 deletions
@@ -77,8 +77,13 @@ public class AuthenticationUtils {
    public static Map<String,String> encryptByRsaPriKey() {

        Map<String,String> map= new HashMap<>();
+        String publicKey;
        //从标协项目获取公钥
-        String publicKey=HttpUtil.get(URL+"/sys/getStandardsRSAPublicKey");
+        try {
+            publicKey=HttpUtil.get(URL+"/sys/getStandardsRSAPublicKey");
+        }catch (Exception e){
+            throw new JeroBootException("数据同步失败！连接超时");
+        }

        RSA rsa = new RSA(null,publicKey);

@@ -32,11 +32,16 @@ public class FirstPageStatisticsController {
    @GetMapping(value = "/firstPage")
    @ApiOperation(value = "首页统计", notes = "首页统计")
    public Result<?> getFirstPage() {
-
+        //个人前十
        List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalFirstPage();
+        //工作组前十
        List<PayWorkingGroupStatistics> pageList2 = payWorkingGroupService.queryPageListForStatisticsFirstPage();
+        //企业前十
        List<CompanyComeMoneyList> pageList3 = payWorkingGroupService.queryPageListForCompanyFirstPage();
+        //部门前十
        List<DepartStatistics> pageList4 = payWorkingGroupService.queryPageListForDepartFirstPage();
+
+
        ArrayList<PrincipalPeopleList> list = new ArrayList<>();
        for(PrincipalPeopleList s: pageList){
            if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") )) {
@@ -309,6 +309,10 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
            String workingGroupId = meeting.getWorkingGroupId();
            PayWorkingGroup workingGroup = payWorkingGroupService.getById(workingGroupId);
            payMeetingVO.setWorkingGroupName(workingGroup.getWorkingGroupProject());
+        }else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING)) {
+            String caseCommitteeId = meeting.getCaseCommitteeId();
+            PayCaseCommittee caseCommittee = payCaseCommitteeService.getById(caseCommitteeId);
+            payMeetingVO.setCaseCommitteeName(caseCommittee.getName());
        }
        return Result.OK(payMeetingVO);
    }
@@ -990,29 +990,22 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
            BeanUtils.copyProperties(payMeetingSituation, commonPeopleVO);
            Integer payMode = commonPeopleVO.getPayMode();
            payMeetingSituation1.setPayMode(payMode);
-            //缴费方式为打包时，不处理邮寄联系人和地址
-            if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_3)) {
-                ValidUtil.validate(commonPeopleVO);
-                //存入打包字段
-                //payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1);
-                payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
-                //缴费方式为汇款或线上缴费
-            } else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
-                    || Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)) {
-                Integer needInvoice = commonPeopleVO.getNeedInvoice();
-                //需要发票时校验邮寄
-                if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
-                    ValidUtil.validate(commonPeopleVO, NotPack.class);
+            //所有缴费方式，都有需要发票
+            Integer needInvoice = commonPeopleVO.getNeedInvoice();
+            //需要发票时校验邮寄
+            if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
+                ValidUtil.validate(commonPeopleVO, NotPack.class);
+            }
+            String paymentRecord = payMeetingSituation.getPaymentRecord();
+            String orderCode = payMeetingSituation.getOrderCode();
+            //优先判断合同 判断是否为合同添加的参会人
+            String contractId = payMeetingSituation.getContractId();
+            if (StringUtils.isNotBlank(contractId)) {
+                PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId);
+                if (Objects.isNull(payIncomeContract)) {
+                    throw new JeroBootException("合同不存在！");
                }
-                String paymentRecord = payMeetingSituation.getPaymentRecord();
-                String orderCode = payMeetingSituation.getOrderCode();
-                //优先判断合同 判断是否为合同添加的参会人
-                String contractId = payMeetingSituation.getContractId();
-                if (StringUtils.isNotBlank(contractId)) {
-                    PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId);
-                    if (Objects.isNull(payIncomeContract)) {
-                        throw new JeroBootException("合同不存在！");
-                    }
+                if (!payMode.equals(MeetingSubitemCommon.PAY_MODE_3)){
                    //合同添加的参会人，付款凭证和订单号后四位必填
                    if (StringUtils.isBlank(paymentRecord)) {
                        throw new JeroBootException("付款凭证必填");
@@ -1020,53 +1013,53 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                    if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2) && StringUtils.isBlank(orderCode)) {
                        throw new JeroBootException("订单号后四位必填");
                    }
-                } else {
-                    //缴费方式为线上缴费时，判断是否为会议期间
-                    if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2) && StringUtils.isNotBlank(paymentRecord)) {
-                        Date startTime = payMeeting.getStartTime();
-                        Date endTime = payMeeting.getEndTime();
-                        //如果不在会议期间，不允许上传缴费凭证
-                        if (!belongCalendar(new Date(), startTime, endTime)) {
-                            throw new JeroBootException("线上缴费时，付款凭证只能在会议期间上传");
-                        }
+                }
+            } else {
+                //缴费方式为线上缴费时，判断是否为会议期间
+                if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2) && StringUtils.isNotBlank(paymentRecord)) {
+                    Date startTime = payMeeting.getStartTime();
+                    Date endTime = payMeeting.getEndTime();
+                    //如果不在会议期间，不允许上传缴费凭证
+                    if (!belongCalendar(new Date(), startTime, endTime)) {
+                        throw new JeroBootException("线上缴费时，付款凭证只能在会议期间上传");
                    }
                }
-                payMeetingSituation1.setPaymentRecord(paymentRecord);
-                if (!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)
-                        &&!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_2)) {
-                    payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
-                }
-                payMeetingSituation1.setOrderCode(orderCode);
-                payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
+            }
+            payMeetingSituation1.setPaymentRecord(paymentRecord);
+            if (!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)
+                    &&!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_2)) {
+                payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
+            }
+            payMeetingSituation1.setOrderCode(orderCode);
+            payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());

-                //如果是标协会议判断会员类型
-                if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-                    //根据企业名称和会员类型不为null判断是否为标协会员
-                    //如果是标协会员就存入会议费用（标协会员）
-                    if (checkMember(payMeetingSituation1.getCompanyName())) {
-                        payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsVip());
-                    } else {
-                        payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
-                    }
+            //如果是标协会议判断会员类型
+            if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
+                //根据企业名称和会员类型不为null判断是否为标协会员
+                //如果是标协会员就存入会议费用（标协会员）
+                if (checkMember(payMeetingSituation1.getCompanyName())) {
+                    payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsVip());
                } else {
                    payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
                }
-                ValidUtil.validate(commonPeopleVO);
-                //需要发票时校验邮寄
-                if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
-                    //校验邮寄联系人
-                    String postContactId = commonPeopleVO.getPostContactId();
-                    PayContactsManagement postContact = contactsManagementService.getById(postContactId);
-                    //校验是否是选择的企业的联系人
-                    String companyId2 = postContact.getCompanyId();
-                    if (companyId2.equals(companyId)) {
-                        payMeetingSituation1.setPostContactId(postContact.getId());
-                        payMeetingSituation1.setPostContactName(postContact.getName());
-                        payMeetingSituation1.setPostContactAddress(payMeetingSituation.getPostContactAddress());
-                        payMeetingSituation1.setPostCode(payMeetingSituation.getPostCode());
-                    } else {
-                        throw new JeroBootException("邮寄联系人不是所选企业的企业联系人");
-                    }
+            } else {
+                payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
+            }
+            ValidUtil.validate(commonPeopleVO);
+            //需要发票时校验邮寄
+            if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
+                //校验邮寄联系人
+                String postContactId = commonPeopleVO.getPostContactId();
+                PayContactsManagement postContact = contactsManagementService.getById(postContactId);
+                //校验是否是选择的企业的联系人
+                String companyId2 = postContact.getCompanyId();
+                if (companyId2.equals(companyId)) {
+                    payMeetingSituation1.setPostContactId(postContact.getId());
+                    payMeetingSituation1.setPostContactName(postContact.getName());
+                    payMeetingSituation1.setPostContactAddress(payMeetingSituation.getPostContactAddress());
+                    payMeetingSituation1.setPostCode(payMeetingSituation.getPostCode());
+                } else {
+                    throw new JeroBootException("邮寄联系人不是所选企业的企业联系人");
                }
            }
            payMeetingSituation1.setCheckInHotel(payMeetingSituation.getCheckInHotel());
@@ -220,7 +220,7 @@

        </where>) ppp order by  ppp.payment_date desc
    </select>
-
+<!--工作组前十-->
    <select id="queryPageListForStatisticsFirstPage" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
        select ppp.id,ppp.workGroup, ppp.allMoney,ppp.comeAllMoney,ppp.moneyRate from (select pwg1.id,
        pwg1.workGroup,
@@ -949,7 +949,7 @@

    </select>

-<!--    部门统计-->
+<!--    统计-->
    <select id="queryPageListForDepartFirstPage" resultType="com.jero.statistics.entity.DepartStatistics">
       select sum(pppp.comeAllMoney) as comeAllMoney,sum(pppp.allMoney) as allMoney,sd.depart_name as departName from (select  principalId, principalName,allMoney,comeAllMoney,createTime,
        CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS finishRate from
@@ -986,12 +986,12 @@
        FROM
        (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time from
        pay_common_project pcp inner join pay_payment_record ppr on(pcp.id=ppr.project_id)
-
        group by pcp.id
        ) pcp1
        left JOIN sys_user su on(pcp1.principal_id=su.id) left join sys_depart sd
        on(su.org_code=sd.org_code)
  group by pcp1.principal_id
+
        union all
        select
        pmp.director_id as principalId,
@@ -1005,11 +1005,11 @@
        select pmp1s.id,pmp1s.project_id as projectId,amount_receivable,paid_amount from
        pay_member_project_subitem pmp1s
        inner join pay_payment_record ppr on(pmp1s.id=ppr.project_id)
-
        GROUP BY pmp1s.id
        ) pmp1s group by pmp1s.projectId ) pmps on(pmp.id=pmps.projectId)
        left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
 group by pmp.director_id
+
        union all
        SELECT
        pm.director_id as principalId,
@@ -1023,11 +1023,27 @@
        from
        (select pm1s.id,meeting_id,amount_receivable,paid_amount from pay_meeting_situation pm1s
        inner join pay_payment_record ppr on(pm1s.id=ppr.project_id)
-
        GROUP BY pm1s.id) pms1 group by pms1.meeting_id) pms on(pm.id=pms.meeting_id)
        left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
- group by  pm.director_id) pp
+ group by  pm.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_member_project_subitem 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
    </select>

@@ -1287,6 +1303,7 @@
        left JOIN sys_user su on(pcp1.principal_id=su.id) left join sys_depart sd
        on(su.org_code=sd.org_code)
  group by pcp1.principal_id
+
        union all
        select
        pmp.director_id as principalId,
@@ -1305,6 +1322,7 @@
        ) pmp1s group by pmp1s.projectId ) pmps on(pmp.id=pmps.projectId)
        left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
 group by pmp.director_id
+
        union all
        SELECT
        pm.director_id as principalId,
@@ -1322,14 +1340,14 @@
        GROUP BY pm1s.id) pms1 group by pms1.meeting_id) pms on(pm.id=pms.meeting_id)
        left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
 group by  pm.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,
-        max(tmps.payment_date) as payment_date
+        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
@@ -1972,6 +1990,7 @@
        ) pwgs
        left join pay_company_management pcm on(pcm.id=pwgs.charge_company_id)
        union all
+
        SELECT
        pcp1.charge_company_id as chargeCompanyTemporaryId,
        pcm.company_name as chargeCompanyTemporaryName,
@@ -1988,6 +2007,7 @@
        ) pcp1
        left join pay_company_management pcm on(pcm.id=pcp1.charge_company_id)
          group by pcp1.charge_company_id
+
        union all
        SELECT
        company_id as chargeCompanyTemporaryId,
@@ -2004,6 +2024,7 @@
        group by pmp1s.company_id
        ) pmps
        union all
+
        SELECT
        company_id as chargeCompanyTemporaryId,
        company_name as chargeCompanyTemporaryName,
@@ -2018,6 +2039,7 @@
        GROUP BY pm1s.id) pms left join pay_meeting pm  on(pm.id=pms.meeting_id)
     group by pms.company_id) pmss
        union all
+
        SELECT
        company_id as chargeCompanyTemporaryId,
        company_name as chargeCompanyTemporaryName,