From 674a989ac4a4f3e7b33bf45b9c283ee5d2067de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 21 Apr 2022 18:33:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/xm/core/xmProjectGroup.js | 30 -- .../src/api/xm/core/xmProjectGroupUser.js | 30 -- .../xmProjectGroup/XmProjectGroupEdit.vue | 194 ------------- .../core/xmProjectGroup/XmProjectGroupMng.vue | 269 ------------------ .../XmProjectGroupUserEdit.vue | 161 ----------- .../XmProjectGroupUserMng.vue | 258 ----------------- .../core/ctrl/XmTaskExecuserController.java | 6 +- 7 files changed, 3 insertions(+), 945 deletions(-) delete mode 100644 xm-core-ui-web/src/api/xm/core/xmProjectGroup.js delete mode 100644 xm-core-ui-web/src/api/xm/core/xmProjectGroupUser.js delete mode 100644 xm-core-ui-web/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue delete mode 100644 xm-core-ui-web/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue delete mode 100644 xm-core-ui-web/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue delete mode 100644 xm-core-ui-web/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue diff --git a/xm-core-ui-web/src/api/xm/core/xmProjectGroup.js b/xm-core-ui-web/src/api/xm/core/xmProjectGroup.js deleted file mode 100644 index 70927fce..00000000 --- a/xm-core-ui-web/src/api/xm/core/xmProjectGroup.js +++ /dev/null @@ -1,30 +0,0 @@ -import axios from '@/utils/request' - -import config from '@/common/config' - -let base = config.getCoreBasePath(); - - -/** - * xm_project_group - *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， - *2 查询、新增、修改的参数格式 params={id:'主键 主键',groupName:'团队名称',projectId:'项目编号-属于产品线则可为空',pgTypeId:'项目团队类型编号',pgTypeName:'团队类型名称',leaderUserid:'团队负责人',leaderUsername:'负责人姓名',ctime:'创建时间',ltime:'更新时间',productId:'产品编号，属于项目组的团队则可为空',branchId:'机构编号',pgClass:'团队类别0项目1产品',pgroupId:'上级团队编号',lvl:'级别0级1级2级3级4级',pidPaths:'上级编号路径逗号分割,0,开始，本组编号+逗号结束',isTpl:'是否为模板',assUserid:'副组长编号',assUsername:'副组长姓名',childrenCnt:'下级团队数量',userCnt:'组员数量',qxCode:'权限码',calcWorkload:'是否计算工作量0否1是',ntype:'节点类型0管理团队、1执行团队'} - **/ - -//普通查询 条件之间and关系 -export const listXmProjectGroup = params => { return axios.get(`${base}/xm/core/xmProjectGroup/list`, { params: params }); }; - -//模糊查询xm_project_group 条件之间or关系 -//export const listXmProjectGroupKey = params => { return axios.get(`${base}/xm/core/xmProjectGroup/listKey`, { params: params }); }; - -//删除一条xm_project_group params={id:'主键 主键'} -export const delXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/del`,params); }; - -//批量删除xm_project_group params=[{id:'主键 主键'}] -export const batchDelXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/batchDel`, params); }; - -//修改一条xm_project_group记录 -export const editXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/edit`, params); }; - -//新增一条xm_project_group -export const addXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/add`, params); }; \ No newline at end of file diff --git a/xm-core-ui-web/src/api/xm/core/xmProjectGroupUser.js b/xm-core-ui-web/src/api/xm/core/xmProjectGroupUser.js deleted file mode 100644 index 34bff9ff..00000000 --- a/xm-core-ui-web/src/api/xm/core/xmProjectGroupUser.js +++ /dev/null @@ -1,30 +0,0 @@ -import axios from '@/utils/request' - -import config from '@/common/config' - -let base = config.getCoreBasePath(); - - -/** - * xm_project_group_user - *1 默认只开放普通查询，所有查询，只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， - *2 查询、新增、修改的参数格式 params={groupId:'团队编号 主键',userid:'团队成员编号 主键',joinTime:'加入时间',username:'团队成员',outTime:'离队时间',status:'当前状态0参与中1已退出团队',obranchId:'组员原归属机构编号',isPri:'是否私人加入0否1是',seqNo:'排序号--从1开始',projectId:'项目编号',productId:'产品编号',pgClass:'0-项目，1-产品'} - **/ - -//普通查询 条件之间and关系 -export const listXmProjectGroupUser = params => { return axios.get(`${base}/xm/core/xmProjectGroupUser/list`, { params: params }); }; - -//模糊查询xm_project_group_user 条件之间or关系 -//export const listXmProjectGroupUserKey = params => { return axios.get(`${base}/xm/core/xmProjectGroupUser/listKey`, { params: params }); }; - -//删除一条xm_project_group_user params={groupId:'团队编号 主键',userid:'团队成员编号 主键'} -export const delXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/del`,params); }; - -//批量删除xm_project_group_user params=[{groupId:'团队编号 主键',userid:'团队成员编号 主键'}] -export const batchDelXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/batchDel`, params); }; - -//修改一条xm_project_group_user记录 -export const editXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/edit`, params); }; - -//新增一条xm_project_group_user -export const addXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/add`, params); }; \ No newline at end of file diff --git a/xm-core-ui-web/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/xm-core-ui-web/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue deleted file mode 100644 index fc66fb58..00000000 --- a/xm-core-ui-web/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - - \ No newline at end of file diff --git a/xm-core-ui-web/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/xm-core-ui-web/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue deleted file mode 100644 index 17e8eeeb..00000000 --- a/xm-core-ui-web/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue +++ /dev/null @@ -1,269 +0,0 @@ - - - - - \ No newline at end of file diff --git a/xm-core-ui-web/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue b/xm-core-ui-web/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue deleted file mode 100644 index 006598cd..00000000 --- a/xm-core-ui-web/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue +++ /dev/null @@ -1,161 +0,0 @@ - - - - - \ No newline at end of file diff --git a/xm-core-ui-web/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/xm-core-ui-web/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue deleted file mode 100644 index cb43592c..00000000 --- a/xm-core-ui-web/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue +++ /dev/null @@ -1,258 +0,0 @@ - - - - - \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index ab1459a8..95996c53 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -170,9 +170,9 @@ public class XmTaskExecuserController { } if("1".equals(xmTask.getCrowd()) && "1".equals(xmTask.getTaskOut())){ - tips=mkClient.checkMemberInterests(xmTaskExecuser.getUserid(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); - if(!tips.isOk()){ - return ResponseHelper.failed(tips); + Tips tips2=mkClient.checkMemberInterests(xmTaskExecuser.getUserid(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); + if(!tips2.isOk()){ + return ResponseHelper.failed(tips2); } }