查询BUG修复
This commit is contained in:
parent
6fc428cbc0
commit
666be234e2
|
|
@ -1,5 +1,6 @@
|
||||||
package weaver.interfaces.secret.action;
|
package weaver.interfaces.secret.action;
|
||||||
|
|
||||||
|
import com.engine.secret.util.ConfigUtil;
|
||||||
import com.engine.secret.util.FlowUtil;
|
import com.engine.secret.util.FlowUtil;
|
||||||
import org.apache.commons.collections.CollectionUtils;
|
import org.apache.commons.collections.CollectionUtils;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
|
|
@ -17,6 +18,7 @@ import java.util.*;
|
||||||
*/
|
*/
|
||||||
public class MeetingConveningEndAction implements Action {
|
public class MeetingConveningEndAction implements Action {
|
||||||
RecordSet rs = new RecordSet();
|
RecordSet rs = new RecordSet();
|
||||||
|
private static final String MAIN_FLOW_TABLE = ConfigUtil.getConfig("xqxksqlc_table");
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String execute(RequestInfo requestInfo) {
|
public String execute(RequestInfo requestInfo) {
|
||||||
|
|
@ -67,8 +69,18 @@ public class MeetingConveningEndAction implements Action {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 提交主流程
|
||||||
|
*
|
||||||
|
* @param requestInfo
|
||||||
|
* @param detail
|
||||||
|
* @param updateDetailSql
|
||||||
|
* @param errorMsg
|
||||||
|
*/
|
||||||
private void dealMainFlow(RequestInfo requestInfo, Map<String, String> detail, String updateDetailSql, Set<String> errorMsg) {
|
private void dealMainFlow(RequestInfo requestInfo, Map<String, String> detail, String updateDetailSql, Set<String> errorMsg) {
|
||||||
String mainRequestId = detail.get("xzxksqdh");
|
String mainId = detail.get("xzxksqdh");
|
||||||
|
|
||||||
|
|
||||||
String conclusion = detail.get("spfhjl");
|
String conclusion = detail.get("spfhjl");
|
||||||
String detailId = detail.get("detailId");
|
String detailId = detail.get("detailId");
|
||||||
String submitStatus = detail.get("zlctjzt");
|
String submitStatus = detail.get("zlctjzt");
|
||||||
|
|
@ -76,19 +88,22 @@ public class MeetingConveningEndAction implements Action {
|
||||||
// 已经提交成功的流程,不重复处理
|
// 已经提交成功的流程,不重复处理
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// 更新主流程表单的审批复核结论
|
|
||||||
String tableNameByRequestId = FlowUtil.getTableNameByRequestId(mainRequestId);
|
String mainRequestId = "";
|
||||||
if (StringUtils.isBlank(tableNameByRequestId)) {
|
rs.executeQuery("select requestid from " + MAIN_FLOW_TABLE + " where id = ?", mainId);
|
||||||
errorMsg.add("requestId[" + mainRequestId + "],主流程表单名称获取异常,请确认");
|
if (rs.next()) {
|
||||||
|
mainRequestId = rs.getString("requestid");
|
||||||
|
}
|
||||||
|
if (StringUtils.isBlank(mainRequestId)) {
|
||||||
|
errorMsg.add("主流程ID[" + mainId + "],主流程requestId获取异常,请确认");
|
||||||
rs.executeUpdate(updateDetailSql, "2", detailId);
|
rs.executeUpdate(updateDetailSql, "2", detailId);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
rs.writeLog("mainRequestId==" + mainRequestId);
|
rs.writeLog("mainRequestId==" + mainRequestId);
|
||||||
rs.writeLog("conclusion==" + conclusion);
|
rs.writeLog("conclusion==" + conclusion);
|
||||||
rs.writeLog("tableNameByRequestId==" + tableNameByRequestId);
|
|
||||||
|
|
||||||
rs.executeUpdate("update " + tableNameByRequestId + " set spfhjl = ? where requestid = ?", conclusion, mainRequestId);
|
rs.executeUpdate("update " + MAIN_FLOW_TABLE + " set spfhjl = ? where requestid = ?", conclusion, mainRequestId);
|
||||||
|
|
||||||
// 更新完成后,自动提交流程到下一节点
|
// 更新完成后,自动提交流程到下一节点
|
||||||
rs.writeLog("mainRequestId==" + mainRequestId);
|
rs.writeLog("mainRequestId==" + mainRequestId);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue