修改删除特殊日期设置,高温设置代码,获取所有员工

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

@@ -6,11 +6,13 @@ import com.management.platform.entity.HighTemperatureSet;
 import com.management.platform.entity.SpecialDateSet;
 import com.management.platform.service.HighTemperatureSetService;
 import com.management.platform.util.HttpRespMsg;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -67,9 +69,12 @@ public class HighTemperatureSetController {
     }
 
     @RequestMapping("/deleteHigh")
-    private HttpRespMsg deleteHigh(Integer id){
+    private HttpRespMsg deleteHigh(String ids){
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-        highTemperatureSetService.removeById(id);
+        if (StringUtils.isNotEmpty(ids)){
+            String[] idArray = ids.split(",");
+            highTemperatureSetService.removeByIds(Arrays.asList(idArray));
+        }
         return httpRespMsg;
     }
 

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

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.SpecialDateSet;
 import com.management.platform.service.SpecialDateSetService;
 import com.management.platform.util.HttpRespMsg;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -64,9 +66,12 @@ public class SpecialDateSetController {
     }
 
     @RequestMapping("/deleteSpecial")
-    private HttpRespMsg deleteSpecial(Integer id){
+    private HttpRespMsg deleteSpecial(String ids){
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-        specialDateSetService.removeById(id);
+        if (StringUtils.isNotEmpty(ids)){
+            String[] idArray = ids.split(",");
+            specialDateSetService.removeByIds(Arrays.asList(idArray));
+        }
         return httpRespMsg;
     }
 

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

@@ -341,5 +341,15 @@ public class UserController {
         return allList.stream().filter(all->all.getDepartmentId().intValue() == id).findFirst().get();
     }
 
+    @RequestMapping("/getAllUserList")
+    private HttpRespMsg getAllUserList(HttpServletRequest request){
+        HttpRespMsg msg = new HttpRespMsg();
+        String token = request.getHeader("Token");
+        User user = userService.getById(token);
+        List<User> userList = userService.list(new QueryWrapper<User>().eq("company_id", user.getCompanyId()).eq("is_active", 1));
+        msg.setData(userList);
+        return msg;
+    }
+
 }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/AttendanceStaff.java

@@ -98,6 +98,12 @@ public class AttendanceStaff extends Model<AttendanceStaff> {
     @TableField("attendance_type")
     private Integer attendanceType;
 
+    @TableField(exist = false)
+    private String attendanceTypeName; //考勤状态名称
+
+    @TableField(exist = false)
+    private String color;//针对考勤状态对应的颜色
+
     @TableField(exist = false)
     private List<HashMap<String,Object>> maplist;