Merge remote-tracking branch 'origin/master'

boman-api/boman-domain/src/main/java/com.boman.domain/constant/AttendanceConst.java

@@ -11,6 +11,10 @@ public class AttendanceConst {
     public static final String ATTENDANCE_USER_NAME = "attendance_table_username";
     /** 考勤人员姓名id **/
     public static final String ATTENDANCE_USER_ID = "user_id";
+    /**
+     * 考勤人员部门id
+     */
+    public static final String ATTENDANCE_DEPT_ID = "dept_id";
 
     /** 是否考勤异常 **/
     public static final String ATTENDANCE_ABNORMAL = "attendance_abnormal";

boman-api/boman-domain/src/main/java/com.boman.domain/dto/Base64Dto.java

@@ -0,0 +1,20 @@
+package com.boman.domain.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author shiqian
+ * @date 2021年08月03日 11:24
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Base64Dto {
+
+    private String file;
+    private String base64;
+}

boman-modules/boman-file/src/main/java/com/boman/file/controller/SysFileController.java

@@ -1,6 +1,7 @@
 package com.boman.file.controller;
 
 import com.boman.domain.dto.AjaxResult;
+import com.boman.domain.dto.Base64Dto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,11 +50,12 @@ public class SysFileController
     }
 
     /**
-     * 通用上传请求
+     * 通用上传请求 暂且如此处理，后来再优化
      */
     @PostMapping("/upload/base64")
-    public AjaxResult uploadFileBase64(@RequestBody String base64) {
+    public AjaxResult uploadFileBase64(@RequestBody Base64Dto dto) {
         try {
+            String base64 = dto.getFile();
             String url = sysFileService.uploadFileBase64(base64);
             AjaxResult ajax = AjaxResult.success();
             ajax.put("name", FileUtils.getName(url));

boman-web-core/src/main/java/com/boman/web/core/BomanWebCoreApplication.java

@@ -7,6 +7,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.context.annotation.ComponentScan;
 
+import java.util.TimeZone;
+
 /**
  * web-core
  *

boman-web-core/src/main/java/com/boman/web/core/domain/TableContext.java

@@ -111,7 +111,7 @@ public class TableContext {
             String[] maskArray = requireNonNull(column.getMask(), "mask is empty, columnName = " + column.getColumnName()).split("");
             assert maskArray.length == 6;
             // 新增可见 修改可见
-            String insertVisible = maskArray[0], updateVisible = maskArray[2];
+            //String insertVisible = maskArray[0], updateVisible = maskArray[2];
             // 新增可修改 修改可修改
             String insertCanEdit = maskArray[1], updateCanEdit = maskArray[3];
             for (Map.Entry<String, Object> entry : fixedData.entrySet()) {
@@ -119,7 +119,7 @@ public class TableContext {
                     // 新增
                     if (ActionType.INSERT.equals(context.getActionType())) {
                         // 新增可可见, 并且新增修改，把新增的字段单独拿出来
-                        if (INSERT_CAN_EDIT.equals(insertCanEdit) && INSERT_VISIBLE.equals(insertVisible)) {
+                        if (INSERT_CAN_EDIT.equals(insertCanEdit)) {
                             commitData.put(entry.getKey(), entry.getValue());
                         } else {
                             // 如果新增不可见，新增也不可以修改，但是你是外键的话或者是计算以后的值，就可以修改
@@ -129,7 +129,7 @@ public class TableContext {
                         }
                     } else {
                         // 编辑可见, 并且编辑可修改
-                        if (UPDATE_CAN_EDIT.equals(updateCanEdit) && UPDATE_VISIBLE.equals(updateVisible)) {
+                        if (UPDATE_CAN_EDIT.equals(updateCanEdit)) {
                             commitData.put(entry.getKey(), entry.getValue());
                         } else {
                             // 如果编辑不可见，编辑也不可以修改，但是你是外键的话或者是计算以后的值，就可以修改

boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceServiceImpl.java

@@ -168,13 +168,21 @@ public class AttendanceServiceImpl implements AttendanceService {
             Map<String, Object> map = new HashMap<>(5);
             Object attendanceTableWork = jsonObject.get("attendance_table_work");
             Object attendanceTableOffWork = jsonObject.get("attendance_table_offwork");
+            Object attendanceTableWorkPm = jsonObject.get("attendance_table_work_pm");
+            Object attendanceTableOffWorkPm = jsonObject.get("attendance_table_offwork_pm");
             map.put("attendanceTableWork", "未打卡");
             map.put("attendanceTableOffWork", "未打卡");
             if (isNotEmpty(attendanceTableWork)) {
-                map.put("attendanceTableWork", attendanceTableWork + "已打卡");
+                map.put("attendanceTableWork", attendanceTableWork + " 已打卡");
             }
             if (isNotEmpty(attendanceTableOffWork)) {
-                map.put("attendanceTableWork", attendanceTableOffWork + "已打卡");
+                map.put("attendanceTableWork", attendanceTableOffWork + " 已打卡");
+            }
+            if (isNotEmpty(attendanceTableWorkPm)) {
+                map.put("attendanceTableWorkPm", attendanceTableWorkPm + " 已打卡");
+            }
+            if (isNotEmpty(attendanceTableOffWorkPm)) {
+                map.put("attendanceTableOffWorkPm", attendanceTableOffWorkPm + " 已打卡");
             }
 
             map.put("dateTime", jsonObject.get("attendance_table_week") + " " + jsonObject.get("attendance_table_todaytime"));
@@ -292,6 +300,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         commitData.put(ATTENDANCE_TABLE_LONGITUDE, dto.getLongitude());
         commitData.put(ATTENDANCE_TABLE_LATITUDE, dto.getLatitude());
         commitData.put(ATTENDANCE_USER_ID, SecurityUtils.getUserId());
+        commitData.put(ATTENDANCE_DEPT_ID, AuthUtils.getLoginUser().getSysUser().getDeptId());
         Timestamp currentTime = new Timestamp(System.currentTimeMillis());
         // 是否请假
         if (checkIsLeave()) {
@@ -299,6 +308,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         }
 
         UpdateDto updateDto = new UpdateDto();
+        //如果是更新
         JSONObject commitDataUpdate = new JSONObject();
         if (GO_TO_WORK_TYPE == type) {
             if (checkIsLate(currentTime,type)) {