liuliang
/
hrm-attendance
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
zm_dev
sy 8 months ago
parent fabec17ae4 e82542c988
commit 21f100065d
5 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File

8
src/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java
Unescape Escape View File

@ -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<Map<String,Object>> dataList = DbTools.getSqlToList(sqltj);
for (Map<String,Object> dataMap :dataList){

17
src/com/engine/jucailinkq/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java
Unescape Escape View File

@ -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<Map<String,Object>> dataList = DbTools.getSqlToList(sqltj);
for (Map<String,Object> 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<Map<String,Object>> dataList = DbTools.getSqlToList(sqltj);
for (Map<String,Object> dataMap :dataList){

9
src/com/engine/jucailinkq/common/cmd/GetPersonDateBySuitOrganzation.java
Unescape Escape View File

@ -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<Map<St
userIds.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<Map<String,Object>> dataList = DbTools.getSqlToList(sqltj);
for (Map<String,Object> dataMap :dataList){

16
src/com/engine/jucailinkq/common/util/CommonUtil.java
Unescape Escape View File

@ -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<Map<String,Object>> dataList = DbTools.getSqlToList(sqltj);
for (Map<String,Object> 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<Map<String,Object>> dataList = DbTools.getSqlToList(sqltj);
for (Map<String,Object> dataMap :dataList){

17
src/com/engine/jucailinkq/common/util/Utils.java
Unescape Escape View File

@ -1160,4 +1160,21 @@ public class Utils<T> {
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;
}
}

Write Preview
Loading…
Cancel
Save