wu 2 недель назад
Родитель
Сommit
c027dd1292

+ 10 - 0
src/custom/restcontroller/R.java

@@ -7180,6 +7180,16 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2026041715520802 {
+        public static class v1 {
+        }
+    }
+
+    public static class ID2026041810335702 {
+        public static class v1 {
+        }
+    }
 }
 
 

+ 67 - 11
src/custom/restcontroller/webmanage/sale/contracttask/EsignContractTaskMX.java

@@ -329,17 +329,17 @@ public class EsignContractTaskMX extends Controller {
                 , templateId, flowApproverInfos);
         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);
@@ -382,5 +382,61 @@ public class EsignContractTaskMX extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
+    @API(title = "区域经理查询自己管辖的经销商合同", apiversion = R.ID2026041715520802.v1.class)
+    public String agentsList2() throws YosException {
+
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_esign_contract_taskmx", "*").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",
+                "name", "type");
+        querySQL.addJoinTable(JOINTYPE.inner, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid",
+                "agentnum");
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid", "enterprisename", "abbreviation");
+        if (getDepartment(userid).getString("depname").equals("区域经理")) {
+            querySQL.setWhere(" exists(select 1 from  sys_enterprise_tradefield where sa_agentsid=t1.sa_agentsid and hrid=" + hrid + " )");
+        }
+        querySQL.setSiteid(siteid);
+        querySQL.setPage(pageSize, pageNumber);
+        Rows rows = querySQL.query();
+
+        RowsMap attachmentsMap = Attachment.get(this, "sa_esign_contract_taskmx", rows.toArrayList("sa_esign_contract_taskmxid", new ArrayList<>()));
+        for (Row row : rows) {
+            String flowid = row.getString("flowid");
+            if (!StringUtils.isBlank(flowid)) {
+                row.put("downloadurl", WeChatContractUtil.describeFileUrls(flowid));
+            }
+            row.putIfAbsent("downloadurl", "");
+            Long sa_esign_contract_taskmxid = row.getLong("sa_esign_contract_taskmxid");
+            row.put("attinfos", attachmentsMap.getOrDefault(sa_esign_contract_taskmxid, new Rows()));
+        }
+
+        return getSucReturnObject().setData(rows).toString();
+    }
+
+    @API(title = "经销商档案详情中的合同查询列表", apiversion = R.ID2026041810335702.v1.class)
+    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.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",
+                "name", "type");
+        querySQL.setWhere("t1.sa_agentsid", sa_agentsid);
+        querySQL.setSiteid(siteid);
+        querySQL.setPage(pageSize, pageNumber);
+        Rows rows = querySQL.query();
+
+        RowsMap attachmentsMap = Attachment.get(this, "sa_esign_contract_taskmx", rows.toArrayList("sa_esign_contract_taskmxid", new ArrayList<>()));
+        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","");
+        }
+
+        return getSucReturnObject().setData(rows).toString();
+    }
+
 
 }