lamphua 1 год назад
Родитель
Сommit
87c5d70928

+ 1
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java Просмотреть файл

74
         if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
74
         if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
75
             for (String dept : underTakingDept.split(","))
75
             for (String dept : underTakingDept.split(","))
76
                 underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
76
                 underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
77
-            cmcProject.setUndertakingDept(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
77
+            cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
78
         }
78
         }
79
         return success(cmcProject);
79
         return success(cmcProject);
80
     }
80
     }

+ 13
- 1
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java Просмотреть файл

74
     private SysUser projectRegistrantUser;
74
     private SysUser projectRegistrantUser;
75
 
75
 
76
     /** 承担部门 */
76
     /** 承担部门 */
77
-    @Excel(name = "承担部门")
78
     private String undertakingDept;
77
     private String undertakingDept;
79
 
78
 
79
+    /** 承担部门 */
80
+    @Excel(name = "承担部门")
81
+    private String undertakingDeptName;
82
+
80
     /** 项目安排人 */
83
     /** 项目安排人 */
81
     @Excel(name = "项目安排人")
84
     @Excel(name = "项目安排人")
82
     private Long projectPlanner;
85
     private Long projectPlanner;
234
     {
237
     {
235
         return undertakingDept;
238
         return undertakingDept;
236
     }
239
     }
240
+    public void setUndertakingDeptName(String undertakingDeptName)
241
+    {
242
+        this.undertakingDeptName = undertakingDeptName;
243
+    }
244
+
245
+    public String getUndertakingDeptName()
246
+    {
247
+        return undertakingDeptName;
248
+    }
237
     public void setProjectPlanner(Long projectPlanner)
249
     public void setProjectPlanner(Long projectPlanner)
238
     {
250
     {
239
         this.projectPlanner = projectPlanner;
251
         this.projectPlanner = projectPlanner;

+ 1
- 1
oa-ui/src/views/flowable/form/borrowForm.vue Просмотреть файл

16
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
16
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
17
                   }}</el-descriptions-item>
17
                   }}</el-descriptions-item>
18
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
18
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
19
-                    <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
19
+                    <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
20
                   </el-descriptions-item>
20
                   </el-descriptions-item>
21
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
21
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
22
                   }}</el-descriptions-item>
22
                   }}</el-descriptions-item>

+ 1
- 1
oa-ui/src/views/flowable/form/carForm.vue Просмотреть файл

50
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
50
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
51
                   }}</el-descriptions-item>
51
                   }}</el-descriptions-item>
52
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
52
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
53
-                    <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
53
+                    <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
54
                   </el-descriptions-item>
54
                   </el-descriptions-item>
55
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
55
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
56
                   }}</el-descriptions-item>
56
                   }}</el-descriptions-item>

+ 1
- 1
oa-ui/src/views/flowable/form/deviceForm.vue Просмотреть файл

50
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
50
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
51
                     }}</el-descriptions-item>
51
                     }}</el-descriptions-item>
52
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
52
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
53
-                    <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
53
+                    <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
54
                   </el-descriptions-item>
54
                   </el-descriptions-item>
55
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
55
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
56
                     }}</el-descriptions-item>
56
                     }}</el-descriptions-item>

Загрузка…
Отмена
Сохранить