客户文件上传

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/oss/service/OssService.java

@@ -95,13 +95,15 @@ public class OssService extends ServiceImpl<OssServiceMapper,WorkAttachment> {
                 //排序赋值
                 workAttachment.setSort(i);
                 //基础信息赋值
-                workAttachment.getCreateBy().setId(id);
+                //workAttachment.getCreateBy().setId(id);
                 workAttachment.setCreateDate(new Date());
-                workAttachment.getUpdateBy().setId(id);
+                //workAttachment.getUpdateBy().setId(id);
                 workAttachment.setUpdateDate(new Date());
                 workAttachment.setDelFlag(0);
                 i++;
-                ossServiceMapper.insert(workAttachment);
+
+                UserDTO userDTO = UserUtils.getCurrentUserDTO();
+                ossServiceMapper.insertWorkAttachment(workAttachment, userDTO);
             }
             log.info("保存操作执行完成");
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/controller/WorkClientController.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.TicketQueryUtils;
+import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.projectRecords.domain.Project;
 import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
 import com.jeeplus.test.workClientInfo.domain.dto.PageInfoDto;
@@ -40,6 +42,14 @@ public class WorkClientController {
         String[] dates = workClientInfo.getCreateDates();
         QueryWrapper<WorkClientInfo> workClientInfoQueryWrapper = QueryWrapperGenerator.buildQueryCondition(workClientInfo, WorkClientInfo.class);
         IPage<WorkClientInfo> list = workClientService.list(page,workClientInfoQueryWrapper,dates);
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        for (WorkClientInfo info: list.getRecords()) {
+            if(userDTO.getName().equals(info.getCreateBy()) || userDTO.isAdmin()){
+                info.setCreateFlag("1");
+            }else{
+                info.setCreateFlag("0");
+            }
+        }
         return ResponseEntity.ok (list);
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/domain/WorkClientInfo.java

@@ -155,4 +155,7 @@ public class WorkClientInfo extends BaseEntity {
 
     @TableField(exist = false)
     private String[] createDates;
+
+    @TableField(exist = false)
+    private String createFlag;  //创建状态
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/service/WorkClientService.java

@@ -134,13 +134,20 @@ public class WorkClientService {
             int j = 1;
             for (WorkAttachment i : workAttachments) {
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
-                i.getCreateBy().setId(dto.getId());
+
+                //文件类型处理
+                List<String> strings = Arrays.asList(dto.getName().split("\\."));
+                if (CollectionUtils.isNotEmpty(strings)) {
+                    i.setType(strings.get(1));
+                }
+                i.setDelFlag(0);
+
+                UserDTO userDTO = UserUtils.getCurrentUserDTO();
                 i.setCreateDate(new Date());
-                i.getUpdateBy().setId(dto.getId());
                 i.setUpdateDate(new Date());
                 i.setAttachmentId(id);
                 i.setSort(j);
-                ossServiceMapper.insert(i);
+                ossServiceMapper.insertWorkAttachment(i, userDTO);
                 j++;
             }
         }