任务完成添加动态

出差管理 加删除
出差管理 相关修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/BusinessTripController.java

@@ -1,29 +1,16 @@
 package com.management.platform.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.BusinessTrip;
-import com.management.platform.entity.Department;
-import com.management.platform.entity.LeaveSheet;
-import com.management.platform.entity.User;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.DepartmentMapper;
-import com.management.platform.mapper.SysFunctionMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.BusinessTripService;
-import com.management.platform.service.DepartmentService;
-import com.management.platform.service.LeaveSheetService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -64,8 +51,8 @@ public class BusinessTripController {
     }
 
     @RequestMapping("/list")
-    public HttpRespMsg list(BusinessTrip sheet, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return businessTripService.queryList(sheet, pageIndex, pageSize);
+    public HttpRespMsg list(BusinessTrip sheet, @RequestParam Integer pageIndex, @RequestParam Integer pageSize,@RequestParam(defaultValue = "0") Integer checkState) {
+        return businessTripService.queryList(sheet, pageIndex, pageSize,checkState);
     }
 
     @RequestMapping("/approve")

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -272,6 +273,7 @@ public class TaskController {
     @RequestMapping("/finish")
     public HttpRespMsg finish(Task task) {
         HttpRespMsg msg = new HttpRespMsg();
+        DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
         //进行完成操作时需要检查子任务是否全部完成
@@ -303,7 +305,14 @@ public class TaskController {
                     }
                 }
             }
-
+            TaskComment taskComment=new TaskComment();
+            taskComment.setUserName(user.getName());
+            taskComment.setContent(user.getName()+ df.format(LocalDateTime.now())+"完成了任务");
+            taskComment.setTaskId(task.getId());
+            taskComment.setUserId(user.getId());
+            taskComment.setCreateTime(LocalDateTime.now());
+            taskComment.setType(3);
+            taskCommentMapper.insert(taskComment);
         } else if (task.getTaskStatus() == 1) {
             task.setTaskStatus(0);
         } else {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/BusinessTripService.java

@@ -1,8 +1,7 @@
 package com.management.platform.service;
 
-import com.management.platform.entity.BusinessTrip;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.entity.LeaveSheet;
+import com.management.platform.entity.BusinessTrip;
 import com.management.platform.util.HttpRespMsg;
 
 /**
@@ -21,7 +20,7 @@ public interface BusinessTripService extends IService<BusinessTrip> {
 
     HttpRespMsg deny(Integer id, String denyReason);
 
-    HttpRespMsg queryList(BusinessTrip sheet, Integer pageIndex, Integer pageSize);
+    HttpRespMsg queryList(BusinessTrip sheet, Integer pageIndex, Integer pageSize,Integer checkState);
 
     HttpRespMsg delete(Integer id);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/BusinessTripServiceImpl.java

@@ -88,12 +88,18 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
 
     @Override
     public HttpRespMsg delete(Integer id) {
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer cut = bustripProjectMapper.selectCount(new QueryWrapper<BustripProject>().eq("bustrip_id", id));
+        if(cut>0){
+            msg.setError("请清空项目关联信息");
+            return msg;
+        }
         businessTripMapper.deleteById(id);
-        return new HttpRespMsg();
+        return msg;
     }
 
     @Override
-    public HttpRespMsg queryList(BusinessTrip sheet, Integer pageIndex, Integer pageSize) {
+    public HttpRespMsg queryList(BusinessTrip sheet, Integer pageIndex, Integer pageSize,Integer checkState) {
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
         QueryWrapper<BusinessTrip> queryWrapper = new QueryWrapper<BusinessTrip>();
@@ -142,6 +148,9 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
         if (sheet.getStartDate() != null && sheet.getEndDate() != null) {
             queryWrapper.le("start_date", sheet.getEndDate()).ge("end_date", sheet.getStartDate());
         }
+        if (checkState==1){
+            queryWrapper.ge("day_count",10);
+        }
         IPage<BusinessTrip> listIPager = businessTripMapper.selectPage(new Page<>(pageIndex, pageSize),
                 queryWrapper);
         List<BusinessTrip> records = listIPager.getRecords();