Browse Source

新增项目特色工作删除

anderx 1 year ago
parent
commit
2a4169d157

+ 3 - 3
src/main/java/com/goafanti/common/model/TaskFeature.java

@@ -23,12 +23,14 @@ public class TaskFeature implements Serializable {
 /**
      * 检查开始时间
      */
+
     private Date startTime;
 /**
      * 检查结束时间
      */
+
     private Date endTime;
-/**
+    /**
      * 检查部门
      */
     private String depName;
@@ -102,7 +104,6 @@ public class TaskFeature implements Serializable {
     public Date getStartTime() {
         return startTime;
     }
-
     public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
@@ -110,7 +111,6 @@ public class TaskFeature implements Serializable {
     public Date getEndTime() {
         return endTime;
     }
-
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }

+ 25 - 0
src/main/java/com/goafanti/techproject/bo/InputTaskFeature.java

@@ -0,0 +1,25 @@
+package com.goafanti.techproject.bo;
+
+import com.goafanti.common.model.TaskFeature;
+
+public class InputTaskFeature  extends TaskFeature {
+
+    private String startTimeStr;
+    private String endTimeStr;
+
+    public String getStartTimeStr() {
+        return startTimeStr;
+    }
+
+    public void setStartTimeStr(String startTimeStr) {
+        this.startTimeStr = startTimeStr;
+    }
+
+    public String getEndTimeStr() {
+        return endTimeStr;
+    }
+
+    public void setEndTimeStr(String endTimeStr) {
+        this.endTimeStr = endTimeStr;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.model.TaskDetails;
 import com.goafanti.common.model.TaskDetailsLog;
 import com.goafanti.common.model.TaskFeature;
+import com.goafanti.techproject.bo.InputTaskFeature;
 import com.goafanti.techproject.service.TaskDetailsService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -121,7 +122,7 @@ public class TaskDetailsController extends BaseController {
      * @return
      */
     @PostMapping("/addTaskFeature")
-    public Result<TaskFeature> addTaskFeature(TaskFeature in) {
+    public Result<TaskFeature> addTaskFeature(InputTaskFeature in ) {
         Result<TaskFeature> res = new Result<>();
         return res.data(this.taskDetailsService.addFeature(in));
     }
@@ -133,7 +134,7 @@ public class TaskDetailsController extends BaseController {
      * @return 编辑结果
      */
     @PostMapping("/updateTaskFeature")
-    public Result<TaskFeature> updateTaskFeature(TaskFeature in) {
+    public Result<TaskFeature> updateTaskFeature(InputTaskFeature in) {
         return new Result<>().data(this.taskDetailsService.updateFeature(in));
     }
 

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

@@ -3,6 +3,7 @@ package com.goafanti.techproject.service;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.TaskDetails;
 import com.goafanti.common.model.TaskFeature;
+import com.goafanti.techproject.bo.InputTaskFeature;
 import com.goafanti.techproject.bo.TaskDetailsBo;
 
 /**
@@ -60,12 +61,12 @@ public interface TaskDetailsService {
 
     boolean checkTid(TaskDetails taskDetails);
 
-    TaskFeature addFeature(TaskFeature in);
+    TaskFeature addFeature(InputTaskFeature in);
 
 
 
 
-    TaskFeature updateFeature(TaskFeature in);
+    TaskFeature updateFeature(InputTaskFeature in);
 
     Object logList(Integer id);
 

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

@@ -3,11 +3,13 @@ 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.DateUtils;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.techproject.bo.InputTaskFeature;
 import com.goafanti.techproject.bo.OutTaskDetailsBo;
 import com.goafanti.techproject.bo.TaskDetailsBo;
 import com.goafanti.techproject.service.TaskDetailsService;
@@ -363,14 +365,18 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
     }
 
     @Override
-    public TaskFeature addFeature(TaskFeature in) {
+    public TaskFeature addFeature(InputTaskFeature in) {
         in.setCreateTime(new Date());
+        if (in.getStartTimeStr()!=null)in.setStartTime(DateUtils.parseDate(in.getStartTimeStr()));
+        if (in.getEndTimeStr()!=null)in.setEndTime(DateUtils.parseDate(in.getEndTimeStr()));
         taskFeatureMapper.insert(in);
         return in;
     }
 
     @Override
-    public TaskFeature updateFeature(TaskFeature in) {
+    public TaskFeature updateFeature(InputTaskFeature in) {
+        if (in.getStartTimeStr()!=null)in.setStartTime(DateUtils.parseDate(in.getStartTimeStr()));
+        if (in.getEndTimeStr()!=null)in.setEndTime(DateUtils.parseDate(in.getEndTimeStr()));
         taskFeatureMapper.update(in);
         return taskFeatureMapper.selectById(in.getId());
     }