|
@@ -18,8 +18,11 @@ import com.dingtalk.api.response.OapiUserListidResponse;
|
|
|
import com.dingtalk.api.response.OapiV2DepartmentListsubidResponse;
|
|
|
import com.dingtalk.api.response.OapiV2UserGetResponse;
|
|
|
import com.malk.pro.zyjn.service.TongbuService;
|
|
|
+import com.malk.server.aliwork.YDConf;
|
|
|
+import com.malk.server.aliwork.YDParam;
|
|
|
import com.malk.server.common.McR;
|
|
|
import com.malk.server.dingtalk.DDR_New;
|
|
|
+import com.malk.service.aliwork.YDClient;
|
|
|
import com.malk.service.dingtalk.DDClient;
|
|
|
import com.malk.utils.UtilHttp;
|
|
|
import com.malk.utils.UtilMap;
|
|
@@ -45,6 +48,9 @@ public class TongbuServiceImpl implements TongbuService {
|
|
|
@Autowired
|
|
|
private DDClient ddClient;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private YDClient ydClient;
|
|
|
+
|
|
|
public static com.aliyun.dingtalkcalendar_1_0.Client createClient() throws Exception {
|
|
|
com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
|
|
|
config.protocol = "https";
|
|
@@ -804,4 +810,23 @@ public class TongbuServiceImpl implements TongbuService {
|
|
|
|
|
|
return McR.success(uniqueDeptList);
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public McR query(String formUuid, Map conditions, Map argument,int currentPage) {
|
|
|
+ List<Map> data = (List<Map>) ydClient.queryData(YDParam.builder()
|
|
|
+ .formUuid(formUuid)
|
|
|
+ .searchFieldJson(JSONObject.toJSONString(conditions))
|
|
|
+ .instanceStatus(UtilMap.getString(argument, "instanceStatus"))
|
|
|
+ .approvedResult(UtilMap.getString(argument, "approvedResult"))
|
|
|
+ .createFromTimeGMT(UtilMap.getString(argument,"createFrom"))
|
|
|
+ .currentPage(currentPage)
|
|
|
+ .pageSize(100)
|
|
|
+ .appType("APP_E0BKS4I6U44824QM1KE5")
|
|
|
+ .systemToken("U0E66VB1J86UR5RKDPXQTA7WM66K3896KHW8MS5")
|
|
|
+ .userId("253434204020308091")//任欢欢
|
|
|
+ .build(), YDConf.FORM_QUERY.retrieve_search_process).getData();
|
|
|
+
|
|
|
+
|
|
|
+ return McR.success(data);
|
|
|
+ }
|
|
|
}
|