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/service/impl/MouldFileServiceImpl.java

@@ -218,7 +218,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         } else if (blongType == 5) {
                             content = "模具报废文档";
                         }
-                        newsNotice.setContent("有新的" + content + ",待您审批。");
+                        newsNotice.setContent("有新的" + content +"上传,待您审批。");
                         newsNoticeMapper.insert(newsNotice);
                         for (ProjectApprove projectApprove : projectApproves) {
                             NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
@@ -247,16 +247,13 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
 //                mouldOperationDynamicsMapper.insert(dynamics);
                 Project project = projectMapper.selectOne(new QueryWrapper<Project>().eq("id", mould.getProjectId()));
                 List<ProjectApprove> projectApproves = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
-                String content = "";
+                String content = "模具更新";
                 NewsNotice newsNotice = new NewsNotice();
                 newsNotice.setRefId(projectFile.getModelId());
                 newsNotice.setProjectId(project.getId());
                 newsNotice.setBelongType(projectFile.getBlongType());
                 newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
                 newsNotice.setNoticeType(Constant.APPROVEL_TYPE);
-                if (blongType == 4) {
-                    content = "模具更新";
-                }
                 newsNotice.setContent("有新的" + content + "申请记录,待您审批。");
                 newsNoticeMapper.insert(newsNotice);
                 for (ProjectApprove projectApprove : projectApproves) {
@@ -634,6 +631,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     @Override
     public HttpRespMsg addPartFile(UserVO userVO, String path, MultipartFile[] files) {
         HttpRespMsg msg = new HttpRespMsg();
+        Mould mould = mouldMapper.selectById(userVO.getMouldId());
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         if (user != null) {
             List<Part> partLists = partMapper.selectList(new QueryWrapper<Part>().eq("mould_id", userVO.getMouldId()));
@@ -705,6 +703,23 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 dynamics.setMouldId(userVO.getMouldId());
                 dynamics.setFileId(partFile.getId());
                 mouldOperationDynamicsMapper.insert(dynamics);
+                Project project = projectMapper.selectOne(new QueryWrapper<Project>().eq("id", mould.getProjectId()));
+                List<ProjectApprove> projectApproves = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
+                String content = "零件文档";
+                NewsNotice newsNotice = new NewsNotice();
+                newsNotice.setRefId(mould.getId());
+                newsNotice.setProjectId(project.getId());
+                newsNotice.setBelongType(1);
+                newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
+                newsNotice.setNoticeType(Constant.APPROVEL_TYPE);
+                newsNotice.setContent("有新的" + content + "申请记录,待您审批。");
+                newsNoticeMapper.insert(newsNotice);
+                for (ProjectApprove projectApprove : projectApproves) {
+                    NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
+                    newsNoticeUser.setUserId(projectApprove.getApproverId());
+                    newsNoticeUser.setNewsId(newsNotice.getId());
+                    newsNoticeUserMapper.insert(newsNoticeUser);
+                }
 //                }
                 msg.data = partFile;
             }

cloud-model/src/main/resources/mapper/MouldEquipmentMapper.xml

@@ -60,7 +60,7 @@
                  open="(" separator="," close=")">
             #{item}
         </foreach>
-        and tbme.is_use = 1
+        and tbme.is_use = 0
     </select>
     <select id="getList" resultMap="BaseResultMapVO">
         select