yzt-20250305-问题清单序号995-接口复测问题

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasTzlhtSubmitAction.java

@@ -221,7 +221,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 id,name from e10_core_business.dbo.document as  docimagefile where id = " + idArr[i];
+                        String sql = "select id,name as imagefilename from e10_core_business.dbo.fileobj as  docimagefile where id = " + idArr[i];
                         String poolname_98 = CONN_TYPE.workflow.getType();
                         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
                         rs.executeSql(sql, poolname_98);
@@ -233,7 +233,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
                         fileNames = fileNames.substring(0, fileNames.lastIndexOf(","));
                     }
                 } else if (fileIds != null && !fileIds.equals("")) {
-                    String sql = "select id,name from e10_core_business.dbo.document as  docimagefile where id = " + fileIds;
+                    String sql = "select id,name as imagefilename from e10_core_business.dbo.fileobj as  docimagefile where id = " + fileIds;
                     String poolname_ks = CONN_TYPE.workflow.getType();
                     // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
                     rs.executeSql(sql, poolname_ks);
@@ -245,6 +245,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
                 mJson.put("fileIds", fileIds);
                 // 附件名字
                 mJson.put("fileNames", fileNames);
+                logger_1cc47ce8.error("fileNames2----"+fileNames);
                 String errorMsg = "";
                 logger_1cc47ce8.error(String.valueOf("明细表开始取值"));
                 DetailTable[] detailtable = requestInfo.getDetailTableInfo().getDetailTable();
@@ -397,19 +398,23 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
                 if ("0000".equals(projectCode) && (projectBudget != null && !projectBudget.equals(""))) {
                     requestInfo.getRequestManager().setMessageid("ERROR");
                     requestInfo.getRequestManager().setMessagecontent("项目选择无的时候，项目预算不选！");
+                    return WeaResult.fail(500, "EasTzlhtSubmitAction：项目选择无的时候，项目预算不选！", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
                 } else if (!"0000".equals(projectCode) && (projectBudget == null || projectBudget.equals(""))) {
                     requestInfo.getRequestManager().setMessageid("ERROR");
                     requestInfo.getRequestManager().setMessagecontent("请选择项目预算！");
+                    return WeaResult.fail(500, "EasTzlhtSubmitAction：请选择项目预算！", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
                 } else if ((totalMoney.compareTo(ysje.subtract(oldmoney)) == 1) && !"0000".equals(projectCode)) {
                     // (totalMoney > (ysje-oldmoney))&&!"0000".equals(projectCode)
                     logger_1cc47ce8.error(String.valueOf("预算金额：" + ysje));
                     logger_1cc47ce8.error(String.valueOf("已经使用金额：" + oldmoney));
                     requestInfo.getRequestManager().setMessageid("ERROR");
                     requestInfo.getRequestManager().setMessagecontent("合同金额大于预算可使用金额！");
+                    return WeaResult.fail(500, "EasTzlhtSubmitAction：合同金额大于预算可使用金额！", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
                 } else if (errorMsg != null && !errorMsg.equals("")) {
                     requestInfo.getRequestManager().setMessageid("ERROR");
                     requestInfo.getRequestManager().setMessagecontent(errorMsg);
                     // return  FAILURE_AND_CONTINUE;
+                    return WeaResult.fail(500, "EasTzlhtSubmitAction："+errorMsg, getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestInfo.getRequestManager()));
                 } else {
                     // 调用接口
 //                    EasTzlhtApplyResult mGetResult = new EasTzlhtApplyResult();