|
@@ -418,9 +418,19 @@ public class udfController {
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- //什么情况下存待办 ?
|
|
|
|
|
- //activityBo.set("CATE_ID", "30");
|
|
|
|
|
-
|
|
|
|
|
|
|
+ //活动类型
|
|
|
|
|
+ /*
|
|
|
|
|
+ if (json.containsKey("NETWORK_CATE_ID"))
|
|
|
|
|
+ activityBo.set("CATE_ID", json.getString("NETWORK_CATE_ID"));
|
|
|
|
|
+ */
|
|
|
|
|
+
|
|
|
|
|
+ for (String key : json.keySet()) {
|
|
|
|
|
+ String fieldName = key.toUpperCase();
|
|
|
|
|
+ if (fieldName.startsWith("NETWORK_")) {
|
|
|
|
|
+ fieldName = fieldName.replace("NETWORK_", "");
|
|
|
|
|
+ activityBo.set(fieldName, json.get(key));
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
activityBo.set("START_DATE", json.getString("DATE_VALUE"));
|
|
activityBo.set("START_DATE", json.getString("DATE_VALUE"));
|
|
|
activityBo.set("DESCRIPTION", json.getString("CONTENT"));
|
|
activityBo.set("DESCRIPTION", json.getString("CONTENT"));
|
|
@@ -433,11 +443,12 @@ public class udfController {
|
|
|
activityBo.set("PARENT_ID", PARENT_ID);
|
|
activityBo.set("PARENT_ID", PARENT_ID);
|
|
|
|
|
|
|
|
//完成待办
|
|
//完成待办
|
|
|
- if (json.containsKey("COMPLETE_TIME") && json.containsKey("COMPLETE_DESCRIPTION")) {
|
|
|
|
|
- activityBo.set("COMPLETE_TIME", json.getString("COMPLETE_TIME"));
|
|
|
|
|
- activityBo.set("COMPLETE_DESCRIPTION", json.getString("COMPLETE_DESCRIPTION"));
|
|
|
|
|
|
|
+ if (json.containsKey("FINISH_DATE") && json.containsKey("CONTENT")) {
|
|
|
|
|
+ activityBo.set("COMPLETE_TIME", json.getString("FINISH_DATE"));
|
|
|
|
|
+ activityBo.set("COMPLETE_DESCRIPTION", json.getString("CONTENT"));
|
|
|
activityBo.set("STATUS_ID", "828");//已完成
|
|
activityBo.set("STATUS_ID", "828");//已完成
|
|
|
- DBSql.update("update BO_EU_DNCOM_ACTIVITY set COMPLETE_TIME=?,COMPLETE_DESCRIPTION=?,STATUS_ID=? where ID=?", new Object[]{activityBo.get("COMPLETE_TIME"), activityBo.get("COMPLETE_DESCRIPTION"), "828", PARENT_ID});
|
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(PARENT_ID))
|
|
|
|
|
+ DBSql.update("update BO_EU_DNCOM_ACTIVITY set COMPLETE_TIME=?,COMPLETE_DESCRIPTION=?,STATUS_ID=? where ID=?", new Object[]{activityBo.get("COMPLETE_TIME"), activityBo.get("COMPLETE_DESCRIPTION"), "828", PARENT_ID});
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -472,10 +483,9 @@ public class udfController {
|
|
|
* 信息流查看权限
|
|
* 信息流查看权限
|
|
|
* @param userContext
|
|
* @param userContext
|
|
|
* @return
|
|
* @return
|
|
|
- * @throws IOException
|
|
|
|
|
*/
|
|
*/
|
|
|
@Mapping(value = "com.awspaas.user.apps.donenow_sys_network_perm")
|
|
@Mapping(value = "com.awspaas.user.apps.donenow_sys_network_perm")
|
|
|
- public ResponseObject networkPerm(UserContext userContext) throws IOException {
|
|
|
|
|
|
|
+ public ResponseObject networkPerm(UserContext userContext) {
|
|
|
List<String> permissions = new ArrayList<>();
|
|
List<String> permissions = new ArrayList<>();
|
|
|
Map<String, String> map = new HashMap<>();
|
|
Map<String, String> map = new HashMap<>();
|
|
|
map.put("fd55ab6b-0298-4c94-b26c-a9182d04fa7c", "ACCOUNT");//客户备注-查询
|
|
map.put("fd55ab6b-0298-4c94-b26c-a9182d04fa7c", "ACCOUNT");//客户备注-查询
|
|
@@ -501,4 +511,17 @@ public class udfController {
|
|
|
return responseObject;
|
|
return responseObject;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 获取联系人
|
|
|
|
|
+ * @param userContext
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ @Mapping(value = "com.awspaas.user.apps.donenow_sys_network_contacts")
|
|
|
|
|
+ public ResponseObject networkContacts(UserContext userContext) {
|
|
|
|
|
+ String sql = "SELECT USERID AS value,USERNAME as label FROM orguser a join VIEW_EU_SYS_DEPTPATH b on a.DEPARTMENTID=b.id WHERE closed=0 and INSTR(b.deptpath,(select id from orgdepartment where DEPARTMENTNO='gsbm' and closed=0 and companyid='" + userContext.getCompanyModel().getId() + "'))>0 ";
|
|
|
|
|
+ ResponseObject responseObject = ResponseObject.newOkResponse();
|
|
|
|
|
+ responseObject.setData(DBSql.getMaps(sql));
|
|
|
|
|
+ return responseObject;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|