20220926

合同管理-合同登记文件上传bug修改

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

@@ -4,8 +4,10 @@ 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.sys.service.dto.UserDTO;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import org.apache.ibatis.annotations.Param;
+import org.flowable.spring.security.UserDto;
 
 import java.util.List;
 
@@ -16,4 +18,6 @@ public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
     void updateProjectRecord(String id);
 
     List<WorkAttachment> findList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+
+    void insertWorkAttachment (@Param("workAttachment") WorkAttachment workAttachment, @Param("userDto") UserDTO userDto);
 }

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

@@ -41,4 +41,36 @@
          ORDER BY a.sort ASC;
     </select>
 
+    <insert id="insertWorkAttachment">
+        INSERT INTO work_attachment (
+            id,
+            create_by,
+            create_date,
+            update_by,
+            update_date,
+            del_flag,
+            url,
+            type,
+            attachment_id,
+            attachment_name,
+            attachment_flag,
+            file_size,
+            sort
+            )
+        VALUES(
+            #{workAttachment.id},
+            #{userDto.id},
+            #{workAttachment.createDate},
+            #{userDto.id},
+            #{workAttachment.updateDate},
+            #{workAttachment.delFlag},
+            #{workAttachment.url},
+            #{workAttachment.type},
+            #{workAttachment.attachmentId},
+            #{workAttachment.attachmentName},
+            #{workAttachment.attachmentFlag},
+            #{workAttachment.fileSize},
+            #{workAttachment.sort}
+            )
+    </insert>
 </mapper>

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

@@ -173,9 +173,9 @@ public class WorkContractService {
             WorkAttachment i = new WorkAttachment();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
-            i.getCreateBy().setId(userDTO.getId());
+//            i.getCreateBy().setId(userDTO.getId());
             i.setCreateDate(new Date());
-            i.getUpdateBy().setId(userDTO.getId());
+//            i.getUpdateBy().setId(userDTO.getId());
             i.setUpdateDate(new Date());
             i.setDelFlag(0);
             i.setUrl(dto.getUrl());
@@ -189,7 +189,7 @@ public class WorkContractService {
             i.setAttachmentFlag("workcontract");
             i.setFileSize(dto.getSize());
             i.setSort(j);
-            ossServiceMapper.insert(i);
+            ossServiceMapper.insertWorkAttachment(i, userDTO);
             j++;
         }
     }
@@ -225,9 +225,9 @@ public class WorkContractService {
                 WorkAttachment i = new WorkAttachment();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
-                i.getCreateBy().setId(userDTO.getId());
+//                i.getCreateBy().setId(userDTO.getId());
                 i.setCreateDate(new Date());
-                i.getUpdateBy().setId(userDTO.getId());
+//                i.getUpdateBy().setId(userDTO.getId());
                 i.setUpdateDate(new Date());
                 i.setDelFlag(0);
                 i.setUrl(dto.getUrl());
@@ -241,7 +241,7 @@ public class WorkContractService {
                 i.setAttachmentFlag("workcontract");
                 i.setFileSize(dto.getSize());
                 i.setSort(j);
-                ossServiceMapper.insert(i);
+                ossServiceMapper.insertWorkAttachment(i, userDTO);
                 j++;
             }
         }