|
|
@@ -10,6 +10,7 @@ import common.Controller;
|
|
|
import common.YosException;
|
|
|
import common.annotation.API;
|
|
|
import common.data.*;
|
|
|
+import org.apache.commons.codec.digest.DigestUtils;
|
|
|
import org.apache.commons.lang.ArrayUtils;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.camunda.bpm.container.impl.deployment.Attachments;
|
|
|
@@ -296,10 +297,14 @@ public class EsignContractTaskMX extends Controller {
|
|
|
return getErrReturnObject().setErrMsg("合同模板不存在").toString();
|
|
|
}
|
|
|
|
|
|
+ String license_name = content.getStringValue("license_name");
|
|
|
+ String legal_rep = content.getStringValue("legal_rep");
|
|
|
+ String phonenumber = content.getStringValue("phonenumber");
|
|
|
+
|
|
|
UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_esign_contract_taskmx");
|
|
|
updateSQL.setSiteid(siteid);
|
|
|
updateSQL.setUniqueid(sa_esign_contract_taskmxid);
|
|
|
- updateSQL.setValue("license_name", content.getStringValue("license_name"));
|
|
|
+ updateSQL.setValue("license_name", license_name);
|
|
|
updateSQL.setValue("taxno", content.getStringValue("taxno"));
|
|
|
updateSQL.setValue("license_address", content.getStringValue("license_address"));
|
|
|
updateSQL.setValue("legal_rep", content.getStringValue("legal_rep"));
|
|
|
@@ -322,24 +327,29 @@ public class EsignContractTaskMX extends Controller {
|
|
|
throw new NullPointerException("签署人不能为空");
|
|
|
}
|
|
|
//构造签署人信息
|
|
|
- FlowApproverInfo[] flowApproverInfos = WeChatByTemplate.BuildApprovers(Arrays.asList(recipients));
|
|
|
+ FlowApproverInfo[] flowApproverInfos = WeChatByTemplate.BuildApprovers(Arrays.asList(recipients), license_name, legal_rep,phonenumber);
|
|
|
+// String organizationOpenId = DigestUtils.sha256Hex(license_name);
|
|
|
+ CompanyInfo companyInfo = new CompanyInfo();
|
|
|
+ companyInfo.setBillno("");
|
|
|
+ companyInfo.setLicensename(license_name);
|
|
|
+
|
|
|
|
|
|
// 发起合同 样例为BtoC
|
|
|
Map<String, String[]> resp = wccUtil.createFlowByTemplateDirectly(flowName
|
|
|
- , templateId, flowApproverInfos);
|
|
|
+ , templateId, flowApproverInfos,WeChatConfig.SuperProxyOperatorOpenId,companyInfo);
|
|
|
int count = WeChatConfig.COUNT;
|
|
|
for (int i = 0; i < count; i++) {
|
|
|
-// // 返回合同Id
|
|
|
-// System.out.println("您创建的合同id为:");
|
|
|
-// System.out.println(resp.get("FlowIds")[i]);
|
|
|
-// // 返回签署的链接
|
|
|
-// System.out.println("签署链接为:");
|
|
|
-// System.out.println(resp.get("Urls")[i]);
|
|
|
-// // Step 3 下载合同
|
|
|
-// // 返回合同下载链接
|
|
|
-// String url = WeChatContractUtil.describeFileUrls(resp.get("FlowIds")[i]);
|
|
|
-// System.out.println("请访问以下地址下载您的合同:");
|
|
|
-// System.out.println(url);
|
|
|
+ // 返回合同Id
|
|
|
+ System.out.println("您创建的合同id为:");
|
|
|
+ System.out.println(resp.get("FlowIds")[i]);
|
|
|
+ // 返回签署的链接
|
|
|
+ System.out.println("签署链接为:");
|
|
|
+ System.out.println(resp.get("Urls")[i]);
|
|
|
+ // Step 3 下载合同
|
|
|
+ // 返回合同下载链接
|
|
|
+ String url = WeChatContractUtil.describeFileUrls(resp.get("FlowIds")[i]);
|
|
|
+ System.out.println("请访问以下地址下载您的合同:");
|
|
|
+ System.out.println(url);
|
|
|
|
|
|
updateSQL = SQLFactory.createUpdateSQL(this, "sa_esign_contract_taskmx");
|
|
|
updateSQL.setSiteid(siteid);
|
|
|
@@ -418,7 +428,7 @@ public class EsignContractTaskMX extends Controller {
|
|
|
public String agentsList3() throws YosException {
|
|
|
Long sa_agentsid = content.getLongValue("sa_agentsid");
|
|
|
|
|
|
- QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_esign_contract_taskmx", "sa_esign_contract_taskmxid","archiveddate").setTableAlias("t1");
|
|
|
+ QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_esign_contract_taskmx", "sa_esign_contract_taskmxid", "archiveddate").setTableAlias("t1");
|
|
|
querySQL.addJoinTable(JOINTYPE.inner, "sa_esign_contract_task", "t2", "t2.sa_esign_contract_taskid=t1.sa_esign_contract_taskid",
|
|
|
"taskname", "year", "senddate", "remarks");
|
|
|
querySQL.addJoinTable(JOINTYPE.inner, "sa_esign_contract_template", "t3", "t3.sa_esign_contract_templateid=t2.sa_esign_contract_templateid",
|
|
|
@@ -432,7 +442,7 @@ public class EsignContractTaskMX extends Controller {
|
|
|
for (Row row : rows) {
|
|
|
Long sa_esign_contract_taskmxid = row.getLong("sa_esign_contract_taskmxid");
|
|
|
row.put("attinfos", attachmentsMap.getOrDefault(sa_esign_contract_taskmxid, new Rows()));
|
|
|
- row.putIfAbsent("archiveddate","");
|
|
|
+ row.putIfAbsent("archiveddate", "");
|
|
|
}
|
|
|
|
|
|
return getSucReturnObject().setData(rows).toString();
|