youhong.ai
/
ecology_maven
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

保密协议签署完成，保密协议附件添加和删除

dev
IT-xiaoXiong 2021-12-03 15:46:56 +08:00
parent cad7706a17
commit 86e95aad7b
5 changed files with 248 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
com/api/aiyh_pcn/fadada/entity/UfContractInfoDTO.java
View File

@ -22,149 +22,150 @@ public class UfContractInfoDTO {
private String workflowRequestId; private String workflowRequestId;
private String workflowDetailTable; private String workflowDetailTable;
private String signedType; private String signedType;
private String userInfo;
private int mainId; private int mainId;
public void setId(int id){ public void setId(int id) {
this.id = id; this.id = id;
} }
public void setRequestId(int requestId){ public void setRequestId(int requestId) {
this.requestId = requestId; this.requestId = requestId;
} }
public void setWorkflowType(int workflowType){ public void setWorkflowType(int workflowType) {
this.workflowType = workflowType; this.workflowType = workflowType;
} }
public void setContractNo(String contractNo){ public void setContractNo(String contractNo) {
this.contractNo = contractNo; this.contractNo = contractNo;
} }
public void setFileNo(String fileNo){ public void setFileNo(String fileNo) {
this.fileNo = fileNo; this.fileNo = fileNo;
} }
public void setFileName(String fileName){ public void setFileName(String fileName) {
this.fileName = fileName; this.fileName = fileName;
} }
public void setSignedNum(int signedNum){ public void setSignedNum(int signedNum) {
this.signedNum = signedNum; this.signedNum = signedNum;
} }
public void setShouldSignedNum(int shouldSignedNum){ public void setShouldSignedNum(int shouldSignedNum) {
this.shouldSignedNum = shouldSignedNum; this.shouldSignedNum = shouldSignedNum;
} }
public void setContractStatus(int contractStatus){ public void setContractStatus(int contractStatus) {
this.contractStatus = contractStatus; this.contractStatus = contractStatus;
} }
public void setContractViewUrl(String contractViewUrl){ public void setContractViewUrl(String contractViewUrl) {
this.contractViewUrl = contractViewUrl; this.contractViewUrl = contractViewUrl;
} }
public void setContractDownUrl(String contractDownUrl){ public void setContractDownUrl(String contractDownUrl) {
this.contractDownUrl = contractDownUrl; this.contractDownUrl = contractDownUrl;
} }
public void setWorkflowMainTable(String workflowMainTable){ public void setWorkflowMainTable(String workflowMainTable) {
this.workflowMainTable = workflowMainTable; this.workflowMainTable = workflowMainTable;
} }
public void setQueueSigned(int queueSigned){ public void setQueueSigned(int queueSigned) {
this.queueSigned = queueSigned; this.queueSigned = queueSigned;
} }
public void setSingleContractFileNum(int singleContractFileNum){ public void setSingleContractFileNum(int singleContractFileNum) {
this.singleContractFileNum = singleContractFileNum; this.singleContractFileNum = singleContractFileNum;
} }
public void setSingleSignedNum(int singleSignedNum){ public void setSingleSignedNum(int singleSignedNum) {
this.singleSignedNum = singleSignedNum; this.singleSignedNum = singleSignedNum;
} }
public void setWorkflowRequestId(String workflowRequestId){ public void setWorkflowRequestId(String workflowRequestId) {
this.workflowRequestId = workflowRequestId; this.workflowRequestId = workflowRequestId;
} }
public void setWorkflowDetailTable(String workflowDetailTable){ public void setWorkflowDetailTable(String workflowDetailTable) {
this.workflowDetailTable = workflowDetailTable; this.workflowDetailTable = workflowDetailTable;
} }
public void setMainId(int mainId){ public void setMainId(int mainId) {
this.mainId = mainId; this.mainId = mainId;
} }
public int getId(){ public int getId() {
return this.id; return this.id;
} }
public int getRequestId(){ public int getRequestId() {
return this.requestId; return this.requestId;
} }
public int getWorkflowType(){ public int getWorkflowType() {
return this.workflowType; return this.workflowType;
} }
public String getContractNo(){ public String getContractNo() {
return this.contractNo; return this.contractNo;
} }
public String getFileNo(){ public String getFileNo() {
return this.fileNo; return this.fileNo;
} }
public String getFileName(){ public String getFileName() {
return this.fileName; return this.fileName;
} }
public int getSignedNum(){ public int getSignedNum() {
return this.signedNum; return this.signedNum;
} }
public int getShouldSignedNum(){ public int getShouldSignedNum() {
return this.shouldSignedNum; return this.shouldSignedNum;
} }
public int getContractStatus(){ public int getContractStatus() {
return this.contractStatus; return this.contractStatus;
} }
public String getContractViewUrl(){ public String getContractViewUrl() {
return this.contractViewUrl; return this.contractViewUrl;
} }
public String getContractDownUrl(){ public String getContractDownUrl() {
return this.contractDownUrl; return this.contractDownUrl;
} }
public String getWorkflowMainTable(){ public String getWorkflowMainTable() {
return this.workflowMainTable; return this.workflowMainTable;
} }
public int getQueueSigned(){ public int getQueueSigned() {
return this.queueSigned; return this.queueSigned;
} }
public int getSingleContractFileNum(){ public int getSingleContractFileNum() {
return this.singleContractFileNum; return this.singleContractFileNum;
} }
public int getSingleSignedNum(){ public int getSingleSignedNum() {
return this.singleSignedNum; return this.singleSignedNum;
} }
public String getWorkflowRequestId(){ public String getWorkflowRequestId() {
return this.workflowRequestId; return this.workflowRequestId;
} }
public String getWorkflowDetailTable(){ public String getWorkflowDetailTable() {
return this.workflowDetailTable; return this.workflowDetailTable;
} }
public int getMainId(){ public int getMainId() {
return this.mainId; return this.mainId;
} }
@ -176,6 +177,14 @@ public class UfContractInfoDTO {
this.signedType = signedType; this.signedType = signedType;
} }
public String getUserInfo() {
return userInfo;
}
public void setUserInfo(String userInfo) {
this.userInfo = userInfo;
}
@Override @Override
public String toString() { public String toString() {
return "UfContractInfoDTO{" + return "UfContractInfoDTO{" +
@ -197,6 +206,7 @@ public class UfContractInfoDTO {
", workflowRequestId='" + workflowRequestId + '\'' + ", workflowRequestId='" + workflowRequestId + '\'' +
", workflowDetailTable='" + workflowDetailTable + '\'' + ", workflowDetailTable='" + workflowDetailTable + '\'' +
", signedType='" + signedType + '\'' + ", signedType='" + signedType + '\'' +
", userInfo='" + userInfo + '\'' +
", mainId=" + mainId + ", mainId=" + mainId +
'}'; '}';
} }

140
com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java
View File

@ -8,6 +8,7 @@ import aiyh.utils.mapUtil.ParaMap;
import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl; import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
import aiyh.utils.zwl.common.ToolUtil; import aiyh.utils.zwl.common.ToolUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.api.aiyh_pcn.fadada.dao.FaDDContractMapping; import com.api.aiyh_pcn.fadada.dao.FaDDContractMapping;
import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO; import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO;
import com.api.aiyh_pcn.fadada.entity.UfContractInfoDTO; import com.api.aiyh_pcn.fadada.entity.UfContractInfoDTO;
@ -22,12 +23,9 @@ import weaver.hrm.User;
import weaver.soa.workflow.FileProcessor; import weaver.soa.workflow.FileProcessor;
import weaver.workflow.workflow.WorkflowVersion; import weaver.workflow.workflow.WorkflowVersion;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.StreamingOutput; import javax.ws.rs.core.StreamingOutput;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -315,17 +313,58 @@ public class FaDDContractService {
if (ufContractInfoDTO.getSingleSignedNum() + 1 == ufContractInfoDTO.getSingleContractFileNum()) { if (ufContractInfoDTO.getSingleSignedNum() + 1 == ufContractInfoDTO.getSingleContractFileNum()) {
update.put("signed_num", ufContractInfoDTO.getSignedNum() + 1); update.put("signed_num", ufContractInfoDTO.getSignedNum() + 1);
// 查询下一位合同方并发起签署 // 查询下一位合同方并发起签署
nextContractSigned(ufContractInfoDTO); if (ufContractInfoDTO.getSignedNum() + 1 < ufContractInfoDTO.getShouldSignedNum()) {
nextContractSigned(ufContractInfoDTO);
}
} }
// 如果合同已签数量和应签数量相同，则状态为本方待签 // 如果合同已签数量和应签数量相同，则状态为本方待签
if (ufContractInfoDTO.getSignedNum() + 1 == ufContractInfoDTO.getShouldSignedNum()) { if (ufContractInfoDTO.getSignedNum() + 1 == ufContractInfoDTO.getShouldSignedNum()) {
update.put("contract_status", 3); update.put("contract_status", 3);
// 判断是否控制签署规则 1-仅本方签署，2-仅对方签署，3-都签署 // 判断是否控制签署规则 1-仅本方签署，2-仅对方签署，3-都签署
if("1".equals(Util.null2String(ufContractInfoDTO.getSignedType()))){ if ("1".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
update.put("contract_status", 4); update.put("contract_status", 4);
} }
if("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))){ if ("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
update.put("contract_status", 4); update.put("contract_status", 4);
// TODO 仅对方签署完成后，添加用户信息
// 获取配置表信息
FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
RecordSet rs = new RecordSet();
String userInfo = ufContractInfoDTO.getUserInfo();
User user = JSON.parseObject(userInfo, new TypeReference<User>() {
});
// 获取流程中的合同字段的文档目录id
rs.executeQuery("select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
String formId = Util.recordeSet2Entity(rs, String.class);
String query = "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
if (StringUtils.isNullOrEmpty(docCategorys)) {
query = "select doccategory from workflow_base where id = ?";
rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
rs.next();
docCategorys = Util.null2String(rs.getString(1));
}
if (StringUtils.isNullOrEmpty(docCategorys)) {
docCategorys = ",,1";
}
// String[] docSplit = docCategorys.split(",");
// String category = docSplit[docSplit.length - 1];
// 下载合同到文件服务器中
String docIds = "";
try {
docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
} catch (Exception e) {
toolUtil.writeErrorLog("创建文档发生错误：" + e);
}
toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
// 将id保存到流程字段中
PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(ufContractInfoDTO.getWorkflowMainTable(),
ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
Util.createPrepWhereImpl().whereAnd("id").whereEqual(ufContractInfoDTO.getMainId()));
toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
} }
} }
} else { } else {
@ -336,11 +375,49 @@ public class FaDDContractService {
if (ufContractInfoDTO.getSignedNum() + 1 == ufContractInfoDTO.getShouldSignedNum() * ufContractInfoDTO.getSingleContractFileNum()) { if (ufContractInfoDTO.getSignedNum() + 1 == ufContractInfoDTO.getShouldSignedNum() * ufContractInfoDTO.getSingleContractFileNum()) {
update.put("contract_status", 3); update.put("contract_status", 3);
// 判断是否控制签署规则 1-仅本方签署，2-仅对方签署，3-都签署 // 判断是否控制签署规则 1-仅本方签署，2-仅对方签署，3-都签署
if("1".equals(Util.null2String(ufContractInfoDTO.getSignedType()))){ if ("1".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
update.put("contract_status", 4); update.put("contract_status", 4);
} }
if("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))){ if ("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
update.put("contract_status", 4); update.put("contract_status", 4);
// TODO 仅对方签署完成后，添加用户信息
// 获取配置表信息
FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
RecordSet rs = new RecordSet();
String userInfo = ufContractInfoDTO.getUserInfo();
User user = JSON.parseObject(userInfo, new TypeReference<User>() {
});
// 获取流程中的合同字段的文档目录id
rs.executeQuery("select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
String formId = Util.recordeSet2Entity(rs, String.class);
String query = "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
if (StringUtils.isNullOrEmpty(docCategorys)) {
query = "select doccategory from workflow_base where id = ?";
rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
rs.next();
docCategorys = Util.null2String(rs.getString(1));
}
if (StringUtils.isNullOrEmpty(docCategorys)) {
docCategorys = ",,1";
}
// String[] docSplit = docCategorys.split(",");
// String category = docSplit[docSplit.length - 1];
// 下载合同到文件服务器中
String docIds = "";
try {
docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
} catch (Exception e) {
toolUtil.writeErrorLog("创建文档发生错误：" + e);
}
toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
// 将id保存到流程字段中
PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(ufContractInfoDTO.getWorkflowMainTable(),
ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
Util.createPrepWhereImpl().whereAnd("id").whereEqual(ufContractInfoDTO.getMainId()));
toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
} }
} }
} }
@ -349,7 +426,7 @@ public class FaDDContractService {
PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql("uf_contract_info", update, PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql("uf_contract_info", update,
Util.createPrepWhereImpl().whereAnd("id").whereEqual(ufContractInfoDTO.getId())); Util.createPrepWhereImpl().whereAnd("id").whereEqual(ufContractInfoDTO.getId()));
RecordSet rs = new RecordSet(); RecordSet rs = new RecordSet();
toolUtil.writeDebuggerLog(String.format("合同签署回调，更新合同状态，更新语句{%s},更新参数{%s}",sqlResult.getSqlStr(),sqlResult.getArgs())); toolUtil.writeDebuggerLog(String.format("合同签署回调，更新合同状态，更新语句{%s},更新参数{%s}", sqlResult.getSqlStr(), sqlResult.getArgs()));
rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs()); rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
// 查询合同状态，更新明细表 // 查询合同状态，更新明细表
/* Map<String,Object> data = new HashMap<>(); /* Map<String,Object> data = new HashMap<>();
@ -395,11 +472,11 @@ public class FaDDContractService {
List<Map<String, Object>> detailMaps = Util.recordSet2MapList(rs); List<Map<String, Object>> detailMaps = Util.recordSet2MapList(rs);
query = "select * from " + ufContractInfoDTO.getWorkflowMainTable() + " where requestid = ?"; query = "select * from " + ufContractInfoDTO.getWorkflowMainTable() + " where requestid = ?";
RecordSet rs1 = new RecordSet(); RecordSet rs1 = new RecordSet();
rs1.executeQuery(query,ufContractInfoDTO.getRequestId()); rs1.executeQuery(query, ufContractInfoDTO.getRequestId());
Map<String, Object> mainMap = Util.recordSet2Map(rs1); Map<String, Object> mainMap = Util.recordSet2Map(rs1);
if(mainMap == null){ if (mainMap == null) {
toolUtil.writeErrorLog("mainMap 查询到null -------> " + JSON.toJSONString(ufContractInfoDTO)); toolUtil.writeErrorLog("mainMap 查询到null -------> " + JSON.toJSONString(ufContractInfoDTO));
throw new RuntimeException("mainMap查询到null!"); throw new RuntimeException("mainMap查询到null!");
} }
// 获取配置表信息 // 获取配置表信息
FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 3); FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 3);
@ -421,11 +498,11 @@ public class FaDDContractService {
Map<String, Object> updateData = new HashMap<>(); Map<String, Object> updateData = new HashMap<>();
Map<String, Object> map = maps.get(0); Map<String, Object> map = maps.get(0);
// 如果进行控制签署规则 // 如果进行控制签署规则
if(faDaDaConfigDTO.getSignedType() == 1){ if (faDaDaConfigDTO.getSignedType() == 1) {
if(Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOther()){ if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOther()) {
// 仅对方签署 // 仅对方签署
if(maps.size() == 1){ if (maps.size() == 1) {
map.put("signType",2); map.put("signType", 2);
} }
} }
} }
@ -544,8 +621,8 @@ public class FaDDContractService {
if (!"200".equals(response.get("code"))) { if (!"200".equals(response.get("code"))) {
this.toolUtil.writeErrorLog("签署参数：" + responeVo.getEntityString()); this.toolUtil.writeErrorLog("签署参数：" + responeVo.getEntityString());
throw new RuntimeException("本方签署失败！法大大请求接口错误！"); throw new RuntimeException("本方签署失败！法大大请求接口错误！");
}else{ } else {
Map<String,Object> result = (Map<String, Object>) response.get("data"); Map<String, Object> result = (Map<String, Object>) response.get("data");
downloadUrlList.add(Util.null2String(result.get("downloadUrl"))); downloadUrlList.add(Util.null2String(result.get("downloadUrl")));
viewUrlList.add(Util.null2String(result.get("viewUrl"))); viewUrlList.add(Util.null2String(result.get("viewUrl")));
} }
@ -554,25 +631,25 @@ public class FaDDContractService {
RecordSet rs = new RecordSet(); RecordSet rs = new RecordSet();
Map<String, Object> update = new HashMap<>(); Map<String, Object> update = new HashMap<>();
update.put("contract_status", 4); update.put("contract_status", 4);
update.put("contract_view_url", String.join(";",viewUrlList)); update.put("contract_view_url", String.join(";", viewUrlList));
update.put("contract_down_url", String.join(";",downloadUrlList)); update.put("contract_down_url", String.join(";", downloadUrlList));
PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(contractInfoTable, update, PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(contractInfoTable, update,
Util.createPrepWhereImpl().whereAnd("workflow_request_id").whereEqual(requestId)); Util.createPrepWhereImpl().whereAnd("workflow_request_id").whereEqual(requestId));
toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs()); toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs()); rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
// 获取流程中的合同字段的文档目录id // 获取流程中的合同字段的文档目录id
rs.executeQuery("select formid from workflow_base where id = ?",ufContractInfoDTO.getWorkflowType()); rs.executeQuery("select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
String formId = Util.recordeSet2Entity(rs, String.class); String formId = Util.recordeSet2Entity(rs, String.class);
String query = "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)"; String query = "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
rs.executeQuery(query,faDaDaConfigDTO.getContractDoc(),formId); rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
String docCategorys =Util.null2String(Util.recordeSet2Entity(rs, String.class)); String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
if(StringUtils.isNullOrEmpty(docCategorys)){ if (StringUtils.isNullOrEmpty(docCategorys)) {
query = "select doccategory from workflow_base where id = ?"; query = "select doccategory from workflow_base where id = ?";
rs.executeQuery(query,ufContractInfoDTO.getWorkflowType()); rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
rs.next(); rs.next();
docCategorys = Util.null2String(rs.getString(1)); docCategorys = Util.null2String(rs.getString(1));
} }
if(StringUtils.isNullOrEmpty(docCategorys)){ if (StringUtils.isNullOrEmpty(docCategorys)) {
docCategorys = ",,1"; docCategorys = ",,1";
} }
// String[] docSplit = docCategorys.split(","); // String[] docSplit = docCategorys.split(",");
@ -581,7 +658,7 @@ public class FaDDContractService {
String docIds = ""; String docIds = "";
try { try {
docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user); docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
}catch (Exception e){ } catch (Exception e) {
toolUtil.writeErrorLog("创建文档发生错误：" + e); toolUtil.writeErrorLog("创建文档发生错误：" + e);
} }
toolUtil.writeDebuggerLog("生成的文档的id：" + docIds); toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
@ -590,7 +667,7 @@ public class FaDDContractService {
ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds), ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
Util.createPrepWhereImpl().whereAnd("id").whereEqual(ufContractInfoDTO.getMainId())); Util.createPrepWhereImpl().whereAnd("id").whereEqual(ufContractInfoDTO.getMainId()));
toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs()); toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
rs.executeUpdate(sqlResult.getSqlStr(),sqlResult.getArgs()); rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
} }
public String downloadContract2FileSystem(UfContractInfoDTO ufContractInfoDTO, String category, User user) { public String downloadContract2FileSystem(UfContractInfoDTO ufContractInfoDTO, String category, User user) {
@ -662,10 +739,11 @@ public class FaDDContractService {
/** /**
* 直接从法大大系统下载文件 * 直接从法大大系统下载文件
*
* @param ufContractInfoDTO 合同相关信息 * @param ufContractInfoDTO 合同相关信息
* @return * @return
*/ */
public StreamingOutput download4mFDD(UfContractInfoDTO ufContractInfoDTO){ public StreamingOutput download4mFDD(UfContractInfoDTO ufContractInfoDTO) {
// 获取配置表信息 // 获取配置表信息
FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 5); FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 5);
ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig()); ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
@ -676,7 +754,7 @@ public class FaDDContractService {
String[] contractNoArr = contractNos.split(","); String[] contractNoArr = contractNos.split(",");
String[] fileNameArr = fileNames.split(","); String[] fileNameArr = fileNames.split(",");
toolUtil.writeDebuggerLog("下载合同download4mFDD！"); toolUtil.writeDebuggerLog("下载合同download4mFDD！");
if(contractNoArr.length >= 2){ if (contractNoArr.length >= 2) {
// 多个文件，需要下载压缩包 // 多个文件，需要下载压缩包
return outputStream -> { return outputStream -> {
ZipOutputStream zipOut = new ZipOutputStream(outputStream); ZipOutputStream zipOut = new ZipOutputStream(outputStream);
@ -715,7 +793,7 @@ public class FaDDContractService {
outputStream.close(); outputStream.close();
}; };
} }
return outputStream->{ return outputStream -> {
toolUtil.writeDebuggerLog("download4mFDD单文件下载！"); toolUtil.writeDebuggerLog("download4mFDD单文件下载！");
// InputStream inputStream = downloadContract(contractNos,String.valueOf(ufContractInfoDTO.getWorkflowType())); // InputStream inputStream = downloadContract(contractNos,String.valueOf(ufContractInfoDTO.getWorkflowType()));
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();

101
weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java
View File

@ -25,16 +25,19 @@ import java.util.stream.Collectors;
public class CopyAttachmentSecretAction extends ToolUtil implements Action { public class CopyAttachmentSecretAction extends ToolUtil implements Action {
// 模板id // 模板id
private String attachmentTemplateId; private String attachmentTemplateId;
// 是否属于浏览框 // 是否属于浏览框
private String isBrowseBox; private String isBrowseBox;
// 第一次添加附件标识字段 // 第一次添加附件标识字段
private String firstAddField; private String firstAddField;
// 第一次添加附件的值 // 第一次添加附件的值
private String firstAddValue; private String firstAddValue;
// 第一次添加成功后的回写值 // 第一次添加成功后的回写值
private String addSuccessValue; private String addSuccessValue;
// 安全协议单独id字段
private String secretField;
@Override @Override
public String execute(RequestInfo requestInfo) { public String execute(RequestInfo requestInfo) {
ToolUtil toolUtil = new ToolUtil(); ToolUtil toolUtil = new ToolUtil();
@ -52,8 +55,10 @@ public class CopyAttachmentSecretAction extends ToolUtil implements Action {
Map<String, Object> requestData = Util.recordSet2Map(rs_1); Map<String, Object> requestData = Util.recordSet2Map(rs_1);
toolUtil.writeDebuggerLog(requestData.toString()); toolUtil.writeDebuggerLog(requestData.toString());
// 如果不是第一次添加，则直接返回 TODO 隐藏bug，如果用户第一次选择添加，后面被退回后，将附件清空了，重新上传，然后又需要安全协议，但是已经不是第一次添加了，所以并不会生效 // 如果不是第一次添加，则直接返回 TODO 隐藏bug，如果用户第一次选择添加，后面被退回后，将附件清空了，重新上传，然后又需要安全协议，但是已经不是第一次添加了，所以并不会生效
if(requestData.get(firstAddField) != null && !Util.null2String(firstAddValue).equals(String.valueOf(requestData.get(firstAddField)))){ if (StringUtils.isNullOrEmpty(secretField)) {
return Action.SUCCESS; if (requestData.get(firstAddField) != null && !Util.null2String(firstAddValue).equals(String.valueOf(requestData.get(firstAddField)))) {
return Action.SUCCESS;
}
} }
// 查询配置表，获取配置数据 // 查询配置表，获取配置数据
String querySql = "select ufta.id,ufta.workflow_type,wftva.fieldname as template_field, " + String querySql = "select ufta.id,ufta.workflow_type,wftva.fieldname as template_field, " +
@ -72,7 +77,7 @@ public class CopyAttachmentSecretAction extends ToolUtil implements Action {
RecordSet rs = new RecordSet(); RecordSet rs = new RecordSet();
rs.executeQuery(querySql, workflowId, workflowId, 1); rs.executeQuery(querySql, workflowId, workflowId, 1);
ConfigEmpty configEmpty = null; ConfigEmpty configEmpty = null;
while(rs.next()){ while (rs.next()) {
// id // id
int id = Util.getIntValue(rs.getString("id")); int id = Util.getIntValue(rs.getString("id"));
// 显示值 // 显示值
@ -119,6 +124,27 @@ public class CopyAttachmentSecretAction extends ToolUtil implements Action {
.attachmentTableName(attachmentTableName) .attachmentTableName(attachmentTableName)
.attachmentFieldId(attachmentFieldId) .attachmentFieldId(attachmentFieldId)
.builder(); .builder();
if (!StringUtils.isNullOrEmpty(secretField)) {
// 原字段的文件id
String fileIds = Util.null2String(rs_1.getString(configEmpty.getAttachmentField()));
String[] split = fileIds.split(",");
// 转为list
List<String> list = Arrays.stream(split).collect(Collectors.toList());
// 如果配置了secretField字段
if (!StringUtils.isNullOrEmpty(secretField)) {
String secretIds = Util.null2String(rs_1.getString(secretField));
String[] secretIdArr = secretIds.split(",");
List<String> secretFieldList = Arrays.stream(secretIdArr).collect(Collectors.toList());
list.removeAll(secretFieldList);
}
Map<String, Object> data = ParaMap.create().put(configEmpty.getAttachmentField(), String.join(",", list));
// 修改流程数据，将保密协议的docid更新到流程中
PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(billTableName,
data,
Util.createPrepWhereImpl().whereAnd("requestid").whereEqual(requestId));
toolUtil.writeDebuggerLog("sql ： " + sqlResult.getSqlStr() + " 参数： ---> " + sqlResult.getArgs());
rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
}
toolUtil.writeDebuggerLog("保密协议数据：" + configEmpty.toString()); toolUtil.writeDebuggerLog("保密协议数据：" + configEmpty.toString());
// 如果不控制是否使用模板，那就默认不添加保密协议 // 如果不控制是否使用模板，那就默认不添加保密协议
if ("1".equals(isTemplateShow)) { if ("1".equals(isTemplateShow)) {
@ -133,9 +159,9 @@ public class CopyAttachmentSecretAction extends ToolUtil implements Action {
return Action.SUCCESS; return Action.SUCCESS;
} }
} }
if(configEmpty != null){ if (configEmpty != null) {
// 使用保密协议模板 // 使用保密协议模板
String docIds = copyFile(user, configEmpty,String.valueOf(requestData.get(configEmpty.getTemplateField()))); String docIds = copyFile(user, configEmpty, String.valueOf(requestData.get(configEmpty.getTemplateField())));
toolUtil.writeDebuggerLog("复制完成文件id：" + docIds); toolUtil.writeDebuggerLog("复制完成文件id：" + docIds);
if (StringUtils.isNullOrEmpty(docIds)) { if (StringUtils.isNullOrEmpty(docIds)) {
requestInfo.getRequestManager().setMessageid("1"); requestInfo.getRequestManager().setMessageid("1");
@ -143,27 +169,40 @@ public class CopyAttachmentSecretAction extends ToolUtil implements Action {
requestInfo.getRequestManager().setMessagecontent(aiyh.utils.Util.getHtmlLabelName(-87783, user.getLanguage(), "保密协议复制失败，未能正确复制保密协议！")); requestInfo.getRequestManager().setMessagecontent(aiyh.utils.Util.getHtmlLabelName(-87783, user.getLanguage(), "保密协议复制失败，未能正确复制保密协议！"));
return Action.FAILURE_AND_CONTINUE; return Action.FAILURE_AND_CONTINUE;
} }
// 原字段的文件id
String fileIds = Util.null2String(rs_1.getString(configEmpty.getAttachmentField())); String fileIds = Util.null2String(rs_1.getString(configEmpty.getAttachmentField()));
String[] split = fileIds.split(","); String[] split = fileIds.split(",");
// 转为list
List<String> list = Arrays.stream(split).collect(Collectors.toList()); List<String> list = Arrays.stream(split).collect(Collectors.toList());
String[] split1 = docIds.split(","); // 如果配置了secretField字段
list.addAll(Arrays.stream(split1).collect(Collectors.toList())); if (!StringUtils.isNullOrEmpty(secretField)) {
String secretIds = Util.null2String(rs_1.getString(secretField));
String[] secretIdArr = secretIds.split(",");
List<String> secretFieldList = Arrays.stream(secretIdArr).collect(Collectors.toList());
list.removeAll(secretFieldList);
}
String[] docList = docIds.split(",");
list.addAll(Arrays.stream(docList).collect(Collectors.toList()));
Map<String, Object> data = ParaMap.create().put(configEmpty.getAttachmentField(), String.join(",", list));
if (!StringUtils.isNullOrEmpty(secretField)) {
data.put(secretField, docIds);
} else {
data.put(firstAddField, addSuccessValue);
}
// 修改流程数据，将保密协议的docid更新到流程中 // 修改流程数据，将保密协议的docid更新到流程中
PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(billTableName, PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(billTableName,
ParaMap.create().put(configEmpty.getAttachmentField(), String.join(",", list)) data,
.put(firstAddField,addSuccessValue),
Util.createPrepWhereImpl().whereAnd("requestid").whereEqual(requestId)); Util.createPrepWhereImpl().whereAnd("requestid").whereEqual(requestId));
toolUtil.writeDebuggerLog("sql ： " + sqlResult.getSqlStr() + " 参数： ---> " + sqlResult.getArgs()); toolUtil.writeDebuggerLog("sql ： " + sqlResult.getSqlStr() + " 参数： ---> " + sqlResult.getArgs());
rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs()); rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
} }
}catch (Exception e){ } catch (Exception e) {
toolUtil.writeErrorLog("出现错误： " + e); toolUtil.writeErrorLog("出现错误： " + e);
} }
return Action.SUCCESS; return Action.SUCCESS;
} }
public String copyFile(User user, ConfigEmpty configEmpty,String browseBoxId){ public String copyFile(User user, ConfigEmpty configEmpty, String browseBoxId) {
ToolUtil toolUtil = new ToolUtil(); ToolUtil toolUtil = new ToolUtil();
// 建模表名称 params.get("tableName") // 建模表名称 params.get("tableName")
String tableName = String.valueOf(configEmpty.getModelTableName()); String tableName = String.valueOf(configEmpty.getModelTableName());
@ -174,35 +213,35 @@ public class CopyAttachmentSecretAction extends ToolUtil implements Action {
// 配置id params.get("configId") // 配置id params.get("configId")
// String configId = String.valueOf(configEmpty.getId()); // String configId = String.valueOf(configEmpty.getId());
String configId; String configId;
if("true".equals(isBrowseBox)){ if ("true".equals(isBrowseBox)) {
// 如果是流程中的某个浏览框，则读取配置文件的浏览框值，否则直接赋值为action中配置的模板id // 如果是流程中的某个浏览框，则读取配置文件的浏览框值，否则直接赋值为action中配置的模板id
configId = browseBoxId; configId = browseBoxId;
}else { } else {
configId = attachmentTemplateId; configId = attachmentTemplateId;
} }
// 流程id params.get("workflowId") // 流程id params.get("workflowId")
String workflowId = String.valueOf(configEmpty.getWorkflowType()); String workflowId = String.valueOf(configEmpty.getWorkflowType());
DocTemplateDao docTemplateDao = new DocTemplateDao(); DocTemplateDao docTemplateDao = new DocTemplateDao();
int[] docIds = null; int[] docIds = null;
try{ try {
docIds = docTemplateDao.copyFile(user.getUID(), tableName, fieldName, configId); docIds = docTemplateDao.copyFile(user.getUID(), tableName, fieldName, configId);
}catch(Exception e){ } catch (Exception e) {
toolUtil.writeErrorLog("复制文件出错： " + e); toolUtil.writeErrorLog("复制文件出错： " + e);
return null; return null;
} }
if(docIds == null){ if (docIds == null) {
return null; return null;
} }
try{ try {
docTemplateDao.updateFileInfo(workflowId,fileFieldId,docIds); docTemplateDao.updateFileInfo(workflowId, fileFieldId, docIds);
}catch(Exception e){ } catch (Exception e) {
toolUtil.writeErrorLog("复制文件更新权限和目录出错： " + e); toolUtil.writeErrorLog("复制文件更新权限和目录出错： " + e);
return null; return null;
} }
toolUtil.writeDebuggerLog("数据更新成功！" + Arrays.toString(docIds)); toolUtil.writeDebuggerLog("数据更新成功！" + Arrays.toString(docIds));
List<String> intList= Arrays.stream(docIds).boxed().collect(Collectors.toList()) List<String> intList = Arrays.stream(docIds).boxed().collect(Collectors.toList())
.stream().map(String::valueOf).collect(Collectors.toList()); .stream().map(String::valueOf).collect(Collectors.toList());
return String.join(",",intList); return String.join(",", intList);
} }
public String getAttachmentTemplateId() { public String getAttachmentTemplateId() {
@ -237,6 +276,14 @@ public class CopyAttachmentSecretAction extends ToolUtil implements Action {
this.firstAddValue = firstAddValue; this.firstAddValue = firstAddValue;
} }
public String getSecretField() {
return secretField;
}
public void setSecretField(String secretField) {
this.secretField = secretField;
}
public String getAddSuccessValue() { public String getAddSuccessValue() {
return addSuccessValue; return addSuccessValue;
} }

23
weaver/aiyh_pcn/fadada/FaDDContractAction.java
View File

@ -9,7 +9,6 @@ import weaver.aiyh_pcn.fadada.util.FaddContractUtil;
import weaver.hrm.User; import weaver.hrm.User;
import weaver.interfaces.workflow.action.Action; import weaver.interfaces.workflow.action.Action;
import weaver.soa.workflow.request.RequestInfo; import weaver.soa.workflow.request.RequestInfo;
import weaver.systeminfo.SystemEnv;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -23,17 +22,17 @@ import java.util.Map;
public class FaDDContractAction extends ToolUtil implements Action { public class FaDDContractAction extends ToolUtil implements Action {
private final FaDDContractMapping faDDContractMapping = new FaDDContractMapping(); private final FaDDContractMapping faDDContractMapping = new FaDDContractMapping();
private final ToolUtil toolUtil = new ToolUtil(); private final ToolUtil toolUtil = new ToolUtil();
// 合同字段 // 合同字段
private String contractField; private String contractField;
// 客户编号字段 // 客户编号字段
private String customerNoField; private String customerNoField;
// 客户编号 // 客户编号
private String customerNo; private String customerNo;
// 是否是顺序签订 // 是否是顺序签订
private String queueSigned; private String queueSigned;
// 签订字段,用于是否电子签 // 签订字段,用于是否电子签
private String signedField; private String signedField;
// 签订值 // 签订值
private String signedValue; private String signedValue;
@ -67,19 +66,19 @@ public class FaDDContractAction extends ToolUtil implements Action {
List<Map<String, Object>> detailMaps = faDDContractMapping.queryDetailMaps(mainId, tableName); List<Map<String, Object>> detailMaps = faDDContractMapping.queryDetailMaps(mainId, tableName);
// 开始签署合同 // 开始签署合同
FaddContractUtil faddContractUtil = new FaddContractUtil(workflowId, requestId, mainTableName, tableName, FaddContractUtil faddContractUtil = new FaddContractUtil(workflowId, requestId, mainTableName, tableName,
customerNo, customerNoField, contractField, queueSigned, detailMaps, mainMap); customerNo, customerNoField, contractField, queueSigned, detailMaps, mainMap, user);
try { try {
faddContractUtil.createContract(mainMap); faddContractUtil.createContract(mainMap);
} catch (Exception e) { } catch (Exception e) {
toolUtil.writeErrorLog("合同创建失败，失败原因：" + e); toolUtil.writeErrorLog("合同创建失败，失败原因：" + e);
// TODO 更换labelIndex // TODO 更换labelIndex
requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-87660,user.getLanguage(),"合同创建失败，未能正确创建法大大合同！")); requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-87660, user.getLanguage(), "合同创建失败，未能正确创建法大大合同！"));
requestInfo.getRequestManager().setMessageid("1"); requestInfo.getRequestManager().setMessageid("1");
return Action.FAILURE_AND_CONTINUE; return Action.FAILURE_AND_CONTINUE;
} }
if(faDaDaConfigDTO.getSignedType() == 1){ if (faDaDaConfigDTO.getSignedType() == 1) {
// 需要控制签署规则 // 需要控制签署规则
if(Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOwn()){ if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOwn()) {
// 只需要本方签署 // 只需要本方签署
return Action.SUCCESS; return Action.SUCCESS;
} }
@ -97,7 +96,7 @@ public class FaDDContractAction extends ToolUtil implements Action {
} catch (Exception e) { } catch (Exception e) {
toolUtil.writeErrorLog("合同已创建，但发起签署失败，失败原因：" + e); toolUtil.writeErrorLog("合同已创建，但发起签署失败，失败原因：" + e);
// TODO 更换labelIndex // TODO 更换labelIndex
requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-87659,user.getLanguage(),"合同已创建，当合同发起签署时失败！")); requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-87659, user.getLanguage(), "合同已创建，当合同发起签署时失败！"));
requestInfo.getRequestManager().setMessageid("2"); requestInfo.getRequestManager().setMessageid("2");
return Action.FAILURE_AND_CONTINUE; return Action.FAILURE_AND_CONTINUE;
} }

8
weaver/aiyh_pcn/fadada/util/FaddContractUtil.java
View File

@ -6,6 +6,7 @@ import aiyh.utils.httpUtil.ResponeVo;
import aiyh.utils.mapUtil.ParaMap; import aiyh.utils.mapUtil.ParaMap;
import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl; import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
import aiyh.utils.zwl.common.ToolUtil; import aiyh.utils.zwl.common.ToolUtil;
import com.alibaba.fastjson.JSON;
import com.api.aiyh_pcn.fadada.dao.FaDDContractMapping; import com.api.aiyh_pcn.fadada.dao.FaDDContractMapping;
import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO; import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO;
import com.api.aiyh_pcn.fadada.service.impl.FaDDContractService; import com.api.aiyh_pcn.fadada.service.impl.FaDDContractService;
@ -18,6 +19,7 @@ import weaver.conn.RecordSet;
import weaver.file.ImageFileManager; import weaver.file.ImageFileManager;
import weaver.formmode.data.ModeDataIdUpdate; import weaver.formmode.data.ModeDataIdUpdate;
import weaver.formmode.setup.ModeRightInfo; import weaver.formmode.setup.ModeRightInfo;
import weaver.hrm.User;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
@ -47,12 +49,14 @@ public class FaddContractUtil {
private FaDDContractMapping faDDContractMapping = new FaDDContractMapping(); private FaDDContractMapping faDDContractMapping = new FaDDContractMapping();
private FaDDContractService faDDContractService = new FaDDContractService(); private FaDDContractService faDDContractService = new FaDDContractService();
private final ToolUtil toolUtil = new ToolUtil(); private final ToolUtil toolUtil = new ToolUtil();
private User user;
public FaddContractUtil() { public FaddContractUtil() {
} }
public FaddContractUtil(String workflowId, String requestId, String mainTableName, String tableName, String customerNo, public FaddContractUtil(String workflowId, String requestId, String mainTableName, String tableName, String customerNo,
String customerNoField, String contractField, String queueSigned, List<Map<String, Object>> detailMaps, Map<String, Object> mainMap) { String customerNoField, String contractField, String queueSigned, List<Map<String, Object>> detailMaps, Map<String, Object> mainMap,
User user) {
this.workflowId = workflowId; this.workflowId = workflowId;
this.requestId = requestId; this.requestId = requestId;
this.mainTableName = mainTableName; this.mainTableName = mainTableName;
@ -63,6 +67,7 @@ public class FaddContractUtil {
this.queueSigned = queueSigned; this.queueSigned = queueSigned;
this.detailMaps = detailMaps; this.detailMaps = detailMaps;
this.mainMap = mainMap; this.mainMap = mainMap;
this.user = user;
} }
/** /**
@ -122,6 +127,7 @@ public class FaddContractUtil {
updateMap.put("workflow_request_id", requestId); updateMap.put("workflow_request_id", requestId);
updateMap.put("workflow_main_table", mainTableName); updateMap.put("workflow_main_table", mainTableName);
updateMap.put("workflow_detail_table", tableName); updateMap.put("workflow_detail_table", tableName);
updateMap.put("user_info", JSON.toJSONString(user));
// 1表示创建 2表示等待对方签署，3表示等待本方签署，4表示完成 // 1表示创建 2表示等待对方签署，3表示等待本方签署，4表示完成
updateMap.put("contract_status", 1); updateMap.put("contract_status", 1);
// 对方应该签署的数量 // 对方应该签署的数量