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/controller/VnoticeUserController.java

@@ -47,7 +47,7 @@ public class VnoticeUserController {
         return msg;
     }
 
-    @ApiOperation("消息通知列表")
+    @ApiOperation("读取消息")
     @RequestMapping("/read")
     @ResponseBody
     public HttpRespMsg read(@RequestParam Integer id,

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

@@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -569,8 +571,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         qw.eq("content", Constant.DOWNLOAD);
         SimpleDateFormat dateSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (userVO.getStartTime() != null && userVO.getEndTime() != null) {
-            qw.le("indate", userVO.getStartTime());
-            qw.ge("indate", userVO.getEndTime());
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            qw.le("indate",LocalDateTime.parse(userVO.getStartTime(),formatter));
+            qw.ge("indate", LocalDateTime.parse(userVO.getEndTime(),formatter));
         }
         List<MouldOperationDynamics> mouldOperationDynamics = mouldOperationDynamicsMapper.selectList(qw);
         for (MouldOperationDynamics dynamic : mouldOperationDynamics) {

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

@@ -111,6 +111,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
             } else if (flag == 1) {
                 projectMapper.updateById(project);
+                //删除参与人与项目项目经理相同id的人
+                projectUserMapper.delete(new QueryWrapper<ProjectUser>().eq("user_id",project.getManagerId()).eq("project_id",project.getId()));
                 //删除之前添加的生产方公司
                 customCompanyMapper.delete(new QueryWrapper<CustomCompany>().eq("project_id", project.getId()));
                 //重新添加生产方公司