Merge remote-tracking branch 'origin/master'

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

@@ -4,6 +4,7 @@ package com.management.platform.controller;
 import com.management.platform.entity.AttachmentCenter;
 import com.management.platform.entity.User;
 import com.management.platform.mapper.*;
+import com.management.platform.service.ProductService;
 import com.management.platform.task.SFTPAsyncUploader;
 import com.management.platform.util.DocumentTypeUtil;
 import com.management.platform.util.FileUtil;
@@ -37,6 +38,8 @@ import java.util.concurrent.Executors;
 @RestController
 @RequestMapping("/attachment")
 public class AttachmentCenterController {
+    @Resource
+    private ProductService productService;
     @Resource
     private HttpServletRequest request;
 
@@ -170,5 +173,11 @@ public class AttachmentCenterController {
         }
         return msg;
     }
+
+    @RequestMapping("/attachmentList")
+    public HttpRespMsg attachmentList(Integer moduleId, String moduleCode){
+        // 根据 moduleId 和 moduleCode 查询 attachment_center 表
+        return productService.attachmentList(moduleId, moduleCode);
+    }
 }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/AttachmentCenter.java

@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -53,6 +56,8 @@ public class AttachmentCenter extends Model<AttachmentCenter> {
     private String creatorName;
 
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime indate;
 
     /**

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

@@ -26,4 +26,6 @@ public interface ProductService extends IService<Product> {
     HttpRespMsg getDetail(Integer id);
 
     HttpRespMsg recycleList(Integer pageIndex, Integer pageSize);
+
+    HttpRespMsg attachmentList(Integer moduleId, String moduleCode);
 }

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

@@ -71,6 +71,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     private DepartmentMapper departmentMapper;
     @Resource
     private DepartmentOtherManagerMapper departmentOtherManagerMapper;
+    @Resource
+    private AttachmentCenterMapper attachmentCenterMapper;
 
     @Override
     public HttpRespMsg getList(Integer companyId,String userId, String productName, String productCode, Integer pageIndex, Integer pageSize) {
@@ -464,4 +466,14 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         return list;
     }
 
+    @Override
+    public HttpRespMsg attachmentList(Integer moduleId, String moduleCode) {
+        HttpRespMsg msg=new HttpRespMsg();
+        // 获取 attachment_center 表里所有的数据
+        List<AttachmentCenter> attachmentCenterList = attachmentCenterMapper.selectList(new LambdaQueryWrapper<AttachmentCenter>()
+                .eq(AttachmentCenter::getModuleId, moduleId)
+                .eq(AttachmentCenter::getModuleCode, moduleCode));
+        msg.setData(attachmentCenterList);
+        return msg;
+    }
 }

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

@@ -758,11 +758,11 @@ public class FeishuInfoController {
                         if(optional.isPresent()){
                             user.setId(optional.get().getId());
                         }else {
-                            user.setId(SnowFlake.nextId()+"");
+                            user.setId(SnowFlake.nextId()+"")
+                                .setRoleId(role.getId())//默认普通员工
+                                .setRoleName(role.getRolename());
                         }
-                        user.setRoleId(role.getId())//默认普通员工
-                                .setRoleName(role.getRolename())
-                                .setCompanyId(feishuInfo.getCompanyId())
+                        user.setCompanyId(feishuInfo.getCompanyId())
                                 .setName(userJson.getString("name"))
                                 .setFeishuUserid(openUserid)
                                 .setColor(ColorUtil.randomColor())
@@ -892,7 +892,7 @@ public class FeishuInfoController {
                 department.setCompanyId(feishuInfo.getCompanyId());
                 department.setDepartmentName(departmentName);
                 department.setFeishuDeptid(openDepartmentId);
-                Optional<Department> optional = allDepartmentList.stream().filter(a -> a.getFeishuDeptid().equals(openDepartmentId)).findFirst();
+                Optional<Department> optional = allDepartmentList.stream().filter(a ->a.getFeishuDeptid()!=null&& a.getFeishuDeptid().equals(openDepartmentId)).findFirst();
                 if(optional.isPresent()){
                     department.setDepartmentId(optional.get().getDepartmentId());
                 }
@@ -969,11 +969,11 @@ public class FeishuInfoController {
                 if(optional.isPresent()){
                     user.setId(optional.get().getId());
                 }else {
-                    user.setId(SnowFlake.nextId()+"");
+                    user.setId(SnowFlake.nextId()+"")
+                        .setRoleId(role.getId())//默认普通员工
+                        .setRoleName(role.getRolename());
                 }
-                user.setRoleId(role.getId())//默认普通员工
-                        .setRoleName(role.getRolename())
-                        .setCompanyId(feishuInfo.getCompanyId())
+                user.setCompanyId(feishuInfo.getCompanyId())
                         .setName(userJson.getString("name"))
                         .setFeishuUserid(openUserid)
                         .setColor(ColorUtil.randomColor())

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

@@ -194,8 +194,9 @@ public class UserWithBeisenController {
                     Stream<JSONObject> overTimeStream = allOverTimeList.stream().map(elment -> (JSONObject) elment);
                     Optional<UserWithBeisen> beisen = userWithBeisenList.stream().filter(u -> u.getJobNumber() != null && u.getJobNumber().equals(first.get().getJobNumber())).findFirst();
                     if(beisen.isPresent()){
+                        //审核通过以及审批中都算
                         List<JSONObject> overTimeList = overTimeStream.filter(a -> a.getString("StaffId").equals(beisen.get().getUserId())
-                                && a.getIntValue("ApproveStatus") == 2).collect(Collectors.toList());
+                                && (a.getIntValue("ApproveStatus") == 1||a.getIntValue("ApproveStatus") == 2)).collect(Collectors.toList());
                         if(overTimeList.size()>0){
                             double actualOverTimeDuration = overTimeList.stream().mapToDouble(i -> i.getDouble("ActualOverTimeDuration")).sum();
                             if(workDay){