Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldFile.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -43,6 +45,7 @@ public class MouldFile extends Model<MouldFile> {
      * 上传时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -342,14 +342,14 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     }
                 }
 //                //充当普通人员参与的项目
-                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", userVO.getId()));
+                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", currentUser.getId()));
                 if (projectUsers.size() > 0) {
                     for (ProjectUser projectUser : projectUsers) {
                         proIds.add(projectUser.getProjectId());
                     }
                 }
                 //充当审批人员参与的项目
-                List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId()));
+                List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId()));
                 if (projectss.size() > 0) {
                     for (ProjectApprove projectUser : projectss) {
                         proIds.add(projectUser.getProjectId());
@@ -404,12 +404,21 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     for (Part part : partLists) {
                         if (part.getPartNo().equals(split[0])) {
                             partFile.setPartId(part.getId());
-                        }
-                        if (Constant.PART_FILE_2D.equals(split[1])) {
-                            partFile.setDwgType(0);
-                        }
-                        if (Constant.PART_FILE_3D.equals(split[1])) {
-                            partFile.setDwgType(1);
+                            if (Constant.PART_FILE_2D.equals(split[1])) {
+                                MouldFile mouldFile = mouldFileMapper.selectOne(new QueryWrapper<MouldFile>().eq("part_id", part.getId()).eq("dwg_type", 0));
+                                if(mouldFile != null){
+                                    //把之前的文件删除
+                                    mouldFileMapper.deleteById(mouldFile);
+                                }
+                                partFile.setDwgType(0);
+                            }else if (Constant.PART_FILE_3D.equals(split[1])) {
+                                MouldFile mouldFile = mouldFileMapper.selectOne(new QueryWrapper<MouldFile>().eq("part_id", part.getId()).eq("dwg_type", 1));
+                                if(mouldFile != null){
+                                    //把之前的文件删除
+                                    mouldFileMapper.deleteById(mouldFile);
+                                }
+                                partFile.setDwgType(1);
+                            }
                         }
                     }
                     partFile.setFileName(fileName);