Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/oss/domain/WorkAttachment.java

@@ -3,11 +3,12 @@ package com.jeeplus.test.oss.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
 import lombok.Data;
 
 @Data
 @TableName("work_attachment")
-public class WorkAttachment extends BaseEntity {
+public class WorkAttachment extends BaseDTO {
 
     /**
      * 附件地址

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/oss/mapper/OssServiceMapper.java

@@ -1,7 +1,13 @@
 package com.jeeplus.test.oss.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.jeeplus.test.oss.domain.WorkAttachment;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
 
@@ -9,4 +15,5 @@ public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
 
     void updateProjectRecord(String id);
 
+    List<WorkAttachment> findList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/oss/mapper/xml/OssServiceMapper.xml

@@ -31,4 +31,14 @@
         id = #{id})
   </update>
 
+    <select id="findList" resultType="com.jeeplus.test.oss.domain.WorkAttachment">
+        SELECT a.id, a.url, a.type, a.attachment_id, a.attachment_name, a.attachment_flag,
+        a.module_type, a.attachment_type, a.file_size, a.sort, a.description,
+        a.create_date, a.create_by as "create_by.id", su.name as "createBy.name" , a.update_date, a.update_by as "updateBy.id", a.del_flag
+         FROM work_attachment a
+         left join sys_user su on su.id = a.create_by
+         ${ew.customSqlSegment}
+         ORDER BY a.sort ASC;
+    </select>
+
 </mapper>

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

@@ -6,8 +6,10 @@ import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.OSSObject;
 import com.aliyun.oss.model.SimplifiedObjectMeta;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.oss.domain.WorkAttachment;
@@ -93,9 +95,9 @@ public class OssService extends ServiceImpl<OssServiceMapper,WorkAttachment> {
                 //排序赋值
                 workAttachment.setSort(i);
                 //基础信息赋值
-                workAttachment.setCreateBy(id);
+                workAttachment.getCreateBy().setId(id);
                 workAttachment.setCreateDate(new Date());
-                workAttachment.setUpdateBy(id);
+                workAttachment.getUpdateBy().setId(id);
                 workAttachment.setUpdateDate(new Date());
                 workAttachment.setDelFlag(0);
                 i++;
@@ -140,18 +142,14 @@ public class OssService extends ServiceImpl<OssServiceMapper,WorkAttachment> {
      * @return
      */
     public List<WorkAttachment> findFileList(String attachmentId) {
+
         log.info("文件查询开始，入参：{}" , attachmentId);
-        LambdaQueryWrapper<WorkAttachment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(WorkAttachment::getAttachmentId, attachmentId);
-        lambdaQueryWrapper.orderByAsc(WorkAttachment::getSort);
-        List<WorkAttachment> list = ossServiceMapper.selectList(lambdaQueryWrapper);
+        QueryWrapper<WorkAttachment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq ("a.attachment_id", attachmentId );
+        List<WorkAttachment> list = ossServiceMapper.findList(queryWrapper);
         //创建人和文件名称处理
         if (CollectionUtil.isNotEmpty(list)) {
             temporaryUrl(list);
-            for (WorkAttachment workAttachment : list) {
-                UserDTO userDTO = UserUtils.get(workAttachment.getCreateBy());
-                workAttachment.setCreateBy(userDTO.getName());
-            }
         }
         log.info("文件查询结束，查询结果：{}" , JSONObject.toJSONString(list));
         return list;

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

@@ -134,9 +134,9 @@ public class WorkClientService {
             int j = 1;
             for (WorkAttachment i : workAttachments) {
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
-                i.setCreateBy(dto.getId());
+                i.getCreateBy().setId(dto.getId());
                 i.setCreateDate(new Date());
-                i.setUpdateBy(dto.getId());
+                i.getUpdateBy().setId(dto.getId());
                 i.setUpdateDate(new Date());
                 i.setAttachmentId(id);
                 i.setSort(j);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/WorkContractService.java

@@ -176,9 +176,9 @@ public class WorkContractService {
             WorkAttachment i = new WorkAttachment();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
-            i.setCreateBy(userDTO.getId());
+            i.getCreateBy().setId(userDTO.getId());
             i.setCreateDate(new Date());
-            i.setUpdateBy(userDTO.getId());
+            i.getUpdateBy().setId(userDTO.getId());
             i.setUpdateDate(new Date());
             i.setDelFlag(0);
             i.setUrl(dto.getUrl());
@@ -228,9 +228,9 @@ public class WorkContractService {
                 WorkAttachment i = new WorkAttachment();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
-                i.setCreateBy(userDTO.getId());
+                i.getCreateBy().setId(userDTO.getId());
                 i.setCreateDate(new Date());
-                i.setUpdateBy(userDTO.getId());
+                i.getUpdateBy().setId(userDTO.getId());
                 i.setUpdateDate(new Date());
                 i.setDelFlag(0);
                 i.setUrl(dto.getUrl());