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 7a7e2822..62357314 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
@@ -15,6 +15,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.PasswordUtil;
+import com.jero.common.util.oConvertUtils;
 import com.jero.data.entity.*;
 import com.jero.data.entity.DTO.PayCaseCommitteeSubitemDTO;
 import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
@@ -76,9 +77,9 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 						  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
 								   ) {
 		//模糊查询%_特殊字符bug
-		String contactsNames = SearchUtil.exchenge(contactsName);
-		String companyNames = SearchUtil.exchenge(companyName);
-		String fenBiaoWeiNames = SearchUtil.exchenge(fenBiaoWeiName);
+		String contactsNames = oConvertUtils.replaceAllPercent(contactsName);
+		String companyNames = oConvertUtils.replaceAllPercent(companyName);
+		String fenBiaoWeiNames = oConvertUtils.replaceAllPercent(fenBiaoWeiName);
 
 		Page<FindByName> page = new Page<>(pageNo, pageSize);
 		IPage<FindByName> pageList = payCaseCommitteeSubitemService.listThree(page,contactsNames,companyNames,fenBiaoWeiNames);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index 7dda2055..d633ac6b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -317,23 +317,41 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(
 			PayMailBillSearch payMailBillSearch,
-    		@RequestParam(name = "ids",required = false) String ids) {
+    		@RequestParam(name = "ids",required = false) String ids
+
+																							) {
 		if(StringUtils.isBlank(ids)){
-			if(ObjectUtils.isNotEmpty(payMailBillSearch.getEndTime())) {
-				Calendar calendar = Calendar.getInstance();
+			QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
+			if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) {
+				Calendar calendar= Calendar.getInstance();
 				calendar.setTime(payMailBillSearch.getEndTime());
-				calendar.add(Calendar.HOUR, 23);//时
-				calendar.add(Calendar.MINUTE, 59);//时
-				calendar.add(Calendar.SECOND, 59);//秒
-				payMailBillSearch.setEndTime(calendar.getTime());
+				calendar.add(Calendar.HOUR,23);//时
+				calendar.add(Calendar.MINUTE,59);//时
+				calendar.add(Calendar.SECOND,59);//秒
+				queryWrapper.ge("send_date", payMailBillSearch.getStartTime());
+				queryWrapper.le("send_date", calendar.getTime());
+
+			}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){
+				queryWrapper.ge("send_date", payMailBillSearch.getStartTime());
+
+			}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){
+				Calendar calendar= Calendar.getInstance();
+				calendar.setTime(payMailBillSearch.getEndTime());
+				calendar.add(Calendar.HOUR,23);//时
+				calendar.add(Calendar.MINUTE,59);//时
+				calendar.add(Calendar.SECOND,59);//秒
+				queryWrapper.le("send_date", calendar.getTime());
 			}
-			if(ObjectUtils.isNotEmpty(payMailBillSearch.getChargeCompanyName())) {
-				payMailBillSearch.setChargeCompanyName(SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName()));
+			if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){
+				queryWrapper.like("charge_company_name",oConvertUtils.replaceAllPercent(payMailBillSearch.getChargeCompanyName()));
 			}
-			if(ObjectUtils.isNotEmpty(payMailBillSearch.getProjectName())) {
-				payMailBillSearch.setProjectName(SearchUtil.exchenge(payMailBillSearch.getProjectName()));
+			if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalId())){
+				queryWrapper.eq("principal_id",payMailBillSearch.getPrincipalId());
 			}
-			List<PayMailBill> pageList = payMailBillService.pageListTwo(payMailBillSearch);
+			if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
+				queryWrapper.like("project_name",oConvertUtils.replaceAllPercent(payMailBillSearch.getProjectName()));
+			}
+			List<PayMailBill> pageList = payMailBillService.list(queryWrapper);
 			if (!CollectionUtils.isEmpty(pageList)) {
 				try {
 					pageList.forEach(p -> {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
index cd7601fc..b946e858 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
@@ -16,6 +16,7 @@ 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.oConvertUtils;
 import com.jero.contract.entity.PayIncomeContract;
 import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.mail.entity.PayMailBill;
@@ -65,9 +66,9 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 									@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 									@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize
 									) {
-		 payMailBillList.setContractName(SearchUtil.exchenge(payMailBillList.getContractName()));
-		 payMailBillList.setContractNum(SearchUtil.exchenge(payMailBillList.getContractNum()));
-		 payMailBillList.setSignedCompanyTemporaryName(SearchUtil.exchenge(payMailBillList.getSignedCompanyTemporaryName()));
+		 payMailBillList.setContractName(oConvertUtils.replaceAllPercent(payMailBillList.getContractName()));
+		 payMailBillList.setContractNum(oConvertUtils.replaceAllPercent(payMailBillList.getContractNum()));
+		 payMailBillList.setSignedCompanyTemporaryName(oConvertUtils.replaceAllPercent(payMailBillList.getSignedCompanyTemporaryName()));
 		 Page<PayMailBillList> page = new Page<>(pageNo, pageSize);
 		 IPage<PayMailBillList> pageList = payMailContractService.pageContract(page,payMailBillList);
 		 if (!CollectionUtils.isEmpty(pageList.getRecords())) {
@@ -155,6 +156,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 		 return Result.OK("操作成功!");
 	 }
 
+
 	 /**
 	  * 导出excel
 	  */
@@ -164,9 +166,9 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 	 @GetMapping(value = "/exportXls")
 	 public ModelAndView exportXls(PayMailBillList payMailBillList, @RequestParam(name = "ids", required = false) String ids) {
 		 if (StringUtils.isBlank(ids)) {
-			 payMailBillList.setContractName(SearchUtil.exchenge(payMailBillList.getContractName()));
-			 payMailBillList.setContractNum(SearchUtil.exchenge(payMailBillList.getContractNum()));
-			 payMailBillList.setSignedCompanyTemporaryName(SearchUtil.exchenge(payMailBillList.getSignedCompanyTemporaryName()));
+			 payMailBillList.setContractName(oConvertUtils.replaceAllPercent(payMailBillList.getContractName()));
+			 payMailBillList.setContractNum(oConvertUtils.replaceAllPercent(payMailBillList.getContractNum()));
+			 payMailBillList.setSignedCompanyTemporaryName(oConvertUtils.replaceAllPercent(payMailBillList.getSignedCompanyTemporaryName()));
 			 List<PayMailBillList> pageList = payMailContractService.pageContractTwo(payMailBillList);
 			 if (!CollectionUtils.isEmpty(pageList)) {
 				 try {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
index dccf5d24..c7913f98 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
@@ -19,16 +19,16 @@ pic.principal_id as principalId,
 pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id)
 <where>
     <if test="payMailBillList.contractNum !='' and payMailBillList.contractNum !=null">
-        pic.contract_num like concat('%',concat(#{payMailBillList.contractNum},'%')) escape '/'
+        pic.contract_num like concat('%',concat(#{payMailBillList.contractNum},'%'))
     </if>
     <if test="payMailBillList.contractName !='' and payMailBillList.contractName !=null">
-        pic.contract_name like concat('%',concat(#{payMailBillList.contractName},'%')) escape '/'
+      and  pic.contract_name like concat('%',concat(#{payMailBillList.contractName},'%'))
     </if>
     <if test="payMailBillList.signedCompanyTemporaryName !='' and payMailBillList.signedCompanyTemporaryName !=null">
-        pic.signed_company_temporary_name like concat('%',concat(#{payMailBillList.signedCompanyTemporaryName},'%')) escape '/'
+      and  pic.signed_company_temporary_name like concat('%',concat(#{payMailBillList.signedCompanyTemporaryName},'%'))
     </if>
     <if test="payMailBillList.principalId !='' and payMailBillList.principalId !=null">
-        pic.principal_id = #{payMailBillList.principalId}
+      and  pic.principal_id = #{payMailBillList.principalId}
     </if>
 </where>
 order by post_status ASC , pc.create_time DESC
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 fb3443ee..5b9f2dfc 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
@@ -199,7 +199,7 @@
             </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND pwg.working_group_project LIKE
-                concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
+                concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) 
             </if>
             <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
                 AND pwgs.in_account LIKE
@@ -213,7 +213,7 @@
             </if>
             <if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
                 AND pwgs.charge_company_temporary_name LIKE
-                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
+                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) 
             </if>
             <if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
                 AND pwg.principal_id_a=#{allProjectStatisticsSearch.principalNameId}
@@ -258,7 +258,7 @@
             </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND pcp.charge_project LIKE
-                concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
+                concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) 
             </if>
             <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
                 AND pcp.in_account LIKE
@@ -266,7 +266,7 @@
             </if>
             <if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
                 AND pcp.charge_company_temporary_name LIKE
-                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
+                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) 
             </if>
             <if test="allProjectStatisticsSearch.departCode != null and allProjectStatisticsSearch.departCode != ''">
                 AND su.org_code =#{allProjectStatisticsSearch.departCode}
@@ -318,7 +318,7 @@
             </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND pmp.project_name LIKE
-                concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
+                concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) 
             </if>
             <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
                 AND pmps.in_account LIKE
@@ -332,7 +332,7 @@
             </if>
             <if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
                 AND pmps.company_name LIKE
-                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
+                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) 
             </if>
             <if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
                 AND pmp.director_id=#{allProjectStatisticsSearch.principalNameId}
@@ -377,7 +377,7 @@
             </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND pm.meeting_name LIKE
-                concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
+                concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) 
             </if>
             <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
                 AND pms.in_account LIKE
@@ -391,7 +391,7 @@
             </if>
             <if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
                 AND pms.company_name LIKE
-                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
+                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) 
             </if>
             <if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
                 AND pm.director_id=#{allProjectStatisticsSearch.principalNameId}
@@ -434,7 +434,7 @@
             </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND tmp.project_name LIKE
-                concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
+                concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) 
             </if>
             <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
                 AND tmps.in_account LIKE
@@ -451,7 +451,7 @@
             </if>
             <if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
                 AND tmps.company_name LIKE
-                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
+                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) 
             </if>
             <if test="allProjectStatisticsSearch.pack != null and allProjectStatisticsSearch.pack != ''">
                 AND tmps.pack=#{allProjectStatisticsSearch.pack}
@@ -1303,7 +1303,7 @@
             </if>
             <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
                 AND pwg.working_group_project LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
+                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) 
             </if>
             <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
                 AND pwgs.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1345,7 +1345,7 @@
             </if>
             <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
                 AND pcp.charge_project LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
+                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) 
             </if>
             <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
                 AND pcp.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1387,7 +1387,7 @@
             </if>
             <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
                 AND pm.meeting_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
+                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) 
             </if>
             <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
                 AND pms.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1429,7 +1429,7 @@
             </if>
             <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
                 AND pmp.project_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
+                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) 
             </if>
             <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
                 AND pmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1464,7 +1464,7 @@
         <where>
             <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
                 AND tmp.project_name LIKE
-                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
+                concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) 
             </if>
 
             <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
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 51e8783d..15ef312c 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
@@ -8,6 +8,7 @@ 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.util.oConvertUtils;
 import com.jero.mail.commont.constant;
 import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.member.service.IPayMemberProjectService;
@@ -73,8 +74,8 @@ public class AllProjectStatisticsController {
                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
 
-        allProjectStatisticsSearch.setProjectName( SearchUtil.exchenge(allProjectStatisticsSearch.getProjectName()));
-        allProjectStatisticsSearch.setChargeCompanyTemporaryName( SearchUtil.exchenge(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
+        allProjectStatisticsSearch.setProjectName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
+        allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
             //根据不同角色加载不同列表的参数
             List<String> idList = new ArrayList<>();
             //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
@@ -150,8 +151,8 @@ public class AllProjectStatisticsController {
     public Result<?> listProject(AllProjectStatisticsSearch allProjectStatisticsSearch,
                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-        allProjectStatisticsSearch.setProjectName( SearchUtil.exchenge(allProjectStatisticsSearch.getProjectName()));
-        allProjectStatisticsSearch.setChargeCompanyTemporaryName( SearchUtil.exchenge(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
+        allProjectStatisticsSearch.setProjectName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
+        allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
             //根据不同角色加载不同列表的参数
             List<String> idList = new ArrayList<>();
             //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
@@ -222,8 +223,8 @@ public class AllProjectStatisticsController {
     @GetMapping(value = "/statistics/excel")
     @ApiOperation(value = "全所统计导出-导出统计", notes = "全所统计导出-导出统计")
     public ModelAndView excel( AllProjectStatisticsSearch allProjectStatisticsSearch) {
-        allProjectStatisticsSearch.setProjectName( SearchUtil.exchenge(allProjectStatisticsSearch.getProjectName()));
-        allProjectStatisticsSearch.setChargeCompanyTemporaryName( SearchUtil.exchenge(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
+        allProjectStatisticsSearch.setProjectName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
+        allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
             //根据不同角色加载不同列表的参数
             List<String> idList = new ArrayList<>();
             //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
@@ -272,8 +273,8 @@ public class AllProjectStatisticsController {
     @GetMapping(value = "/statistics/excelProject")
     @ApiOperation(value = "企业项目统计-导出统计", notes = "企业项目统计-导出统计")
     public ModelAndView excelProject( AllProjectStatisticsSearch allProjectStatisticsSearch) {
-        allProjectStatisticsSearch.setProjectName( SearchUtil.exchenge(allProjectStatisticsSearch.getProjectName()));
-        allProjectStatisticsSearch.setChargeCompanyTemporaryName( SearchUtil.exchenge(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
+        allProjectStatisticsSearch.setProjectName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
+        allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
             if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
                 Calendar calendar = Calendar.getInstance();
                 String year = String.valueOf(calendar.get(Calendar.YEAR));
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 e2eca02a..d426c271 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
@@ -8,6 +8,7 @@ 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.util.oConvertUtils;
 import com.jero.mail.commont.constant;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.mapper.SysUserMapper;
@@ -133,7 +134,7 @@ public class CompanyComeMoneyStatisticsController {
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
 
-        companyComeMoneyDetailSearch.setProjectName( SearchUtil.exchenge(companyComeMoneyDetailSearch.getProjectName()));
+        companyComeMoneyDetailSearch.setProjectName( oConvertUtils.replaceAllPercent(companyComeMoneyDetailSearch.getProjectName()));
         if (companyComeMoneyDetailSearch.getYear() == null || companyComeMoneyDetailSearch.getYear().equals("")) {
             Calendar calendar = Calendar.getInstance();
             String year = String.valueOf(calendar.get(Calendar.YEAR));
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 8ba8e772..d500fa6e 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
@@ -10,6 +10,7 @@ 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.util.oConvertUtils;
 import com.jero.mail.commont.constant;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.mapper.SysUserMapper;
@@ -72,7 +73,7 @@ public class PayWorkingGroupStatisticsController {
                            @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
 
-        payWorkingGroupSearch.setWorkGroup(SearchUtil.exchenge(payWorkingGroupSearch.getWorkGroup()));
+        payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
         Page<PayWorkingGroupStatistics> page = new Page<>(pageNo, pageSize);
         if(payWorkingGroupSearch.getYear()==null|| payWorkingGroupSearch.getYear().equals("")){
             Calendar calendar= Calendar.getInstance();
@@ -144,7 +145,7 @@ public class PayWorkingGroupStatisticsController {
     @GetMapping(value = "/exportXls2")
     @ApiOperation(value="工作组项目统计-统计导出excel", notes="工作组项目统计-统计导出excel")
     public ModelAndView exportXls2( PayWorkingGroupSearch payWorkingGroupSearch) {
-        payWorkingGroupSearch.setWorkGroup(SearchUtil.exchenge(payWorkingGroupSearch.getWorkGroup()));
+        payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
         if(payWorkingGroupSearch.getYear()==null|| payWorkingGroupSearch.getYear().equals("")){
             Calendar calendar= Calendar.getInstance();
             String year = String.valueOf(calendar.get(Calendar.YEAR));
@@ -206,7 +207,7 @@ public class PayWorkingGroupStatisticsController {
                            @RequestParam(name = "id") String id,
                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
 
-        payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(SearchUtil.exchenge(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
+        payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
         Page<PayWorkGroupSubletStatistics> page = new Page<>(pageNo, pageSize);
         if(payWorkingGroupSubletSearch.getYear()==null|| payWorkingGroupSubletSearch.getYear().equals("")){
             Calendar calendar= Calendar.getInstance();
@@ -265,7 +266,7 @@ for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
         }
 
         if (ObjectUtils.isEmpty(selections)) {
-            payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(SearchUtil.exchenge(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
+            payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
             List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics(payWorkingGroupSubletSearch, id);
             //处理为空数据为0
             for (PayWorkGroupSubletStatistics s : pageList) {
@@ -278,7 +279,7 @@ for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
             }
             return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计");
         } else {
-            payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(SearchUtil.exchenge(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
+            payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
             ArrayList<String> selections2 = new ArrayList<>(Arrays.asList(selections.split(",")));
             List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics2(payWorkingGroupSubletSearch,id,selections2);
             //处理为空数据为0