From c1f36a7ebfdedd4a410d7619d7781a2db792a274 Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Thu, 16 Jan 2025 11:20:21 +0800 Subject: [PATCH] 80 files update --- .../interfaces/htjt/workflow/hr/HrUtil.java | 34 +++++++++---------- .../interfaces/swfa/BillFieldUtil.java | 6 ++-- .../action/ARSPaymentRecepitAction.java | 2 +- .../action/EasQuerySourceBoeNumAction.java | 2 +- .../workflow/action/EasTzlhtSubmitAction.java | 12 +++---- .../workflow/action/EasTzlhtSyncAction.java | 12 +++---- .../action/EasYszxfpApplyResultAction.java | 2 +- .../action/ZOA_FI_VENDOR_MAINTAIN_ACTION.java | 4 +-- .../ZOA_FI_VENDOR_MAINTAIN_CONTROLLER.java | 2 +- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/workflow/hr/HrUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/workflow/hr/HrUtil.java index cd742f7..1d35e29 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/workflow/hr/HrUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/workflow/hr/HrUtil.java @@ -32,22 +32,22 @@ public class HrUtil { return expiredDate; } - public String getQjlbGuid(String qjlb) { - String guid = ""; - if (!"".equals(qjlb)) { - // TODO 有参构造 :new RecordSetDataSource("hr") 实例化方式改变,请检查是否有对应有参实现 -// RecordSetDataSource rsd = I18nContextUtil.getBean(RecordSetDataSource.class).setPoolname("hr"); - RecordSet rsd = I18nContextUtil.getBean(RecordSet.class); - String sql = "select classGUID from ht_ATDATTENDANCECLASS where id=" + qjlb; - String poolname = ""; - // TODO E10必须指定poolname数据源 - rsd.executeSql(sql, "hr"); - if (rsd.next()) { - guid = Util.null2String(rsd.getString("classGUID")); - } - } - return guid; - } +// public String getQjlbGuid(String qjlb) { +// String guid = ""; +// if (!"".equals(qjlb)) { +// // TODO 有参构造 :new RecordSetDataSource("hr") 实例化方式改变,请检查是否有对应有参实现 +//// RecordSetDataSource rsd = I18nContextUtil.getBean(RecordSetDataSource.class).setPoolname("hr"); +// RecordSet rsd = I18nContextUtil.getBean(RecordSet.class); +// String sql = "select classGUID from ht_ATDATTENDANCECLASS where id=" + qjlb; +// String poolname = ""; +// // TODO E10必须指定poolname数据源 +// rsd.executeSql(sql, "hr"); +// if (rsd.next()) { +// guid = Util.null2String(rsd.getString("classGUID")); +// } +// } +// return guid; +// } /** * 获取hr系统配置 @@ -58,7 +58,7 @@ public class HrUtil { Map xtpz = new HashMap<>(); try { String field3 = ""; - String sql = "select b.field3 from eteams.dbo.employee a,eteams.dbo.hrmemployeedefined b where a.formdata = b.FORM_DATA_ID and scopeid=-1 and a.workcode='" + gh + "'"; + 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 + "'"; logger_3cf7b2d9.info("sql--" + sql); String poolname_2v = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java index 55b6bdc..35e50b6 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java @@ -264,7 +264,7 @@ public class BillFieldUtil { String poolname_vp = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "select job_num from eteams.dbo.employee as HrmResource where id = " + hrid; + String sql = "select id,job_num from eteams.dbo.employee as HrmResource where id = " + hrid; logger_6c507bbc.info("sql----------- " + sql); rs.executeSql(sql, poolname_vp); if (rs.next()) { @@ -324,7 +324,7 @@ public class BillFieldUtil { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_p1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "select fullname from eteams.dbo.department as HrmDepartment where id = " + dpid; + String sql = "select id,fullname from eteams.dbo.department as HrmDepartment where id = " + dpid; logger_6c507bbc.info("sql----------- " + sql); boolean b1 = rs.executeSql(sql, poolname_p1); logger_6c507bbc.info("getDepartmentname----------- " + b1); @@ -527,7 +527,7 @@ public class BillFieldUtil { String poolname_s2 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 logger_6c507bbc.info("getName --" + hrid); - String sql = "select username from eteams.dbo.employee as HrmResource where id = " + hrid; + String sql = "select id,username from eteams.dbo.employee as HrmResource where id = " + hrid; logger_6c507bbc.info("sql----------- " + sql); boolean b1 = rs.executeSql(sql, poolname_s2); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java index 66649c3..d9ffe5d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java @@ -92,7 +92,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ String currencyCode = ""; String poolname = CONN_TYPE.ebuilder.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "select currencyCode from e10_common.dbo.uf_eas_currency where id=" + map.get("BZ"); + String sql = "select id,currencyCode from e10_common.dbo.uf_eas_currency where id=" + map.get("BZ"); logger_c29b3679.info( "sql--" + sql) ; boolean b1 = rs.executeSql(sql, poolname); logger_c29b3679.info( "sql flag = " + b1) ; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java index b71e04a..d9e0c15 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java @@ -203,7 +203,7 @@ public class EasQuerySourceBoeNumAction extends BaseBean implements Action, EsbS } else { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); for (int n = 0; n < gysidArray.length; n++) { - String sql = "select oid from e10_common.dbo.uf_eas_vendor v INNER JOIN uf_eas_company c on v.companyId=c.oid where v.vendorId='" + gysidArray[n] + "'"; + String sql = "select v.id,oid from e10_common.dbo.uf_eas_vendor v INNER JOIN uf_eas_company c on v.companyId=c.oid where v.vendorId='" + gysidArray[n] + "'"; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSubmitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSubmitAction.java index aab526e..ff03263 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSubmitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSubmitAction.java @@ -201,14 +201,14 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select bzzje from e10_core_business.dbo.formtable_main_2605 where lcbh !='' and relationProjectId = " + projectBudget, poolname); + rs.executeSql("select id,bzzje from e10_core_business.dbo.formtable_main_2605 where lcbh !='' and relationProjectId = " + projectBudget, poolname); if (rs.next()) { oldmoney = oldmoney.add(new BigDecimal(Util.null2String(rs.getString("bzzje")))); } RecordSet rs2 = I18nContextUtil.getBean(RecordSet.class); String poolname_j5 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs2.executeSql("select useAmount from e10_common.dbo.uf_eas_budget where relationProjectId = " + projectBudget, poolname_j5); + rs2.executeSql("select id,useAmount from e10_common.dbo.uf_eas_budget where relationProjectId = " + projectBudget, poolname_j5); if (rs2.next()) { ysje = new BigDecimal(Util.null2String(rs2.getString("useAmount"))); } @@ -219,7 +219,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl if (fileIds != null && fileIds.contains(",")) { String[] idArr = fileIds.split(","); for (int i = 0; i < idArr.length; i++) { - String sql = "select imagefilename from document_main_access as docimagefile where docid = " + idArr[i]; + String sql = "select id,name from e10_core_business.dbo.document as docimagefile where id = " + idArr[i]; String poolname_98 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_98); @@ -231,7 +231,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl fileNames = fileNames.substring(0, fileNames.lastIndexOf(",")); } } else if (fileIds != null && !fileIds.equals("")) { - String sql = "select imagefilename from document_main_access as docimagefile where docid = " + fileIds; + String sql = "select id,name from e10_core_business.dbo.document as docimagefile where id = " + fileIds; String poolname_ks = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 rs.executeSql(sql, poolname_ks); @@ -463,7 +463,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_du = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - var3.executeSql("select oid from e10_common.dbo.uf_eas_company where id = " + var1, poolname_du); + var3.executeSql("select id,oid from e10_common.dbo.uf_eas_company where id = " + var1, poolname_du); if (var3.next()) { var2 = Util.null2String(var3.getString("oid")); } @@ -475,7 +475,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_0g = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - var3.executeSql("select companyname from e10_common.dbo.uf_eas_company where id = " + var1, poolname_0g); + var3.executeSql("select id,companyname from e10_common.dbo.uf_eas_company where id = " + var1, poolname_0g); if (var3.next()) { var2 = Util.null2String(var3.getString("companyname")); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSyncAction.java index df5653f..b00c528 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSyncAction.java @@ -180,7 +180,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles if (fileIds != null && fileIds.contains(",")) { String[] idArr = fileIds.split(","); for (int i = 0; i < idArr.length; i++) { - String sql = "select imagefilename from e10_common.dbo.document_main_access as docimagefile where docid = " + idArr[i]; + String sql = "select id,name from e10_core_business.dbo.document as docimagefile where id = " + idArr[i]; String poolname_s7 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname_s7); @@ -193,7 +193,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles fileNames = fileNames.substring(0, fileNames.lastIndexOf(",")); } } else if (fileIds != null && !fileIds.equals("")) { - String sql = "select imagefilename from e10_common.dbo.document_main_access as docimagefile where docid = " + fileIds; + String sql = "select id,name from e10_core_business.dbo.document as docimagefile where id = " + fileIds; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); @@ -346,7 +346,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_kp = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = var3.executeSql("select companycode from e10_common.dbo.uf_eas_company where id = " + var1, poolname_kp); + boolean b = var3.executeSql("select id,companycode from e10_common.dbo.uf_eas_company where id = " + var1, poolname_kp); if (!b) { logger_197dffab.info(String.valueOf("查询公司信息失败！")); } @@ -361,7 +361,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_vt = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = var3.executeSql("select oid from e10_common.dbo.uf_eas_company where id = " + var1, poolname_vt); + boolean b = var3.executeSql("select id,oid from e10_common.dbo.uf_eas_company where id = " + var1, poolname_vt); if (!b) { logger_197dffab.info(String.valueOf("查询公司信息失败！")); } @@ -376,7 +376,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_jy = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = var3.executeSql("select companyname from e10_common.dbo.uf_eas_company where id = " + var1, poolname_jy); + boolean b = var3.executeSql("select id,companyname from e10_common.dbo.uf_eas_company where id = " + var1, poolname_jy); if (!b) { logger_197dffab.info(String.valueOf("获取公司名称失败！")); } @@ -391,7 +391,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles RecordSet var3 = I18nContextUtil.getBean(RecordSet.class); String poolname_bg = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = var3.executeSql("select code from eteams.dbo.department as HrmDepartment where id = " + var1, poolname_bg); + boolean b = var3.executeSql("select id,code from eteams.dbo.department as HrmDepartment where id = " + var1, poolname_bg); if (!b) { logger_197dffab.info(String.valueOf("获取部门代码失败！")); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java index 10de93e..bd85d08 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java @@ -63,7 +63,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS String wfid = requestInfo.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = requestInfo.getRequestManager().getBillTableName(); - String sql = "select sfdy from e10_core_business.dbo." + tablename + " where id =" + requestID; + String sql = "select id,sfdy from e10_core_business.dbo." + tablename + " where id =" + requestID; logger_59285be7.info("sql == " +sql); String poolname_l4 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_ACTION.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_ACTION.java index 3abe7e9..db62bbd 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_ACTION.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_ACTION.java @@ -197,7 +197,7 @@ public class ZOA_FI_VENDOR_MAINTAIN_ACTION implements EsbServerlessRpcRemoteInte */ private String getDepartmentname(String deptid){ // 构造SQL查询语句，根据部门ID查询部门名称 - String sql = "select name from eteams.dbo.department where id = " + deptid; + String sql = "select id,name from eteams.dbo.department where id = " + deptid; // 记录查询语句日志 logger_d39bef7.info("getDepartmentname sql--" + sql); // 创建RecordSet对象用于执行SQL查询 @@ -224,7 +224,7 @@ public class ZOA_FI_VENDOR_MAINTAIN_ACTION implements EsbServerlessRpcRemoteInte */ private String getJobTitlesname(String jobid){ // 构造SQL查询语句，用于从数据库中获取指定职位ID的名称 - String sql = "select name from eteams.dbo.position where id = " + jobid; + String sql = "select id,name from eteams.dbo.position where id = " + jobid; // 记录查询语句的日志信息 logger_d39bef7.info("getJobTitlesname sql--" + sql); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_FI_VENDOR_MAINTAIN_CONTROLLER.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_FI_VENDOR_MAINTAIN_CONTROLLER.java index ba5421b..66c2901 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_FI_VENDOR_MAINTAIN_CONTROLLER.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_FI_VENDOR_MAINTAIN_CONTROLLER.java @@ -234,7 +234,7 @@ public class ZOA_FI_VENDOR_MAINTAIN_CONTROLLER { */ private String getDepartmentname(String deptid){ // 构造SQL查询语句，根据部门ID查询部门名称 - String sql = "select name from eteams.dbo.department where id = " + deptid; + String sql = "select id,name from eteams.dbo.department where id = " + deptid; // 记录查询语句日志 log.info("getDepartmentname sql--" + sql); // 创建RecordSet对象用于执行SQL查询