Procházet zdrojové kódy

项目进度详情开发

anderx před 1 rokem
rodič
revize
e98ad71408

+ 2 - 2
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -2051,9 +2051,9 @@ public class NewExcelUtil<T> {
 			else if(i==32){
 				StringBuilder res= new StringBuilder();
 				if (o.getPhasedType()==1){
-					res.append("月度");
+					res.append("月度- ");
 				}else if (o.getPhasedType()==2){
-					res.append("季度/ ");
+					res.append("季度- ");
 				}
 				String[] split = o.getPhasedContent().split(",");
                 for (String s : split) {

+ 2 - 3
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -107,9 +107,8 @@ public class TaskDetailsController extends BaseController {
      * @return
      */
     @GetMapping("/export")
-    public Result<TaskDetails> export(Integer id) {
-
-        return new Result<>().data(this.taskDetailsService.export(id));
+    public Result export(Integer id) {
+        return this.taskDetailsService.export(id);
     }
 
 }

+ 2 - 1
src/main/java/com/goafanti/techproject/service/TaskDetailsService.java

@@ -1,5 +1,6 @@
 package com.goafanti.techproject.service;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.TaskDetails;
 import com.goafanti.techproject.bo.TaskDetailsBo;
 
@@ -54,7 +55,7 @@ public interface TaskDetailsService {
 
     TaskDetailsBo getByTid(Integer id);
 
-    Object export(Integer id);
+    Result export(Integer id);
 
     boolean checkTid(TaskDetails taskDetails);
 }

+ 2 - 1
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.techproject.service.impl;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
 import com.goafanti.common.utils.excel.NewExcelUtil;
@@ -261,7 +262,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
 
 
     @Override
-    public Object export(Integer id) {
+    public Result export(Integer id) {
         OutTaskDetailsBo res = new OutTaskDetailsBo();
         NewExcelUtil<OutTaskDetailsBo> excel=new NewExcelUtil<>(OutTaskDetailsBo.class);
         TaskDetailsBo byTid = getByTid(id);