Преглед на файлове

用户导入,公司LOGO与名称开发

anderx преди 2 години
родител
ревизия
e31f25a95f

+ 2 - 18
ruoyi-system/src/main/java/com/ruoyi/project/bo/ProjectTaskListOut.java

@@ -23,7 +23,7 @@ public class ProjectTaskListOut extends ProjectTask {
      */
     @Excel(name = "项目年份",dateFormat = "yyyy")
     @JsonFormat(pattern = "yyyy")
-    private Object projectYear;
+    private String projectYear;
 
     /**
      * 0=非跨年,1=跨年
@@ -60,7 +60,7 @@ public class ProjectTaskListOut extends ProjectTask {
      */
     @Excel(name = "创建年份",dateFormat = "yyyy")
     @JsonFormat(pattern = "yyyy")
-    private Object createYear;
+    private String createYear;
 
     /**
      * 创建时间
@@ -129,15 +129,7 @@ public class ProjectTaskListOut extends ProjectTask {
         this.id = id;
     }
 
-    @Override
-    public Object getProjectYear() {
-        return projectYear;
-    }
 
-    @Override
-    public void setProjectYear(Object projectYear) {
-        this.projectYear = projectYear;
-    }
 
     @Override
     public Integer getCrossYear() {
@@ -189,15 +181,7 @@ public class ProjectTaskListOut extends ProjectTask {
         this.projectStatus = projectStatus;
     }
 
-    @Override
-    public Object getCreateYear() {
-        return createYear;
-    }
 
-    @Override
-    public void setCreateYear(Object createYear) {
-        this.createYear = createYear;
-    }
 
     @Override
     public Date getCreateTime() {

+ 5 - 0
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectTaskServiceImpl.java

@@ -127,6 +127,11 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
         {
             try
             {
+                if (p.getProjectYear()==null||p.getProjectYear()==""){
+                    throw new ServiceException("项目年份不能为空");
+                }else if (p.getCreateYear()==null||p.getCreateYear()==""){
+                    throw new ServiceException("创建年份不能为空");
+                }
                 // 验证是否存在这个用户
                 ProjectTask projectTask = projectTaskMapper.selectByPrimaryKey(p.getId());
                 if (StringUtils.isNull(projectTask)){