From 9223ccab7d2a20e41de12f195bb93a84fd38a1ef Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Tue, 17 Dec 2024 17:29:35 +0800 Subject: [PATCH] BillFieldUtil EasDoPayControlAction update --- .../seconddev/interfaces/swfa/BillFieldUtil.java | 12 ++++++------ .../workflow/action/EasDoPayControlAction.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) 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 8709e6c..6c6e26f 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 @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory; import com.weaver.verupgrade.conn.RecordSet; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; +import org.springframework.stereotype.Component; /** * 字段名称工具类 @@ -18,6 +19,7 @@ import com.weaver.verupgrade.general.Util; * @author ocean * @date 2013-6-20 下午6:40:46 */ +@Component public class BillFieldUtil { private static final org.slf4j.Logger logger_6c507bbc = LoggerFactory.getLogger(BillFieldUtil.class); @@ -26,7 +28,6 @@ public class BillFieldUtil { * 方法描述 : 获取字段的ID 创建者：ocean 项目名称： ecologyTest 类名： CwUtil.java 版本： v1.0 创建时间： * 2013-9-14 下午3:05:53 * - * @param workFlowId * 流程id * @param num * 明细表 @@ -107,8 +108,6 @@ public class BillFieldUtil { /** * 通过数据库字段名获取选择框 显示名 * - * @param val - * @param id * @return */ public static String getselectNameByCol(String fieldname, String workflowid, String selectvalue) { @@ -402,7 +401,6 @@ public class BillFieldUtil { /** * 根据工号获取ID * @param workcode - * @param map 所有人员 工号和ID的map * @return */ public Map getIdsByWorkcode(String workcode) { @@ -450,10 +448,12 @@ public class BillFieldUtil { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_s2 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select username from employee as HrmResource where id = " + hrid, poolname_s2); + logger_6c507bbc.info("getName --" + hrid); + rs.executeSql("select username from eteams.dbo.employee as HrmResource where id = " + hrid, poolname_s2); if (rs.next()) { - code = Util.null2String(rs.getString("lastname")); + code = Util.null2String(rs.getString("username")); } + logger_6c507bbc.info("code --" + code); return code; } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasDoPayControlAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasDoPayControlAction.java index 6476af9..e71dedc 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasDoPayControlAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasDoPayControlAction.java @@ -174,19 +174,19 @@ public class EasDoPayControlAction extends BaseBean implements Action, EsbServer if (!"S".equals(status)) { request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent(msg); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager())); } } catch (Exception e) { logger_6cdff8ae.info(String.valueOf("error : " + e.getMessage())); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent(e.getMessage()); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_6cdff8ae.error("EasDoPayControlAction e: {}", e.getMessage()); - return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager())); + return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager())); } }