From 55af5d7afe703bb8f7ffa97274b5e585519e8265 Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Thu, 13 Mar 2025 14:01:40 +0800 Subject: [PATCH] calyrex 3.13 --- .../workflow/action/ZOA_SL_GWCC_Action.java | 23 +++++++++++-------- .../controller/Getgsjc_controller.java | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java index 18a06da..5ea065e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java @@ -534,13 +534,15 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles // long generate = IdGenerator.generate(); // boolean b = rs.executeSql(sql, poolname_ym, generate); - Long uf_CustomFlow_formId = commonDevUtil.getObjId("chuchai_qingjia_log"); - logger_f5224b91.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId); - Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id - String sql3 = "update e10_common.dbo.chuchai_qingjia_log set requestId = '" + reid + "',gh = '',lbbh='A11',kssj='" + beginDateTime + "',jssj='" + endDateTime + "',message='" + str + "',state='" + hrstate + "',qjss='" + qjss + "' where id = " + recodId + " and delete_type = 0 "; +// Long uf_CustomFlow_formId = commonDevUtil.getObjId("chuchai_qingjia_log"); +// logger_f5224b91.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId); +// Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id +// String sql3 = "update e10_common.dbo.chuchai_qingjia_log set requestId = '" + reid + "',gh = '',lbbh='A11',kssj='" + beginDateTime + "',jssj='" + endDateTime + "',message='" + str + "',state='" + hrstate + "',qjss='" + qjss + "' where id = " + recodId + " and delete_type = 0 "; + long generate = IdGenerator.generate(); + String sql = "insert into e10_common.dbo.chuchai_qingjia_log(id,requestId,gh,lbbh,kssj,jssj,message,state,qjss) values("+generate + ",'" + reid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + qjss + "')"; String poolname_ym = CONN_TYPE.workflow.getType(); - boolean b1 = rs.executeSql(sql3, poolname_ym); - logger_f5224b91.error("sql3 = " + sql3); + boolean b1 = rs.executeSql(sql, poolname_ym); + logger_f5224b91.error("sql3 = " + sql); logger_f5224b91.error("添加 = " + b1); if (applyEmpNum.length() < 10) { // 经办人工号 @@ -788,13 +790,14 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles String[] result = callTravelApply.call(); sta = result[0]; message = result[1]; -// String sql_log = "insert into sync_eas_log(requestId,lcbh,kssj,jssj,sqrq,ccmdd,gh,name,sxrgh,sxrxm,reason,title,sqbm,sqdw,status,message) " + "values('" + reid + "','" + sourceKey + "','" + kssj + "','" + jssj + "','" + sqrq + "','" + attribute8 + "','" + applyEmpNum + "','" + applyerName + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')"; -// logger_f5224b91.error(String.valueOf( "sql_log===" + sql_log)); -// String poolname_05 = CONN_TYPE.workflow.getType(); + String sql_log = "insert into sync_eas_log(requestId,lcbh,kssj,jssj,sqrq,ccmdd,gh,name,sxrgh,sxrxm,reason,title,sqbm,sqdw,status,message) " + "values('" + reid + "','" + sourceKey + "','" + kssj + "','" + jssj + "','" + sqrq + "','" + attribute8 + "','" + applyEmpNum + "','" + applyerName + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')"; + logger_f5224b91.error(String.valueOf( "sql_log===" + sql_log)); + String poolname_05 = CONN_TYPE.workflow.getType(); // /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ // generate = IdGenerator.generate(); -// boolean b1 = rs1.executeSql(sql_log, poolname_05, generate); + boolean b2 = rs1.executeSql(sql_log, poolname_05); + logger_f5224b91.error(String.valueOf("b1:" + b2)); // Long uf_CustomFlow_formId = commonDevUtil.getObjId("sync_eas_log"); // logger_f5224b91.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId); // Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/Getgsjc_controller.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/Getgsjc_controller.java index 0b91b85..a87d24b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/Getgsjc_controller.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/Getgsjc_controller.java @@ -27,7 +27,7 @@ import java.util.Map; @RestController -@RequestMapping("/api/secondev/htjt/ars/getcheck") +@RequestMapping("/api/secondev/workflow/controller") @WeaPermission(publicPermission = true) @Slf4j public class Getgsjc_controller {