rj
/
ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calyrex 3.13

Browse Source
ht
calyrex 1 month ago
parent 03076eb58a
commit 7a70c5f864
6 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/workflow/hr/HrUtil.java
Unescape Escape View File

@ -5,6 +5,8 @@ import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import com.weaver.common.hrm.util.HrmContextUtil;
import com.weaver.common.i18n.tool.util.I18nContextUtil;
import com.weaver.verupgrade.conn.CONN_TYPE;
import org.slf4j.LoggerFactory;
@ -58,7 +60,17 @@ public class HrUtil {
Map<String, String> xtpz = new HashMap<>();
try {
String field3 = "";
String sql = "select a.id,b.field3 from eteams.dbo.employee a,eteams.dbo.hrmemployeedefined b where a.formdata = b.FORM_DATA_ID and a.job_num='" + gh + "'";
String tenantKey = HrmContextUtil.getCurrentTenantKey();
logger_3cf7b2d9.error("tenantKey = " + tenantKey);
String tablename = "hrmemployeedefined";
if("t6kj9c07jr".equals(tenantKey)){
tablename = "hrmemployeedefined";
}else if("tttit1yc38".equals(tenantKey)){//光电
tablename = "hrmemployeedefined_12";
}else if("tejiddakia".equals(tenantKey)){//华海
tablename = "hrmemployeedefined_11";
}
String sql = "select a.id,b.field3 from eteams.dbo.employee a,eteams.dbo." + tablename + " b where a.formdata = b.FORM_DATA_ID and a.job_num='" + gh + "'";
logger_3cf7b2d9.error("sql--" + sql);
String poolname_2v = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源

12
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java
Unescape Escape View File

@ -73,7 +73,17 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action,
}
String xxhzj = "";
String xxhzjrdgcl = "";
sql = "SELECT xxhzj AS xxhzj, xxhzjrdgcl AS xxhzjrdgcl FROM (SELECT t1.*, t2.id AS subcomid FROM eteams.dbo.hrmsubcompanydefined t1 LEFT JOIN eteams.dbo.department t2 ON t1.FORM_DATA_ID = t2.formdata AND t2.delete_type = 0 AND t2.tenant_key = 't6kj9c07jr' WHERE t1.DELETE_TYPE = 0 AND t1.TENANT_KEY = 't6kj9c07jr') HrmSubcompanyDefinedWHERE HrmSubcompanyDefined.delete_type = 0 AND HrmSubcompanyDefined.tenant_key = 't6kj9c07jr' and subcomid = '" + sqdw +"'";
String tenantKey = HrmContextUtil.getCurrentTenantKey();
logger_750b7a22.error("tenantKey = " + tenantKey);
String tablename1 = "hrmsubcompanydefined";
if("t6kj9c07jr".equals(tenantKey)){
tablename1 = "hrmsubcompanydefined";
}else if("tttit1yc38".equals(tenantKey)){//光电
tablename1 = "hrmsubcompanydefined_12";
}else if("tejiddakia".equals(tenantKey)){//华海
tablename1 = "hrmsubcompanydefined_11";
}
sql = "SELECT xxhzj AS xxhzj, xxhzjrdgcl AS xxhzjrdgcl FROM (SELECT t1.*, t2.id AS subcomid FROM eteams.dbo." + tablename1 + " t1 LEFT JOIN eteams.dbo.department t2 ON t1.FORM_DATA_ID = t2.formdata AND t2.delete_type = 0 AND t2.tenant_key = 't6kj9c07jr' WHERE t1.DELETE_TYPE = 0 AND t1.TENANT_KEY = 't6kj9c07jr') HrmSubcompanyDefined WHERE HrmSubcompanyDefined.delete_type = 0 AND HrmSubcompanyDefined.tenant_key = 't6kj9c07jr' and subcomid = '" + sqdw +"'";
String poolname_cq = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
logger_750b7a22.error("sql--" + sql);

11
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java
Unescape Escape View File

@ -107,8 +107,15 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc
// RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
// String sql1 = "select field1 from e10_common.dbo.uf_CustomFlow where field1 = 5 and delete_type = 0";
String sql1 = "select id,field3 from eteams.dbo.hrmemployeedefined where FORM_DATA_ID= '100005650000063120' ";
String tablename = "hrmemployeedefined";
if("t6kj9c07jr".equals(tenantKey)){
tablename = "hrmemployeedefined";
}else if("tttit1yc38".equals(tenantKey)){//光电
tablename = "hrmemployeedefined_12";
}else if("tejiddakia".equals(tenantKey)){//华海
tablename = "hrmemployeedefined_11";
}
String sql1 = "select id,field3 from eteams.dbo." + tablename + " where FORM_DATA_ID= '100005650000063120' ";
// String sql1 = "select field3 from eteams.dbo.hrmemployeedefined where FORM_DATA_ID= '100005650000000052'";
String poolname = CONN_TYPE.hrm.getType();

13
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/Getgsjc_controller.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.weaver.seconddev.interfaces.workflow.controller;
import cn.hutool.json.JSONObject;
import com.weaver.common.base.entity.result.WeaResult;
import com.weaver.common.hrm.util.HrmContextUtil;
import com.weaver.ebuilder.common.util.TenantContext;
import com.weaver.ebuilder.datasource.api.entity.ExecuteSqlEntity;
import com.weaver.ebuilder.datasource.api.enums.SourceType;
@ -38,10 +39,20 @@ public class Getgsjc_controller {
JSONObject json = new JSONObject();
try {
String gsid = null2String(params.get("gsid"));
String tenantKey = HrmContextUtil.getCurrentTenantKey();
log.error("tenantKey = " + tenantKey);
String tablename = "hrmsubcompanydefined";
if("t6kj9c07jr".equals(tenantKey)){
tablename = "hrmsubcompanydefined";
}else if("tttit1yc38".equals(tenantKey)){//光电
tablename = "hrmsubcompanydefined_12";
}else if("tejiddakia".equals(tenantKey)){//华海
tablename = "hrmsubcompanydefined_11";
}
String sql = "SELECT gsjc AS gsjc, gsjcdm AS gsjcdm" +
" FROM (" +
" SELECT t1.*, t2.id AS subcomid" +
" FROM eteams.dbo.hrmsubcompanydefined t1" +
" FROM eteams.dbo." + tablename + " t1" +
" LEFT JOIN eteams.dbo.department t2" +
" ON t1.FORM_DATA_ID = t2.formdata" +
" AND t2.delete_type = 0" +

13
secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/WfUtil.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.weaver.seconddev.njwebservice.util;
import com.weaver.common.hrm.util.HrmContextUtil;
import com.weaver.common.hrm.util.Util;
import com.weaver.common.i18n.tool.util.I18nContextUtil;
import com.weaver.verupgrade.conn.CONN_TYPE;
@ -164,7 +165,17 @@ public class WfUtil {
String poolname = CONN_TYPE.hrm.getType();
rs.setTenantKey(jtzhTenantKey);
String field3 = "";
String sql = "select isnull(field3,'') as field3 from eteams.dbo.employee a,eteams.dbo.hrmemployeedefined b where a.formdata =b.FORM_DATA_ID and a.job_num = '"+workcode+"' AND a.delete_type = 0 AND a.tenant_key = '"+jtzhTenantKey+"' AND b.delete_type = 0 AND b.tenant_key = '"+jtzhTenantKey+"'";
String tenantKey = HrmContextUtil.getCurrentTenantKey();
log.error("tenantKey = " + tenantKey);
String tablename = "hrmemployeedefined";
if("t6kj9c07jr".equals(tenantKey)){
tablename = "hrmemployeedefined";
}else if("tttit1yc38".equals(tenantKey)){//光电
tablename = "hrmemployeedefined_12";
}else if("tejiddakia".equals(tenantKey)){//华海
tablename = "hrmemployeedefined_11";
}
String sql = "select isnull(field3,'') as field3 from eteams.dbo.employee a,eteams.dbo." + tablename + " b where a.formdata =b.FORM_DATA_ID and a.job_num = '"+workcode+"' AND a.delete_type = 0 AND a.tenant_key = '"+jtzhTenantKey+"' AND b.delete_type = 0 AND b.tenant_key = '"+jtzhTenantKey+"'";
rs.executeSql(sql,poolname);
if(rs.next()){
field3 = Util.null2String(rs.getString("field3"));

12
secondev6-jshts/src/main/java/com/weaver/seconddev/cussso/service/CusSSOServiceImpl.java
Unescape Escape View File

@ -275,7 +275,17 @@ public class CusSSOServiceImpl {
private JSONObject getUser(Long employeeId) throws Exception {
log.error("sd6=> getUser() start employeeId：" + employeeId);
String sql = "select emp.id,emp.user_id,b.field3 from {$publicdb}.employee emp inner join {$publicdb}.hrmemployeedefined b on emp.formdata = b.FORM_DATA_ID where emp.id=" + employeeId;
String tenantKey = HrmContextUtil.getCurrentTenantKey();
log.error("tenantKey = " + tenantKey);
String tablename = "hrmemployeedefined";
if("t6kj9c07jr".equals(tenantKey)){
tablename = "hrmemployeedefined";
}else if("tttit1yc38".equals(tenantKey)){//光电
tablename = "hrmemployeedefined_12";
}else if("tejiddakia".equals(tenantKey)){//华海
tablename = "hrmemployeedefined_11";
}
String sql = "select emp.id,emp.user_id,b.field3 from {$publicdb}.employee emp inner join {$publicdb}." + tablename + " b on emp.formdata = b.FORM_DATA_ID where emp.id=" + employeeId;
Map<String, Object> exeMap = dataSetService.executeSql(SourceType.LOGIC, "weaver-ebuilder-form-service", sql, "", new Object[]{});
log.error("sd6=> getUser resMap:" + JSON.toJSONString(exeMap));

Write Preview
Loading…
Cancel
Save