From e82542c988f4cc158c5bbbeff05288f637866174 Mon Sep 17 00:00:00 2001 From: liuliang <401809302@qq.com> Date: Wed, 14 Aug 2024 15:07:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WorkRulesServiceImpl.java | 8 +------- .../commonutil/PersongroupCommonUtil.java | 17 +++-------------- .../cmd/GetPersonDateBySuitOrganzation.java | 9 ++------- .../jucailinkq/common/util/CommonUtil.java | 16 ++-------------- .../engine/jucailinkq/common/util/Utils.java | 17 +++++++++++++++++ 5 files changed, 25 insertions(+), 42 deletions(-) diff --git a/src/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java b/src/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java index a3deccd..8c3bc58 100644 --- a/src/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java +++ b/src/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java @@ -209,13 +209,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService { userIdMap.put(hrmId,date); } }else if ("2".equals(list_type) && !"".equals(sqltj)){ - sqltj = sqltj.replace("ｓｅｌｅｃｔ","select"); - sqltj = sqltj.replace("ａｎｄ","and"); - sqltj = sqltj.replace("ｏｒ","or"); - sqltj = sqltj.replace("ｊｏｉｎ","join"); - sqltj = sqltj.replace("ｌｉｋｅ","like"); - sqltj = sqltj.replace("ｉｎ","in"); - sqltj = sqltj.replace("ｕｎｉｏｎ","in"); + sqltj = Utils.converSQL(sqltj); log.info("getPersonnelGroupingByPerson sqltj : [{}]",sqltj); List> dataList = DbTools.getSqlToList(sqltj); for (Map dataMap :dataList){ diff --git a/src/com/engine/jucailinkq/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java b/src/com/engine/jucailinkq/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java index ee3b5c8..c118c55 100644 --- a/src/com/engine/jucailinkq/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java +++ b/src/com/engine/jucailinkq/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java @@ -3,6 +3,7 @@ package com.engine.jucailinkq.attendance.component.persongroup.commonutil; import com.engine.jucailinkq.attendance.enums.PersonGroupListTypeEnum; import com.engine.jucailinkq.common.util.DateUtil; import com.engine.jucailinkq.common.util.DbTools; +import com.engine.jucailinkq.common.util.Utils; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -396,13 +397,7 @@ public class PersongroupCommonUtil { } } }else if (!"".equals(sqltj)){ - sqltj = sqltj.replace("ｓｅｌｅｃｔ","select"); - sqltj = sqltj.replace("ａｎｄ","and"); - sqltj = sqltj.replace("ｏｒ","or"); - sqltj = sqltj.replace("ｊｏｉｎ","join"); - sqltj = sqltj.replace("ｌｉｋｅ","like"); - sqltj = sqltj.replace("ｉｎ","in"); - sqltj = sqltj.replace("ｕｎｉｏｎ","in"); + sqltj = Utils.converSQL(sqltj); log.info("getPersonnelGroupingByPerson sqltj : [{}]",sqltj); List> dataList = DbTools.getSqlToList(sqltj); for (Map dataMap :dataList){ @@ -462,13 +457,7 @@ public class PersongroupCommonUtil { userIds.add(hrmId); } }else if (PersonGroupListTypeEnum.SQLCONDITION.getKey().equals(list_type) && !"".equals(sqltj)){ - sqltj = sqltj.replace("ｓｅｌｅｃｔ","select"); - sqltj = sqltj.replace("ａｎｄ","and"); - sqltj = sqltj.replace("ｏｒ","or"); - sqltj = sqltj.replace("ｊｏｉｎ","join"); - sqltj = sqltj.replace("ｌｉｋｅ","like"); - sqltj = sqltj.replace("ｉｎ","in"); - sqltj = sqltj.replace("ｕｎｉｏｎ","in"); + sqltj = Utils.converSQL(sqltj); log.info("getPersonnelGroupingByPerson sqltj : [{}]",sqltj); List> dataList = DbTools.getSqlToList(sqltj); for (Map dataMap :dataList){ diff --git a/src/com/engine/jucailinkq/common/cmd/GetPersonDateBySuitOrganzation.java b/src/com/engine/jucailinkq/common/cmd/GetPersonDateBySuitOrganzation.java index 2a946e6..ebfc8d7 100644 --- a/src/com/engine/jucailinkq/common/cmd/GetPersonDateBySuitOrganzation.java +++ b/src/com/engine/jucailinkq/common/cmd/GetPersonDateBySuitOrganzation.java @@ -5,6 +5,7 @@ import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.entity.BizLogContext; import com.engine.jucailinkq.common.util.DbTools; import com.engine.core.interceptor.CommandContext; +import com.engine.jucailinkq.common.util.Utils; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; @@ -258,13 +259,7 @@ public class GetPersonDateBySuitOrganzation extends AbstractCommonCommand> dataList = DbTools.getSqlToList(sqltj); for (Map dataMap :dataList){ diff --git a/src/com/engine/jucailinkq/common/util/CommonUtil.java b/src/com/engine/jucailinkq/common/util/CommonUtil.java index 14e3720..2840068 100644 --- a/src/com/engine/jucailinkq/common/util/CommonUtil.java +++ b/src/com/engine/jucailinkq/common/util/CommonUtil.java @@ -515,13 +515,7 @@ public class CommonUtil { empIdList.add(hrmId); } }else if ("2".equals(list_type) && !"".equals(sqltj)){ - sqltj = sqltj.replace("ｓｅｌｅｃｔ","select"); - sqltj = sqltj.replace("ａｎｄ","and"); - sqltj = sqltj.replace("ｏｒ","or"); - sqltj = sqltj.replace("ｊｏｉｎ","join"); - sqltj = sqltj.replace("ｌｉｋｅ","like"); - sqltj = sqltj.replace("ｉｎ","in"); - sqltj = sqltj.replace("ｕｎｉｏｎ","in"); + sqltj = Utils.converSQL(sqltj); log.info("getPersonnelGroupingByPerson sqltj : [{}]",sqltj); List> dataList = DbTools.getSqlToList(sqltj); for (Map dataMap :dataList){ @@ -594,13 +588,7 @@ public class CommonUtil { } } }else if ("2".equals(list_type) && !"".equals(sqltj)){ - sqltj = sqltj.replace("ｓｅｌｅｃｔ","select"); - sqltj = sqltj.replace("ａｎｄ","and"); - sqltj = sqltj.replace("ｏｒ","or"); - sqltj = sqltj.replace("ｊｏｉｎ","join"); - sqltj = sqltj.replace("ｌｉｋｅ","like"); - sqltj = sqltj.replace("ｉｎ","in"); - sqltj = sqltj.replace("ｕｎｉｏｎ","in"); + sqltj = Utils.converSQL(sqltj); log.info("getPersonnelGroupingByPerson sqltj : [{}]",sqltj); List> dataList = DbTools.getSqlToList(sqltj); for (Map dataMap :dataList){ diff --git a/src/com/engine/jucailinkq/common/util/Utils.java b/src/com/engine/jucailinkq/common/util/Utils.java index 69b569b..c3e4f59 100644 --- a/src/com/engine/jucailinkq/common/util/Utils.java +++ b/src/com/engine/jucailinkq/common/util/Utils.java @@ -1160,4 +1160,21 @@ public class Utils { return resultList; } + public static String converSQL(String sqltj){ + sqltj = sqltj.replace("ｓｅｌｅｃｔ","select"); + sqltj = sqltj.replace("ＳＥＬＥＣＴ","select"); + sqltj = sqltj.replace("ａｎｄ","and"); + sqltj = sqltj.replace("ＡＮＤ","and"); + sqltj = sqltj.replace("ｏｒ","or"); + sqltj = sqltj.replace("ＯＲ","or"); + sqltj = sqltj.replace("ｊｏｉｎ","join"); + sqltj = sqltj.replace("ＪＯＩＮ","join"); + sqltj = sqltj.replace("ｌｉｋｅ","like"); + sqltj = sqltj.replace("ＬＩＫＥ","like"); + sqltj = sqltj.replace("ｉｎ","in"); + sqltj = sqltj.replace("ＩＮ","in"); + sqltj = sqltj.replace("ｕｎｉｏｎ","union"); + return sqltj; + } + }