diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java index 7f60b8d..2a57691 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BY_EnterToJhrwMx.java @@ -70,8 +70,6 @@ public class BY_EnterToJhrwMx implements Action, EsbServerlessRpcRemoteInterface long generate = IdGenerator.generate(); rs.executeSql(sql, poolname,generate); - - // 写入流程提醒记录 String sql4 = "insert into e10_common.dbo.jhrwmxlog(id,mainid,rwbh,lcbid,zkjh,gzrw,zrr,jxzb,ts,ksrq,jsrq,yqrq,phr,ddr,qrr,csr,pid,glid,mxid,isdr,rwzt,requestid,request,rwbh2,lxsj,tdsj,rwlx,xmkp,yhry,rwjb,shr,jtyq,tbr,rbbm,ssgs,rwsm,fj,yfjd,xmbh,FtriggerFlag) (select id,mainid,rwbh,lcbid,zkjh,gzrw,zrr,jxzb,ts,ksrq,jsrq,yqrq,phr,ddr,qrr,csr,pid,glid,mxid,isdr,rwzt,0 as requestid,requestid as request,rwbh2,lxsj,tdsj,rwlx,xmkp,yhry,rwjb,shr,jtyq,tbr,rbbm,ssgs,rwsm,fj,yfjd,xmbh,0 as FtriggerFlag from jhrwmx where mxid<>0 and ISDR=0 AND cast(glid as varchar) = '" + glid + "') order by rwbh "; logger_b053f378.info("sql4:" + sql4); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java index 088b217..95627e1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java @@ -8,9 +8,14 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.hrm.util.HrmContextUtil; +import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService; +import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.seconddev.interfaces.htjt.util.LogUtil; import com.weaver.seconddev.interfaces.htjt.util.WebApi; import com.weaver.seconddev.interfaces.htjt.workflow.hr.HrUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; +import com.weaver.teams.domain.user.SimpleEmployee; import org.apache.axis.client.Call; import org.apache.axis.client.Service; import org.apache.commons.logging.Log; @@ -48,6 +53,12 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer private static final Logger logger_fee0cda9 = LoggerFactory.getLogger(ChuChaiShenQingNewAction.class); + @Autowired + private CommonDevUtil commonDevUtil; + + @RpcReference(group = "ebuilderform") + private EbFormDataDubboService ebFormDataDubboService; + public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); @@ -224,13 +235,22 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer if (str.length() > 150) { str = str.substring(0, 150); } - String sql = "insert into e10_common.dbo.chuchai_qingjia_log(id, requestId,gh,lbbh,kssj,jssj,message,state,qjss) values(? , '" + requestid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + QJSS + "')"; - String poolname_bv = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - - rs.executeSql(sql, poolname_bv,generate); +// String sql = "insert into e10_common.dbo.chuchai_qingjia_log(id, requestId,gh,lbbh,kssj,jssj,message,state,qjss) values(? , '" + requestid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + QJSS + "')"; +// String poolname_bv = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// +// rs.executeSql(sql, poolname_bv,generate); + Long uf_CustomFlow_formId1 = commonDevUtil.getObjId("chuchai_qingjia_log"); + logger_fee0cda9.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId1); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId1, currentEmployee); + String poolname1 = CONN_TYPE.workflow.getType(); + String sql = "update e10_common.dbo.sync_eas_log set requestId = '" + requestid + "',gh = '',lbbh='A11',kssj='" + beginDateTime + "',jssj='" + endDateTime + "',message='" + str + "',state='" + hrstate + "',qjss='" + QJSS + "' where id = " + recodId; + boolean b1 = rs.executeSql(sql, poolname1); + logger_fee0cda9.info(String.valueOf("sql2:" + sql)); + logger_fee0cda9.info(String.valueOf("b1:" + b1)); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java index 84a208c..598bb8e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java @@ -8,6 +8,11 @@ import java.util.HashMap; import java.util.Map; import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.hrm.util.HrmContextUtil; +import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService; +import com.weaver.framework.rpc.annotation.RpcReference; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; +import com.weaver.teams.domain.user.SimpleEmployee; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -28,6 +33,7 @@ import com.weaver.verupgrade.workflow.webservices.WorkflowRequestTableField; import com.weaver.verupgrade.workflow.webservices.WorkflowRequestTableRecord; import com.weaver.verupgrade.workflow.webservices.WorkflowServiceImpl; import com.weaver.verupgrade.general.BaseBean; +import org.springframework.beans.factory.annotation.Autowired; public class DoTheAction { @@ -35,6 +41,12 @@ public class DoTheAction { private Log log = LogFactory.getLog(DoTheAction.class.getName()); + @Autowired + private CommonDevUtil commonDevUtil; + + @RpcReference(group = "ebuilderform") + private EbFormDataDubboService ebFormDataDubboService; + public boolean doAction(RequestInfo paramRequestInfo, int actionType) throws Exception { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); @@ -376,13 +388,22 @@ public class DoTheAction { remark = remark.replace(" ", ""); remark = remark.replace("'", "''"); if (!"".equals(remark) || !"".equals(fjid)) { - String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "审批'" + ")"; - String poolname_cs = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs2.executeSql(sql1, poolname_cs,generate); - logger_7213d31d.info("sql1:" + sql1); +// String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "审批'" + ")"; +// String poolname_cs = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs2.executeSql(sql1, poolname_cs,generate); +// logger_7213d31d.info("sql1:" + sql1); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); + logger_7213d31d.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql3 = "update e10_common.dbo.By_Worktaskfankui set worktaskid='" + mxid + "',begindate=" + " '" + currDate + "',Begintime=" + " '" + currTime + "',resourceid=" + " '" + userid + "',description=" + " '" + remark + "',Createrid=" + " '" + userid + "',Requestid=" + " '" + requestid + "',fj=" + " '" + fjid + "',title=" + " '" + fklx + "审批' " + " where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs2.executeSql(sql3, poolname); + logger_7213d31d.info("sql3 = " + sql3); + logger_7213d31d.info("添加 = " + b1); if (!fjid.equals("")) { logger_7213d31d.info("SET_WD_QX:"); SET_WD_QX(fjid, mxid); @@ -414,12 +435,21 @@ public class DoTheAction { String date = Util.null2String(rs1.getString("operatedate")); String time = Util.null2String(rs1.getString("operatetime")); String userid = Util.null2String(rs1.getString("operator")); - String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + date + "'," + "'" + time + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; - String poolname_c1_ps = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs2.executeSql(sql1, poolname_c1_ps,generate); +// String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + date + "'," + "'" + time + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; +// String poolname_c1_ps = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs2.executeSql(sql1, poolname_c1_ps,generate); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); + logger_7213d31d.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql3 = "update e10_common.dbo.By_Worktaskfankui set worktaskid='" + mxid + "',begindate=" + " '" + date + "',Begintime=" + " '" + time + "',resourceid=" + " '" + userid + "',description=" + " '" + remark + "',Createrid=" + " '" + userid + "',Requestid=" + " '" + requestid + "',fj=" + " '" + fjid + "',title=" + " '" +fklx + "签字意见' " + " where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs2.executeSql(sql3, poolname); + logger_7213d31d.info("sql3 = " + sql3); + logger_7213d31d.info("添加 = " + b1); } Calendar cal = Calendar.getInstance(); String currDate = Util.add0(cal.get(1), 4) + "-" + Util.add0(cal.get(2) + 1, 2) + "-" + Util.add0(cal.get(5), 2); @@ -428,12 +458,21 @@ public class DoTheAction { remark = remark.replace(" ", ""); String fjid = ""; String userid = paramRequestInfo.getLastoperator(); - String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; - String poolname_0l = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs2.executeSql(sql1, poolname_0l,generate); +// String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; +// String poolname_0l = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs2.executeSql(sql1, poolname_0l,generate); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); + logger_7213d31d.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql3 = "update e10_common.dbo.By_Worktaskfankui set worktaskid='" + mxid + "',begindate=" + " '" + currDate + "',Begintime=" + " '" + currTime + "',resourceid=" + " '" + userid + "',description=" + " '" + remark + "',Createrid=" + " '" + userid + "',Requestid=" + " '" + requestid + "',fj=" + " '" + fjid + "',title="+ " '" + fklx + "签字意见' " + " where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs2.executeSql(sql3, poolname); + logger_7213d31d.info("sql3 = " + sql3); + logger_7213d31d.info("添加 = " + b1); } public void xrfksj(Map mainMap, String fklx, RequestInfo paramRequestInfo) throws Exception { @@ -447,14 +486,21 @@ public class DoTheAction { String currTime = Util.add0(cal.getTime().getHours(), 2) + ":" + Util.add0(cal.getTime().getMinutes(), 2); /* TODO 返回值:sql1 类型发生变化 e9类型:int e10类型:long TODO 返回值:sql1 类型发生变化 e9类型:int e10类型:long*/ - String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + fksm + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + requestid + "'," + "'" + fj + "'," + "'" + fklx + "'" + ")"; - String poolname_9g = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs.executeSql(sql1, poolname_9g,generate); - logger_7213d31d.info("sql1:" + sql1); - logger_7213d31d.info("SET_WD_QX:"); +// String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + fksm + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + requestid + "'," + "'" + fj + "'," + "'" + fklx + "'" + ")"; +// String poolname_9g = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs.executeSql(sql1, poolname_9g,generate); +// logger_7213d31d.info("sql1:" + sql1); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql3 = "update e10_common.dbo.By_Worktaskfankui set worktaskid='" + mxid + "',begindate=" + " '" + currDate + "',Begintime=" + " '" + currTime + "',resourceid=" + " '" + paramRequestInfo.getRequestManager().getCreater() + "',description=" + " '" + fksm + "',Createrid=" + " '" + paramRequestInfo.getRequestManager().getCreater() + "',Requestid=" + "'" + requestid + "',fj=" + " '" + fj + "',title=" + " '" + fklx + "签字意见' " + " where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger_7213d31d.info("sql3 = " + sql3); + logger_7213d31d.info("添加 = " + b1); if (!fj.equals("")) { SET_WD_QX(fj, mxid); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java index 7829da5..b0533d1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java @@ -8,6 +8,11 @@ import java.util.HashMap; import java.util.Map; import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.hrm.util.HrmContextUtil; +import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService; +import com.weaver.framework.rpc.annotation.RpcReference; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; +import com.weaver.teams.domain.user.SimpleEmployee; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -26,6 +31,7 @@ import com.weaver.verupgrade.workflow.webservices.WorkflowRequestInfo; import com.weaver.verupgrade.workflow.webservices.WorkflowRequestTableField; import com.weaver.verupgrade.workflow.webservices.WorkflowRequestTableRecord; import com.weaver.verupgrade.workflow.webservices.WorkflowServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; public class DoTheActionNew { @@ -33,6 +39,12 @@ public class DoTheActionNew { private Log log = LogFactory.getLog(DoTheActionNew.class.getName()); + @Autowired + private CommonDevUtil commonDevUtil; + + @RpcReference(group = "ebuilderform") + private EbFormDataDubboService ebFormDataDubboService; + public boolean doAction(RequestInfo paramRequestInfo, int actionType) throws Exception { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String workflowid = paramRequestInfo.getWorkflowid(); @@ -104,9 +116,20 @@ public class DoTheActionNew { array[9] = qrr; array[10] = tbr; // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String poolname =""; - String sql = "insert into dbo.uf_zqjhrqfkxx (requestId,fksm,fj,fkrq,pid,zrr,ddr,csr,phr,qrr,formmodeid,modedatacreater) values (?,?,?,?,?,?,?,?,?,?,97,?)"; - rs.executeSql(sql, false, poolname, array); +// String sql = "insert into dbo.uf_zqjhrqfkxx (requestId,fksm,fj,fkrq,pid,zrr,ddr,csr,phr,qrr,formmodeid,modedatacreater) values (?,?,?,?,?,?,?,?,?,?,97,?)"; +// rs.executeSql(sql, false, poolname, array); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); + logger_5105ad43.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql = "update 10_common.dbo.uf_zqjhrqfkxx set requestId='" + array[0]+"',fksm='"+ array[1]+"',fj='"+ array[2]+"',fkrq='"+ array[3]+"',pid='"+ array[4]+"',zrr='"+ array[5]+"',ddr='"+ array[6]+"',csr='"+ array[7]+"',phr='"+ array[8]+"',qrr='"+ array[9]+"',formmodeid='97',modedatacreater='"+array[10]+"' where id = " + recodId + " and delete_type = 0 "; + boolean b = rs.executeSql(sql, poolname); + if (b) { + logger_5105ad43.info("添加反馈信息成功"); + } else { + logger_5105ad43.info("添加反馈信息失败"); + } String sql2 = "select * from uf_zqjhrqfkxx where pid = " + mxid; RecordSet rs3 = I18nContextUtil.getBean(RecordSet.class); ModeRightInfo info = I18nContextUtil.getBean(ModeRightInfo.class); @@ -421,13 +444,22 @@ public class DoTheActionNew { remark = remark.replace(" ", ""); remark = remark.replace("'", "''"); if (!"".equals(remark) || !"".equals(fjid)) { - String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "审批'" + ")"; - String poolname_yt = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs2.executeSql(sql1, poolname_yt,generate); - logger_5105ad43.info("sql1:" + sql1); +// String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "审批'" + ")"; +// String poolname_yt = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs2.executeSql(sql1, poolname_yt,generate); +// logger_5105ad43.info("sql1:" + sql1); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); + logger_5105ad43.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql3 = "update e10_common.dbo.By_Worktaskfankui set worktaskid='" + mxid + "',begindate=" + " '" + currDate + "',Begintime=" + " '" + currTime + "',resourceid=" + " '" + userid + "',description=" + " '" + remark + "',Createrid=" + " '" + userid + "',Requestid=" + " '" + requestid + "',fj=" + " '" + fjid + "',title="+ " '" + fklx + "审批' " + " where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs2.executeSql(sql3, poolname); + logger_5105ad43.info("sql3 = " + sql3); + logger_5105ad43.info("添加 = " + b1); if (!fjid.equals("")) { logger_5105ad43.info("SET_WD_QX:"); SET_WD_QX(fjid, mxid); @@ -459,12 +491,21 @@ public class DoTheActionNew { String date = Util.null2String(rs1.getString("operatedate")); String time = Util.null2String(rs1.getString("operatetime")); String userid = Util.null2String(rs1.getString("operator")); - String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + date + "'," + "'" + time + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; - String poolname_j4 = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs2.executeSql(sql1, poolname_j4,generate); +// String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + date + "'," + "'" + time + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; +// String poolname_j4 = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs2.executeSql(sql1, poolname_j4,generate); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); + logger_5105ad43.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql3 = "update e10_common.dbo.By_Worktaskfankui set worktaskid='" + mxid + "',begindate=" + " '" + date + "',Begintime=" + " '" + time + "',resourceid=" + " '" + userid + "',description=" + " '" + remark + "',Createrid=" + " '" + userid + "',Requestid=" + " '" + requestid + "',fj=" + " '" + fjid + "',title="+ " '" +fklx + "签字意见' " + " where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs2.executeSql(sql3, poolname); + logger_5105ad43.info("sql3 = " + sql3); + logger_5105ad43.info("添加 = " + b1); } Calendar cal = Calendar.getInstance(); String currDate = Util.add0(cal.get(1), 4) + "-" + Util.add0(cal.get(2) + 1, 2) + "-" + Util.add0(cal.get(5), 2); @@ -473,12 +514,21 @@ public class DoTheActionNew { remark = remark.replace(" ", ""); String fjid = ""; String userid = paramRequestInfo.getLastoperator(); - String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; - String poolname_j5 = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs2.executeSql(sql1, poolname_j5,generate); +// String sql1 = "insert into By_Worktaskfankui(id,worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values(By_Worktaskfankuid.Nextval,'" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + userid + "'," + "'" + remark + "'," + "'" + userid + "'," + "'" + requestid + "'," + "'" + fjid + "'," + "'" + fklx + "签字意见'" + ")"; +// String poolname_j5 = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs2.executeSql(sql1, poolname_j5,generate); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); + logger_5105ad43.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql3 = "update e10_common.dbo.By_Worktaskfankui set worktaskid='" + mxid + "',begindate=" + " '" + currDate + "',Begintime=" + " '" + currTime + "',resourceid=" + " '" + userid + "',description=" + " '" + remark + "',Createrid=" + " '" + userid + "',Requestid=" + " '" + requestid + "',fj=" + " '" + fjid + "',title="+ " '" + fklx + "签字意见' " + " where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs2.executeSql(sql3, poolname); + logger_5105ad43.info("sql3 = " + sql3); + logger_5105ad43.info("添加 = " + b1); } public void xrfksj(Map mainMap, String fklx, RequestInfo paramRequestInfo) throws Exception { @@ -492,14 +542,22 @@ public class DoTheActionNew { String currTime = Util.add0(cal.getTime().getHours(), 2) + ":" + Util.add0(cal.getTime().getMinutes(), 2); /* TODO 返回值:sql1 类型发生变化 e9类型:int e10类型:long TODO 返回值:sql1 类型发生变化 e9类型:int e10类型:long*/ - String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + fksm + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + requestid + "'," + "'" + fj + "'," + "'" + fklx + "'" + ")"; - String poolname_ty = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs.executeSql(sql1, poolname_ty,generate); - logger_5105ad43.info("sql1:" + sql1); - logger_5105ad43.info("SET_WD_QX:"); +// String sql1 = "insert into By_Worktaskfankui(worktaskid,begindate,Begintime,resourceid,description,Createrid,Requestid,fj,title) values('" + mxid + "'," + "'" + currDate + "'," + "'" + currTime + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + fksm + "'," + "'" + paramRequestInfo.getRequestManager().getCreater() + "'," + "'" + requestid + "'," + "'" + fj + "'," + "'" + fklx + "'" + ")"; +// String poolname_ty = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs.executeSql(sql1, poolname_ty,generate); +// logger_5105ad43.info("sql1:" + sql1); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("By_Worktaskfankui"); + logger_5105ad43.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql3 = "update e10_common.dbo.By_Worktaskfankui set worktaskid='" + mxid + "',begindate=" + " '" + currDate + "',Begintime=" + " '" + currTime + "',resourceid=" + " '" + paramRequestInfo.getRequestManager().getCreater() + "',description=" + " '" + fksm + "',Createrid=" + " '" + paramRequestInfo.getRequestManager().getCreater() + "',Requestid=" + "'" + requestid + "',fj=" + " '" + fj + "'," + "'" + fklx + "签字意见' " + " where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger_5105ad43.info("sql3 = " + sql3); +// logger_5105ad43.info("SET_WD_QX:"); if (!fj.equals("")) { SET_WD_QX(fj, mxid); } @@ -557,10 +615,10 @@ public class DoTheActionNew { for (int m = 0; m <= List.size() - 1; m++) { if (!List.get(m).equals("")) { logger_5105ad43.info("strarray1[m]:" + List.get(m)); - sql2 = "insert into document_ph_doc_s01(docid,sharetype,seclevel,rolelevel,sharelevel,userid,downloadlevel,roleid,foralluser)values( " + fjid + ",1 , 0, 0 ,1 ," + List.get(m) + ", 0 ,0 , 0)"; - String poolname_1n = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs1.executeSql(sql2, poolname_1n); +// sql2 = "insert into document_ph_doc_s01(docid,sharetype,seclevel,rolelevel,sharelevel,userid,downloadlevel,roleid,foralluser)values( " + fjid + ",1 , 0, 0 ,1 ," + List.get(m) + ", 0 ,0 , 0)"; +// String poolname_1n = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs1.executeSql(sql2, poolname_1n); logger_5105ad43.info("sql2:" + sql2); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java index cb4941e..670ea2e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java @@ -1,7 +1,12 @@ package com.weaver.seconddev.interfaces.workflow.action; import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.hrm.util.HrmContextUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService; +import com.weaver.framework.rpc.annotation.RpcReference; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; +import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.verupgrade.conn.CONN_TYPE; import java.lang.*; import java.util.*; @@ -29,6 +34,12 @@ public class KeyUserAction extends BaseBean implements Action, EsbServerlessRpcR private static final Logger logger_52370ec1 = LoggerFactory.getLogger(KeyUserAction.class); + @Autowired + private CommonDevUtil commonDevUtil; + + @RpcReference(group = "ebuilderform") + private EbFormDataDubboService ebFormDataDubboService; + public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); @@ -90,13 +101,22 @@ public class KeyUserAction extends BaseBean implements Action, EsbServerlessRpcR String[] array = xgjyh.split(","); if (array != null) { for (int i = 0; i < array.length; i++) { - String poolname_91 = CONN_TYPE.workflow.getType(); +// String poolname_91 = CONN_TYPE.workflow.getType(); // String cmd=array[i] + flag + dyjsid + flag + level; /*rs.executeProc("HrmRoleMembers_Insert", cmd); TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_91,generate); +// long generate = IdGenerator.generate(); +// rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_91,generate); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("auth_user_role"); + logger_52370ec1.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql3 = "update e10_common.dbo.auth_user_role set roleid=" + dyjsid + ",resourceid=" + array[i] + ",rolelevel=" + level + ",resourcetype=1 where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger_52370ec1.info("sql3 = " + sql3); + logger_52370ec1.info("添加 = " + b1); } } } @@ -113,13 +133,22 @@ public class KeyUserAction extends BaseBean implements Action, EsbServerlessRpcR String[] array = xgjyh.split(","); if (array != null) { for (int i = 0; i < array.length; i++) { - String poolname_8i = CONN_TYPE.workflow.getType(); - // String cmd=array[i] + flag + dyjsid + flag + level; - /*rs.executeProc("HrmRoleMembers_Insert", cmd); - TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_8i,generate); +// String poolname_8i = CONN_TYPE.workflow.getType(); +// // String cmd=array[i] + flag + dyjsid + flag + level; +// /*rs.executeProc("HrmRoleMembers_Insert", cmd); +// TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_8i,generate); + String poolname = CONN_TYPE.hrm.getType(); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("auth_user_role"); + logger_52370ec1.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql3 = "update e10_common.dbo.auth_user_role set roleid=" + dyjsid + ",resourceid=" + array[i] + ",rolelevel=" + level + ",resourcetype=1 where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger_52370ec1.info("sql3 = " + sql3); + logger_52370ec1.info("添加 = " + b1); } } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java index 1b47e37..bccfbdd 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/QingJiaShenQingAction.java @@ -5,6 +5,11 @@ import java.text.*; import java.util.*; import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.hrm.util.HrmContextUtil; +import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService; +import com.weaver.framework.rpc.annotation.RpcReference; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; +import com.weaver.teams.domain.user.SimpleEmployee; import org.apache.axis.client.Call; import org.apache.axis.client.Service; import org.apache.commons.logging.Log; @@ -41,6 +46,12 @@ public class QingJiaShenQingAction extends BaseBean implements Action, EsbServer private static final Logger logger_13aa9db7 = LoggerFactory.getLogger(QingJiaShenQingAction.class); + @Autowired + private CommonDevUtil commonDevUtil; + + @RpcReference(group = "ebuilderform") + private EbFormDataDubboService ebFormDataDubboService; + /* private Log log = LogFactory.getLog(QingJiaShenQingAction.class.getName()); @@ -194,13 +205,22 @@ public class QingJiaShenQingAction extends BaseBean implements Action, EsbServer state = "S"; } String qjss = QJSS + ""; - String sql = "insert into chuchai_qingjia_log(requestId,gh,lbbh,kssj,jssj,message,state,qjss) values('" + requestid + "','" + GH + "','" + QJLB + "','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + state + "','" + qjss + "')"; - String poolname_t3 = CONN_TYPE.workflow.getType(); - /*String sql = "insert into chuchai_qingjia_log(reqid,gh,lbbh,kssj,jssj,message,state,qjss) values('"+ requestid +"','"+ GH +"','"+QJLB+"','"+beginDateTime+"','"+endDateTime+"','"+str+"','"+state+"','"+qjss+"')"; - TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs.executeSql(sql, poolname_t3,generate); +// String sql = "insert into chuchai_qingjia_log(requestId,gh,lbbh,kssj,jssj,message,state,qjss) values('" + requestid + "','" + GH + "','" + QJLB + "','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + state + "','" + qjss + "')"; +// String poolname_t3 = CONN_TYPE.workflow.getType(); +// /*String sql = "insert into chuchai_qingjia_log(reqid,gh,lbbh,kssj,jssj,message,state,qjss) values('"+ requestid +"','"+ GH +"','"+QJLB+"','"+beginDateTime+"','"+endDateTime+"','"+str+"','"+state+"','"+qjss+"')"; +// TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs.executeSql(sql, poolname_t3,generate); + String poolname = CONN_TYPE.hrm.getType(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("chuchai_qingjia_log"); + logger_13aa9db7.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id + String sql3 = "update e10_common.dbo.chuchai_qingjia_log set requestId='" + requestid + "',gh='" + GH + "',lbbh='" + QJLB + "',kssj='" + beginDateTime + "',jssj='" + endDateTime + "',message='" + str + "',state='" + state + "',qjss='" + qjss + "' where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger_13aa9db7.info("sql3 = " + sql3); + logger_13aa9db7.info("添加 = " + b1); // System.out.println(str); } catch (Exception e) { System.err.println(e.toString()); @@ -208,13 +228,21 @@ public class QingJiaShenQingAction extends BaseBean implements Action, EsbServer // writeLog("QingJiaShenQingAction--exception:"+str); str = e.getMessage(); String qjss = QJSS + ""; - String sql = "insert into chuchai_qingjia_log(requestId,gh,lbbh,kssj,jssj,message,state,qjss) values('" + requestid + "','" + GH + "','" + QJLB + "','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + state + "','" + qjss + "')"; - String poolname_ft = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs.executeSql(sql, poolname_ft,generate); - logger_13aa9db7.info(String.valueOf(requestid + "QingJiaShenQingAction--exception:" + str)); +// String sql = "insert into chuchai_qingjia_log(requestId,gh,lbbh,kssj,jssj,message,state,qjss) values('" + requestid + "','" + GH + "','" + QJLB + "','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + state + "','" + qjss + "')"; +// String poolname_ft = CONN_TYPE.workflow.getType(); +// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +// long generate = IdGenerator.generate(); +// rs.executeSql(sql, poolname_ft,generate); +// logger_13aa9db7.info(String.valueOf(requestid + "QingJiaShenQingAction--exception:" + str)); + String poolname = CONN_TYPE.hrm.getType(); + Long uf_CustomFlow_formId = commonDevUtil.getObjId("chuchai_qingjia_log"); + SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); + Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); + String sql3 = "update e10_common.dbo.chuchai_qingjia_log set requestId='" + requestid + "',gh='" + GH + "',lbbh='" + QJLB + "',kssj='" + beginDateTime + "',jssj='" + endDateTime + "',message='" + str + "',state='" + state + "',qjss='" + qjss + "' where id = " + recodId + " and delete_type = 0 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger_13aa9db7.info("sql3 = " + sql3); + logger_13aa9db7.info("添加 = " + b1); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) {