From 7758b07c0fadcc758500cff88c7d6b8dad083427 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Thu, 16 Dec 2021 15:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=81=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectPackServiceImpl.java  | 30 +++++++--
 .../mapper/xml/PaySpendingContractMapper.xml  | 65 ++++++++++---------
 .../java/com/jero/pack/common/PackCommon.java | 14 ++--
 .../PayPackCompanyProjectController.java      | 55 +++++++---------
 .../xml/PayPackCompanyProjectMapper.xml       | 50 ++++++++++++--
 .../PayCommonProjectController.java           | 32 ++++-----
 .../PayWorkingGroupSubItemController.java     |  1 +
 .../mapper/xml/PayCommonProjectMapper.xml     | 37 ++++++++++-
 .../mapper/xml/PayWorkingGroupMapper.xml      |  9 ++-
 .../mapper/xml/SysAnnouncementSendMapper.xml  |  2 +-
 10 files changed, 198 insertions(+), 97 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectPackServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectPackServiceImpl.java
index ce8d186e..c9cc6b33 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectPackServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectPackServiceImpl.java
@@ -8,8 +8,10 @@ import com.jero.meeting.common.MeetingSubitemCommon;
 import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.member.entity.PayMemberProjectSubitem;
+import com.jero.member.entity.TbCertificatePayment;
 import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.service.IPayMemberProjectSubitemService;
+import com.jero.member.service.ITbCertificatePaymentService;
 import com.jero.member.service.ITbMemberProjectSubitemService;
 import com.jero.pack.common.PackCommon;
 import com.jero.pack.entity.PayPackCompany;
@@ -19,19 +21,17 @@ import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
 import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Objects;
 
 @Service
 public class ProjectPackServiceImpl implements ProjectPackService {
-    @Autowired
+    @Resource
     private IPayCommonProjectService payCommonProjectService;
-    @Autowired
+    @Resource
     private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
     @Resource
     private IPayMeetingSituationService payMeetingSituationService;
@@ -39,8 +39,10 @@ public class ProjectPackServiceImpl implements ProjectPackService {
     private IPayMemberProjectSubitemService payMemberProjectSubitemService;
     @Resource
     private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
-    @Autowired
+    @Resource
     private IPayPackCompanyService payPackCompanyService;
+    @Resource
+    private ITbCertificatePaymentService tbCertificatePaymentService;
 
 
     @Override
@@ -145,6 +147,24 @@ public class ProjectPackServiceImpl implements ProjectPackService {
                 tbMemberProjectSubitem.set(TbMemberProjectSubitem::getUpdateTime,new Date());
                 tbMemberProjectSubitemService.update(tbMemberProjectSubitem);
                 break;
+            // 证书
+            case PackCommon.PROJECT_TYPE6:
+                // 验证项目是否存在
+                TbCertificatePayment tbCertificatePaymentOld = tbCertificatePaymentService.getById(projectId);
+                if(Objects.isNull(tbCertificatePaymentOld)){
+                    throw new JeroBootException("项目不存在！");
+                }
+                // 验证企业是否正确
+                if(!Objects.equals(tbCertificatePaymentOld.getCompanyId(),payPackCompany.getCompanyId())){
+                    throw new JeroBootException("企业不匹配！");
+                }
+                LambdaUpdateWrapper<TbCertificatePayment> tbCertificatePayment = new LambdaUpdateWrapper<>();
+                tbCertificatePayment.eq(TbCertificatePayment::getId,projectId);
+                tbCertificatePayment.set(TbCertificatePayment::getPack,packStatus);
+                tbCertificatePayment.set(TbCertificatePayment::getUpdateBy,sysUser.getUsername());
+                tbCertificatePayment.set(TbCertificatePayment::getUpdateTime,new Date());
+                tbCertificatePaymentService.update(tbCertificatePayment);
+                break;
             default:break;
         }
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
index 42c7841e..198631a2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
@@ -4,43 +4,44 @@
 
     <select id="queryPageList" resultType="com.jero.contract.entity.PaySpendingContract">
         SELECT
-            id,
-            contract_num,
-            contract_name,
-            signed_company_id,
-            signed_company_temporary_id,
-            signed_company_temporary_name,
-            signed_contacts_id,
-            signed_contacts_temporary_id,
-            signed_contacts_temporary_name,
-            opening,
-            principal_id,
-            principal_name,
-            department_name,
-            contract_amount,
-            rate,
-            no_tax_amount,
-            contract_date,
-            termination_date,
-            contract_time_points,
-            accounts_receivable_amount,
-            amount_received,
-            outstanding_amount,
-            account_status,
-            contract_payment_times,
-            pack,
-            pack_year,
-            status,
-            if(status = 2,1,0) as statusOrder,
-            create_by,
-            create_time,
-            update_by,
-            update_time,
+            psc.id,
+            psc.contract_num,
+            psc.contract_name,
+            psc.signed_company_id,
+            psc.signed_company_temporary_id,
+            psc.signed_company_temporary_name,
+            psc.signed_contacts_id,
+            psc.signed_contacts_temporary_id,
+            psc.signed_contacts_temporary_name,
+            psc.opening,
+            psc.principal_id,
+            su.realname as principal_name,
+            psc.department_name,
+            psc.contract_amount,
+            psc.rate,
+            psc.no_tax_amount,
+            psc.contract_date,
+            psc.termination_date,
+            psc.contract_time_points,
+            psc.accounts_receivable_amount,
+            psc.amount_received,
+            psc.outstanding_amount,
+            psc.account_status,
+            psc.contract_payment_times,
+            psc.pack,
+            psc.pack_year,
+            psc.status,
+            if(psc.status = 2,1,0) as statusOrder,
+            psc.create_by,
+            psc.create_time,
+            psc.update_by,
+            psc.update_time,
             (select if(count(*) > 0,1,0) from pay_spending_contract_installment
             where contract_id = psc.id AND accounts_receivable_time is not null AND accounts_receivable_time &lt; DATE_FORMAT( NOW(), '%Y-%m-%d' )
             AND accounts_receivable_amount != 0 AND accounts_receivable_amount > if(paid_amount is null or paid_amount = '',0,paid_amount)
             ) AS chargeStatus
         FROM pay_spending_contract psc
+        left join sys_user su on psc.principal_id = su.id
         <where>
             <if test="paySpendingContract.contractNum != null and paySpendingContract.contractNum != ''">
                 AND contract_num LIKE CONCAT('%',CONCAT(#{paySpendingContract.contractNum},'%'))
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/common/PackCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/common/PackCommon.java
index eb2f171d..2e351d04 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/common/PackCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/common/PackCommon.java
@@ -11,25 +11,29 @@ public class PackCommon {
      */
     public final static Integer PACKAGING1 = 1;
     /**
-     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）
+     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书）
      */
     public final static String PROJECT_TYPE1 = "1";
     /**
-     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）
+     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书）
      */
     public final static String PROJECT_TYPE2 = "2";
     /**
-     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）
+     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书）
      */
     public final static String PROJECT_TYPE3 = "3";
     /**
-     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）
+     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书）
      */
     public final static String PROJECT_TYPE4 = "4";
     /**
-     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）
+     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书）
      */
     public final static String PROJECT_TYPE5 = "5";
+    /**
+     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书）
+     */
+    public final static String PROJECT_TYPE6 = "6";
     /**
      * 来源（1:收入合同,2:打包管理）
      */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java
index 15cfc1ec..4381f5ca 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java
@@ -1,18 +1,7 @@
 package com.jero.pack.controller;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,9 +11,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
-import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
-import com.jero.common.util.ValidUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.pack.common.PackCommon;
 import com.jero.pack.entity.PayPackCompany;
@@ -35,21 +22,29 @@ import com.jero.pack.vo.PayPackCompanyProjectInput;
 import com.jero.pack.vo.PayProjectExcel;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.vo.PayCommonProjectOutput;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
  /**
  * @Description: 打包项目维护
@@ -102,21 +97,21 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 @ApiOperation(value="打包项目维护-列表查询", notes="打包项目维护-列表查询")
 	 @GetMapping(value = "/listAll")
 	 public Result<?> queryListAll(PayPackCompanyProjectInput input) {
-	 	if(Objects.isNull(input.getPackId())){
+	 	 if(Objects.isNull(input.getPackId())){
 			return Result.error("打包id不能为空");
-		}
-		PayPackCompany payPackCompany = payPackCompanyService.getById(input.getPackId());
-	 	if(Objects.isNull(payPackCompany)){
+		 }
+		 PayPackCompany payPackCompany = payPackCompanyService.getById(input.getPackId());
+	 	 if(Objects.isNull(payPackCompany)){
 			return Result.error("打包企业不存在");
-		}
+		 }
 		 if(!StringUtils.isBlank(input.getProjectName())){
 			 input.setProjectName(oConvertUtils.replaceAllPercent(input.getProjectName()));
 		 }
-		input.setCompanyId(payPackCompany.getCompanyId());
-		input.setPackYear(payPackCompany.getPackYear());
-		List<PayCommonProject> list = payPackCompanyProjectService.queryListAll(input);
-		if(!CollectionUtils.isEmpty(list)){
-			list.forEach(p->{
+		 input.setCompanyId(payPackCompany.getCompanyId());
+		 input.setPackYear(payPackCompany.getPackYear());
+		 List<PayCommonProject> list = payPackCompanyProjectService.queryListAll(input);
+		 if(!CollectionUtils.isEmpty(list)){
+			 list.forEach(p->{
 				if(!StringUtils.isBlank(p.getPhone())){
 					p.setPhone(PasswordUtil.decrypt(p.getPhone()));
 				}
@@ -129,9 +124,9 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 				if(Objects.isNull(p.getPaidAmount())){
 					p.setPaidAmount(new BigDecimal("0.00"));
 				}
-			});
-		}
-		return Result.OK(list);
+			 });
+		 }
+		 return Result.OK(list);
 	 }
 
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
index 6608c73c..324c2e48 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
@@ -48,7 +48,7 @@
             <!--工作组项目-->
             UNION ALL
             select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,su.realname,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,
-        if(gsub.paid_amount is null or gsub.paid_amount = '','0.00',gsub.paid_amount) as paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'',''
+            if(gsub.paid_amount is null or gsub.paid_amount = '','0.00',gsub.paid_amount) as paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'',''
             from pay_working_group g
             left join sys_user su on g.principal_id_a = su.id
             inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
@@ -66,7 +66,7 @@
             <!-- 会议项目-->
             UNION ALL
             select sit.id,meeting.meeting_name,sit.invoice_amount,sit.charge_use, meeting.director_id, su.realname,sit.company_contact_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,
-        if(sit.paid_amount is null or sit.paid_amount = '','0.00',sit.paid_amount) as paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.phone,''
+            if(sit.paid_amount is null or sit.paid_amount = '','0.00',sit.paid_amount) as paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.phone,''
             from pay_meeting meeting
             left join sys_user su on meeting.director_id = su.id
             inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
@@ -85,7 +85,7 @@
             <!-- 会员项目-->
             UNION ALL
             select msub.id,pmp.project_name,msub.invoice_amount,msub.charge_use,pmp.director_id, su.realname,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,
-        if(msub.paid_amount is null or msub.paid_amount = '','0.00',msub.paid_amount) as paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'',''
+            if(msub.paid_amount is null or msub.paid_amount = '','0.00',msub.paid_amount) as paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'',''
             from pay_member_project pmp
             left join sys_user su on pmp.director_id = su.id
             inner join pay_member_project_subitem msub on pmp.id = msub.project_id
@@ -103,7 +103,7 @@
             <!-- 标协会员项目-->
             UNION ALL
             select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,tmember.director_id, su.realname,'',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,
-        if(tmsub.paid_amount is null or tmsub.paid_amount = '','0.00',tmsub.paid_amount) as paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email
+            if(tmsub.paid_amount is null or tmsub.paid_amount = '','0.00',tmsub.paid_amount) as paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email
             from tb_member_project tmember
             left join sys_user su on tmember.director_id = su.id
             inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
@@ -118,6 +118,24 @@
                     AND tmember.year = #{year}
                 </if>
             </where>
+            <!-- 证书 -->
+            UNION ALL
+            select tcp.id,tmember.project_name,tcp.invoice_amount,tcp.charge_use,tmember.director_id, su.realname,'',tcp.liaison_man,tcp.company_name,tcp.amount_receivable,
+            if(tcp.paid_amount is null or tcp.paid_amount = '','0.00',tcp.paid_amount) as paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6,tcp.mobile,tcp.email
+        from tb_member_project tmember
+            left join sys_user su on tmember.director_id = su.id
+            inner join tb_certificate_payment tcp on tmember.id = tcp.project_id
+            <where>
+                <if test="companyId != null and companyId != ''">
+                    AND tcp.company_id = #{companyId}
+                </if>
+                <if test="projectName != null and projectName != ''">
+                    AND tmember.project_name LIKE CONCAT('%',CONCAT(#{projectName},'%'))
+                </if>
+                <if test="year != null and year != ''">
+                    AND tmember.year = #{year}
+                </if>
+            </where>
         ) project
         LEFT JOIN pay_pack_company_project ppcp  ON project.id = ppcp.project_id
         LEFT JOIN pay_pack_company ppc ON ppc.id = ppcp.pack_id and ppc.pack_year =#{packYear}
@@ -248,6 +266,30 @@
                 AND tmsub.pack = #{pack}
             </if>
         </where>
+        <!-- 证书 tcp.mobile,tcp.email -->
+        <!-- 标协会员项目-->
+        UNION ALL
+        select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id, su.realname,tcp.company_name,tcp.amount_receivable,tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6,tcp.liaison_man
+        from tb_member_project tmember
+        left join sys_user su on tmember.director_id = su.id
+        inner join tb_certificate_payment tcp on tmember.id = tcp.project_id
+        <where>
+            <if test="projectId != null and projectId != ''">
+                AND tcp.id = #{projectId}
+            </if>
+            <if test="companyId != null and companyId != ''">
+                AND tcp.company_id = #{companyId}
+            </if>
+            <if test="projectName != null and projectName != ''">
+                AND tmember.project_name LIKE CONCAT('%',CONCAT(#{projectName},'%'))
+            </if>
+            <if test="year != null and year != ''">
+                AND tmember.year = #{year}
+            </if>
+            <if test="pack != null and pack != ''">
+                AND tcp.pack = #{pack}
+            </if>
+        </where>
         ) project
         <if test="packId != null and packId != ''">
             WHERE project.id NOT IN (SELECT project_id FROM pay_pack_company_project where pack_id = #{packId})
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index a49c37c3..9982aae4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -1,24 +1,15 @@
 package com.jero.project.controller;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.common.ProjectCommon;
-import com.jero.common.common.RoleCommon;
 import com.jero.common.service.ProjectDetailService;
 import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -47,14 +38,14 @@ import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.common.PayProjectCommon;
+import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayCompanyCommonProject;
 import com.jero.project.entity.PayWorkingGroupDistributionRecord;
 import com.jero.project.service.IPayCommonProjectService;
-import com.jero.project.entity.PayCommonProject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
 import com.jero.project.vo.PayCommonProjectOutput;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -62,8 +53,16 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 普通项目管理
@@ -280,6 +279,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 						if(!StringUtils.isBlank(listSysUserNew.get(0).getEmail())){
 							p.setPrincipalEmail(PasswordUtil.decrypt(listSysUserNew.get(0).getEmail()));
 						}
+						p.setPrincipalName(listSysUserNew.get(0).getRealname());
 					}
 				 }
 			 });
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index 5c4ddfb0..309772db 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -272,6 +272,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 							 if(!StringUtils.isBlank(listSysUserNew.get(0).getEmail())){
 								 p.setPrincipalEmail(PasswordUtil.decrypt(listSysUserNew.get(0).getEmail()));
 							 }
+							 p.setPrincipalName(listSysUserNew.get(0).getRealname());
 						 }
 					 }
 					 p.setOperationCycle(listPrincipalIdA.get(0).getOperationCycle());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
index a0ca382b..e8450c53 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
@@ -4,8 +4,43 @@
 
     <select id="queryPageList" resultType="com.jero.project.entity.PayCommonProject">
         SELECT
-            pcp.*
+            pcp.id,
+            pcp.charge_project,
+            pcp.year,
+            pcp.principal_id,
+            su.realname as principal_name,
+            pcp.charge_company_id,
+            pcp.charge_company_temporary_id,
+            pcp.charge_company_temporary_name,
+            pcp.charge_use,
+            pcp.contacts_id,
+            pcp.contacts_temporary_id,
+            pcp.contacts_temporary_name,
+            pcp.receivable_amount,
+            pcp.paid_amount,
+            pcp.mail_contacts_temporary_id,
+            pcp.mail_contacts_id,
+            pcp.mail_contacts_temporary_name,
+            pcp.pack,
+            pcp.need_invoice,
+            pcp.in_account,
+            pcp.make_invoice,
+            pcp.mail,
+            pcp.charge_way,
+            pcp.contract_num,
+            pcp.charge_notice_no,
+            pcp.charge_notice_id,
+            pcp.press_money_times,
+            pcp.remarks,
+            pcp.files,
+            pcp.create_by,
+            pcp.create_time,
+            pcp.update_by,
+            pcp.update_time,
+            pcp.invoice_amount,
+            pcp.payment_status
         FROM pay_common_project pcp
+        left join sys_user su on pcp.principal_id = su.id
 		LEFT JOIN pay_payment_record ppr ON ppr.project_id = pcp.id
 		<where>
             <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
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 6cc9ae1c..af3dcfe0 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
@@ -7,9 +7,9 @@
             working_group_project AS workingGroupProject,
             year,
             principal_id_a AS principalIdA,
-            principal_name_a AS principalNameA,
+            su.realname AS principalNameA,
             principal_id_b AS principalIdB,
-            principal_name_b AS principalNameB,
+            su1.realname AS principalNameB,
             convoke_num AS convokeNum,
             operation_cycle AS operationCycle,
             year_charge_a AS yearChargeA,
@@ -24,7 +24,10 @@
             pwg.create_time AS createTime,
             pwg.update_by AS updateBy,
             pwg.update_time AS updateTime
-        FROM pay_working_group pwg left join pay_meeting pm on pwg.id = pm.working_group_id
+        FROM pay_working_group pwg
+        left join sys_user su on pwg.principal_id_a = su.id
+        left join sys_user su1 on pwg.principal_id_b = su.id
+        left join pay_meeting pm on pwg.id = pm.working_group_id
         <where>
             <if test="payWorkingGroup.workingGroupProject != null and payWorkingGroup.workingGroupProject != ''">
                 AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%'))
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index 5f223c5d..23a58988 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -45,7 +45,7 @@
 	   and sa.del_flag = '0'
 	   and sas.user_id = #{announcementSendModel.userId}
 	   <if test="announcementSendModel.titile !=null and announcementSendModel.titile != ''">
-	   		and sa.titile LIKE concat(concat('%',#{announcementSendModel.titile}),'%')
+	   		and sa.titile  = #{announcementSendModel.titile}
 	   </if>
 	   <if test="announcementSendModel.sender !=null and announcementSendModel.sender != ''">
 	   		and sa.sender LIKE concat(concat('%',#{announcementSendModel.sender}),'%')