From 4ede0a5b2d46675cfbc01594d770ec753e42fb19 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Tue, 13 May 2025 14:01:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=BE=AE=E5=B0=8Fbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/tool/controller/search/EpcController.java | 6 +++--- .../com/bonus/tool/controller/search/SouthController.java | 6 +++--- .../bonus/tool/controller/search/StateGridController.java | 8 ++++---- .../com/bonus/tool/service/impl/StateGridServiceImpl.java | 1 - .../src/main/resources/mapper/TbCompanyPerfMapper.xml | 2 +- search-tool/src/main/resources/mapper/TbSubPerfMapper.xml | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/EpcController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/EpcController.java index 1c4d86a..3c642ea 100644 --- a/search-tool/src/main/java/com/bonus/tool/controller/search/EpcController.java +++ b/search-tool/src/main/java/com/bonus/tool/controller/search/EpcController.java @@ -61,7 +61,7 @@ public class EpcController extends BaseController { return service.addEpcTemp(o); }catch (Exception e){ log.info("Epc模版新增失败{}",e.getMessage()); - return error(e.getMessage()); + return error("Epc模版新增失败"); } } @@ -95,7 +95,7 @@ public class EpcController extends BaseController { return service.delEpcTemp(o); }catch (Exception e){ log.info("Epc模版删除失败{}",e.getMessage()); - return error(e.getMessage()); + return error("Epc模版删除失败"); } } @@ -112,7 +112,7 @@ public class EpcController extends BaseController { return service.updateEpcTemp(o); }catch (Exception e){ log.info("Epc模版修改失败{}",e.getMessage()); - return error(e.getMessage()); + return error("Epc模版修改失败"); } } diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/SouthController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/SouthController.java index 893ef76..1b3efab 100644 --- a/search-tool/src/main/java/com/bonus/tool/controller/search/SouthController.java +++ b/search-tool/src/main/java/com/bonus/tool/controller/search/SouthController.java @@ -62,7 +62,7 @@ public class SouthController extends BaseController { return service.addSouthTemp(o); }catch (Exception e){ log.info("南网模版新增失败{}",e.getMessage()); - return error(e.getMessage()); + return error("南网模版新增失败"); } } @@ -96,7 +96,7 @@ public class SouthController extends BaseController { return service.delSouthTemp(o); }catch (Exception e){ log.info("南网模版删除失败{}",e.getMessage()); - return error(e.getMessage()); + return error("南网模版删除失败"); } } @@ -113,7 +113,7 @@ public class SouthController extends BaseController { return service.updateSouthTemp(o); }catch (Exception e){ log.info("南网模版修改失败{}",e.getMessage()); - return error(e.getMessage()); + return error("南网模版修改失败"); } } diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java index 0c072a7..402c6c2 100644 --- a/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java +++ b/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java @@ -62,7 +62,7 @@ public class StateGridController extends BaseController { return service.addStateGridTemp(o); }catch (Exception e){ log.info("国网模版新增失败{}",e.getMessage()); - return error(e.getMessage()); + return error("国网模版新增失败"); } } @@ -79,7 +79,7 @@ public class StateGridController extends BaseController { return service.getStateGridTempById(o); }catch (Exception e){ log.info("公司业绩管理详情失败{}",e.getMessage()); - return error("公司业绩管理详情失败"); + return error("公司业绩管理详情失败"); } } @@ -96,7 +96,7 @@ public class StateGridController extends BaseController { return service.delStateGridTemp(o); }catch (Exception e){ log.info("国网模版删除失败{}",e.getMessage()); - return error(e.getMessage()); + return error("国网模版删除失败"); } } @@ -113,7 +113,7 @@ public class StateGridController extends BaseController { return service.updateStateGridTemp(o); }catch (Exception e){ log.info("国网模版修改失败{}",e.getMessage()); - return error(e.getMessage()); + return error("国网模版修改失败"); } } diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java index de8e319..7cca5f7 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java @@ -378,7 +378,6 @@ public class StateGridServiceImpl implements StateGridService { } // 处理分包资质证明材料图片 if (item.getSubFileList() != null && !item.getSubFileList().isEmpty()) { - int zzIndex = 1; for (TbFileSourceVo file : item.getSubFileList()) { Map zzMap = new HashMap<>(); zzMap.put("index", idWorker.nextId()); diff --git a/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml b/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml index 5e07f3e..c6456f9 100644 --- a/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml +++ b/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml @@ -97,7 +97,7 @@ LEFT JOIN tb_company_perf tcp ON tcp.id = tcpr.perf_id and tcp.del_flag = 0 WHERE tkp.del_flag = 0 and tcp.id is not null and tkp.id = #{personId} - and tcp.pro_name = #{proName} + and locate(#{proName},tcp.pro_name) and tcp.voltage = #{voltage} and tcp.start_time BETWEEN STR_TO_DATE(#{startTime}, '%Y-%m-%d') AND STR_TO_DATE(#{endTime}, '%Y-%m-%d') diff --git a/search-tool/src/main/resources/mapper/TbSubPerfMapper.xml b/search-tool/src/main/resources/mapper/TbSubPerfMapper.xml index 5f74cc7..f52f6d3 100644 --- a/search-tool/src/main/resources/mapper/TbSubPerfMapper.xml +++ b/search-tool/src/main/resources/mapper/TbSubPerfMapper.xml @@ -85,7 +85,7 @@ LEFT JOIN tb_sub_perf tcp ON tcp.id = tcpr.perf_id and tcp.del_flag = 0 WHERE tsp.del_flag = 0 and tcp.id is not null and tsp.id = #{personId} - and tcp.pro_name = #{proName} + and locate(#{proName},tcp.pro_name) and tcp.sub_id = #{subId} and tcp.voltage = #{voltage}