Explorar o código

新增获取公司部门数据

anderx hai 4 meses
pai
achega
7d770793ef

+ 18 - 7
ruoyi-system/src/main/java/com/ruoyi/project/bo/pushDataProject.java

@@ -6,9 +6,26 @@ public class pushDataProject {
     private String projectNumber;
     private String startTime;
     private String endTime;
-    private String projectyear;
+    private String projectYear;
+    private String createYear;
     private String staffIds;
 
+    public String getProjectYear() {
+        return projectYear;
+    }
+
+    public void setProjectYear(String projectYear) {
+        this.projectYear = projectYear;
+    }
+
+    public String getCreateYear() {
+        return createYear;
+    }
+
+    public void setCreateYear(String createYear) {
+        this.createYear = createYear;
+    }
+
     public String getProjectName() {
         return projectName;
     }
@@ -49,13 +66,7 @@ public class pushDataProject {
         this.endTime = endTime;
     }
 
-    public String getProjectyear() {
-        return projectyear;
-    }
 
-    public void setProjectyear(String projectyear) {
-        this.projectyear = projectyear;
-    }
 
     public String getStaffIds() {
         return staffIds;

+ 13 - 2
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectTaskServiceImpl.java

@@ -610,10 +610,21 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
             ProjectTask projectTask = new ProjectTask();
             projectTask.setName(e.getProjectName());
             projectTask.setProjectNumber(e.getProjectNumber());
-            projectTask.setAid(Long.valueOf(e.getAid()));
+            projectTask.setProjectStatus(0);
+            if (e.getAid()!=null){
+                SysUser sysUser = userMapper.selectByKyId(e.getAid());
+                if (sysUser!=null){
+                    projectTask.setAdminName(sysUser.getNickName());
+                    projectTask.setAid(sysUser.getUserId());
+                }
+            }
             projectTask.setStartTime(DateUtils.parseDate(e.getStartTime()));
             projectTask.setEndTime(DateUtils.parseDate(e.getEndTime()));
-            projectTask.setProjectYear(e.getProjectyear());
+            projectTask.setProjectYear(e.getProjectYear());
+            projectTask.setCreateYear(e.getCreateYear());
+            projectTask.setCrossYear(0);
+            projectTask.setDuration(0d);
+            projectTask.setCreateTime(new Date());
             projectTaskMapper.insert(projectTask);
             if (e.getStaffIds()!=null){
                 String[] split = e.getStaffIds().split(",");