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 96ce592..a28d6a6 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 @@ -279,10 +279,11 @@ public class BillFieldUtil { String poolname_vp = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源 - String sql = "select job_num from employee as HrmResource where id = " + hrid; + String sql = "select job_num from eteams.dbo.employee as HrmResource where id = " + hrid; + logger_6c507bbc.info("sql----------- " + sql); rs.executeSql(sql, poolname_vp); if (rs.next()) { - code = Util.null2String(rs.getString("workcode")); + code = Util.null2String(rs.getString("job_num")); } logger_6c507bbc.info("code----------- " + code); return code; @@ -293,8 +294,6 @@ public class BillFieldUtil { * @param hrid * @return */ - - // TODO custom 问题sql public String getCredentialsNumber(String hrid) { logger_6c507bbc.info("BillFieldUtil getCredentialsNumber start "); logger_6c507bbc.info("hrid----------- " + hrid); @@ -302,8 +301,25 @@ public class BillFieldUtil { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_2s = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源 - String sql = "select id_no from employee as HrmResource where id = " + hrid; - rs.executeSql(sql, poolname_2s); + String sql = "SELECT HrmResource.id_no AS certificatenum " + + "FROM ( " + + " SELECT employee.*, hr_userinfo.id_no " + + " FROM eteams.dbo.employee " + + " LEFT JOIN e10_other_business.dbo.hr_userinfo " + + " ON employee.id = hr_userinfo.[user] " + + " AND employee.delete_type = 0 " + + " AND employee.tenant_key = 't6kj9c07jr' " + + " AND hr_userinfo.delete_type = 0 " + + " AND hr_userinfo.tenant_key = 't6kj9c07jr' " + + ") HrmResource " + + " WHERE HrmResource.id = '" + hrid + + "' AND HrmResource.delete_type = 0 " + + " AND HrmResource.tenant_key = 't6kj9c07jr' " ; + + logger_6c507bbc.info("sql----------- " + sql); + boolean b1 = rs.executeSql(sql, poolname_2s); + logger_6c507bbc.info("getCredentialsNumber flag----------- " + b1); + if (rs.next()) { code = Util.null2String(rs.getString("certificatenum")); } @@ -324,10 +340,12 @@ public class BillFieldUtil { String poolname_p1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源 String sql = "select fullname from eteams.dbo.department as HrmDepartment where id = " + dpid; - rs.executeSql(sql, poolname_p1); + logger_6c507bbc.info("sql----------- " + sql); + boolean b1 = rs.executeSql(sql, poolname_p1); + logger_6c507bbc.info("getDepartmentname----------- " + b1); if (rs.next()) { - dpname = Util.null2String(rs.getString("departmentname")); + dpname = Util.null2String(rs.getString("fullname")); } logger_6c507bbc.info("dpname----------- " + dpname); return dpname; @@ -347,11 +365,14 @@ public class BillFieldUtil { // TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源 String sql ="SELECT id , name " + "FROM eteams.dbo.department HrmSubCompany " + - "WHERE id = "+spid+"and HrmSubCompany.virtualid = 1 " + + "WHERE id = '"+spid+"' and HrmSubCompany.virtualid = 1 " + " AND HrmSubCompany.type = 'subcompany' " + " AND HrmSubCompany.delete_type = 0 " + " AND HrmSubCompany.tenant_key = 't6kj9c07jr'"; - rs.executeSql(sql, poolname_tg); + + logger_6c507bbc.info("sql----------- " + sql); + boolean b1 = rs.executeSql(sql, poolname_tg); + logger_6c507bbc.info("getSubcompanyname----------- " + b1); if (rs.next()) { spname = Util.null2String(rs.getString("name")); } @@ -521,7 +542,12 @@ public class BillFieldUtil { String poolname_s2 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源,默认使用流程源,单体客户无需修改,微服务/组合客户需根据查询表所属服务切换源,或使用外部数据源 logger_6c507bbc.info("getName --" + hrid); - rs.executeSql("select username from eteams.dbo.employee as HrmResource where id = " + hrid, poolname_s2); + String sql = "select username from eteams.dbo.employee as HrmResource where id = " + hrid; + + logger_6c507bbc.info("sql----------- " + sql); + boolean b1 = rs.executeSql(sql, poolname_s2); + logger_6c507bbc.info("getName ----------- " + b1); + if (rs.next()) { code = Util.null2String(rs.getString("username")); }