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/constant/Constant.java

@@ -46,6 +46,8 @@ public class Constant {
     public static final String WECHAT_APPID = "wx42c0f9d19a4756a7";//appId
     public static final String PLAN_TYPE = "保养类型";//保养类型
     public static final String MAIN_TAIN_NOTICE = "该模具需要保养,请前往处理";//保养通知
+    public static final String EMERGENCY_ELECTRICITY_NOTICE = "该云模盒电量已达告警阈值,请前往处理";//告警通知
+    public static final String EMERGENCY_TEMPERATURE_NOTICE = "该云模盒温度已达告警阈值,请前往处理";//告警通知
     public static final String SCRAP_NOTICE = "该模具运行次数已超过寿命次数,请申请报废处理";//待报废
     public static final String EMERGENCY_NOTICE = "模具云墨盒已被更换，请前往查看并处理";//模具云墨盒解绑告警
     public static final String MAINTAIN_NAME_FIRST = "动作";//保养类型名称0

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldFileController.java

@@ -232,7 +232,7 @@ public class MouldFileController {
 
     /**
      * 文档勾选批量下载
-     * 参数: ids 模具ids 如“1，2，3”
+     * 参数: ids 模具ids 如“1，2，3”,dwgType 文档类型 0 所有文档 1-模具3D 2-模具2D 3-零件3D 4-零件2D 5-保养方案
      *
      * @return
      */

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

@@ -33,7 +33,6 @@ public class UserVO extends User {
     private String endTime;
     private Integer mouleMap;//用于过滤地图概览
     /**
-     * 图档类型0-2D,1-3D
      */
     private Integer dwgType;
 }

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

@@ -4,15 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
-import com.hssx.cloudmodel.entity.Mould;
-import com.hssx.cloudmodel.entity.MouldEquipment;
-import com.hssx.cloudmodel.entity.Part;
-import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
 import com.hssx.cloudmodel.entity.vo.UserVO;
-import com.hssx.cloudmodel.mapper.MouldEquipmentMapper;
-import com.hssx.cloudmodel.mapper.MouldMapper;
-import com.hssx.cloudmodel.mapper.UserMapper;
+import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
@@ -53,6 +48,22 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     MouldMapper mouldMapper;
     @Resource
     UserMapper userMapper;
+    @Resource
+    NewsNoticeMapper newsNoticeMapper;
+    @Resource
+    NewsNoticeUserMapper newsNoticeUserMapper;
+    @Resource
+    PowerMapper powerMapper;
+    @Resource
+    ProjectMapper projectMapper;
+    @Resource
+    ProjectApproveMapper projectApproveMapper;
+    @Resource
+    CustomCompanyMapper customCompanyMapper;
+    @Resource
+    CompanyMapper companyMapper;
+    @Resource
+    ProjectUserMapper projectUserMapper;
 
     @Override
     public HttpRespMsg addAndUpdateMouldEquipment(MouldEquipment mouldEquipment, User user) {
@@ -89,8 +100,8 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         if (user.getParentId() == 0) {
             //修改设备
             MouldEquipment newMouldEquipment = mouldEquipmentMapper.selectById(mouldEquipment.getId());
-            if(null == newMouldEquipment.getBelongCompanyId()){
-                msg.setError("对不起，请添加所属公司后再启用");
+            if (null == newMouldEquipment.getBelongCompanyId()) {
+                msg.setError("该设备没有所属公司，请添加所属公司后再启用");
                 return msg;
             }
             newMouldEquipment.setIsUse(mouldEquipment.getIsUse());
@@ -136,7 +147,114 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
 
     @Override
     public HttpRespMsg MouldEquipmentAlarm() {
-        return null;
+        HttpRespMsg msg = new HttpRespMsg();
+        List<MouldEquipment> mouldEquipments = mouldEquipmentMapper.selectList(new QueryWrapper<MouldEquipment>().eq("is_use", 1));
+        for (MouldEquipment mouldEquipment : mouldEquipments) {
+            Mould mould = mouldMapper.selectOne(new QueryWrapper<Mould>().eq("equipment_id", mouldEquipment.getId()));
+            if (Constant.ELECTRICITY_THRESHOLD >= Double.parseDouble(mouldEquipment.getHillNumber())) {
+                //公众号的推送to do
+
+                Project project = projectMapper.selectById(mould.getProjectId());
+                //查询到参与该项目的人
+                List<Integer> userIds = new ArrayList<>();
+                userIds.add(-1);
+                userIds.add(project.getCreatorId());
+                userIds.add(project.getManagerId());
+                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("project_id", project.getId()));
+                for (ProjectUser projectUser : projectUsers) {
+                    userIds.add(projectUser.getUserId());
+                }
+                List<ProjectApprove> projectApproves = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
+                for (ProjectApprove projectApprove : projectApproves) {
+                    userIds.add(projectApprove.getApproverId());
+                }
+                List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", userIds));
+                //查询到之前模具保养的消息
+                NewsNotice oldNews = newsNoticeMapper.selectOne(new QueryWrapper<NewsNotice>().eq("ref_id", mould.getId()).eq("notice_type", 2));
+                NewsNotice newsNotice = new NewsNotice();
+                if (oldNews != null) {
+                    NewsNotice newNews = new NewsNotice();
+                    newNews.setId(oldNews.getId());
+                    oldNews.setIndate(LocalDateTime.now());
+                    newsNoticeMapper.updateById(oldNews);
+                    newsNoticeUserMapper.updateNewsNoticeUserByNewsNoticeId(oldNews.getId());
+//                    for (User u : users) {
+//                        //添加通知的消息
+//                        NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
+//                        newsNoticeUser.setNewsId(oldNews.getId());
+//                        newsNoticeUser.setUserId(u.getId());
+//                        newsNoticeUser.setIsRead(0);
+//                        newsNoticeUserMapper.updateById(newsNoticeUser);
+//                    }
+                } else {
+                    newsNotice.setNoticeType(Constant.EMERGENCY_TYPE);
+                    newsNotice.setProjectId(project.getId());
+                    newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
+//                    newsNotice.setRefId(mould.getId());
+                    newsNotice.setContent(mouldEquipment.getEquipmentNo() + "-" + Constant.EMERGENCY_ELECTRICITY_NOTICE);
+                    newsNoticeMapper.insert(newsNotice);
+                    for (User u : users) {
+                        //添加通知的消息
+                        NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
+                        newsNoticeUser.setNewsId(newsNotice.getId());
+                        newsNoticeUser.setUserId(u.getId());
+                        newsNoticeUserMapper.insert(newsNoticeUser);
+                    }
+                }
+            }
+            if (Constant.TEMPERATURE_THRESHOLD <= mouldEquipment.getTemperature()) {
+                //公众号的推送to do
+
+                Project project = projectMapper.selectById(mould.getProjectId());
+                //查询到参与该项目的人
+                List<Integer> userIds = new ArrayList<>();
+                userIds.add(-1);
+                userIds.add(project.getCreatorId());
+                userIds.add(project.getManagerId());
+                List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("project_id", project.getId()));
+                for (ProjectUser projectUser : projectUsers) {
+                    userIds.add(projectUser.getUserId());
+                }
+                List<ProjectApprove> projectApproves = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
+                for (ProjectApprove projectApprove : projectApproves) {
+                    userIds.add(projectApprove.getApproverId());
+                }
+                List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", userIds));
+                //查询到之前模具保养的消息
+                NewsNotice oldNews = newsNoticeMapper.selectOne(new QueryWrapper<NewsNotice>().eq("ref_id", mould.getId()).eq("notice_type", 2));
+                NewsNotice newsNotice = new NewsNotice();
+                if (oldNews != null) {
+                    NewsNotice newNews = new NewsNotice();
+                    newNews.setId(oldNews.getId());
+                    oldNews.setIndate(LocalDateTime.now());
+                    newsNoticeMapper.updateById(oldNews);
+                    newsNoticeUserMapper.updateNewsNoticeUserByNewsNoticeId(oldNews.getId());
+//                    for (User u : users) {
+//                        //添加通知的消息
+//                        NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
+//                        newsNoticeUser.setNewsId(oldNews.getId());
+//                        newsNoticeUser.setUserId(u.getId());
+//                        newsNoticeUser.setIsRead(0);
+//                        newsNoticeUserMapper.updateById(newsNoticeUser);
+//                    }
+                } else {
+                    newsNotice.setNoticeType(Constant.EMERGENCY_TYPE);
+                    newsNotice.setProjectId(project.getId());
+                    newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
+//                    newsNotice.setRefId(mould.getId());
+                    newsNotice.setContent(mouldEquipment.getEquipmentNo() + "-" + Constant.EMERGENCY_TEMPERATURE_NOTICE);
+                    newsNoticeMapper.insert(newsNotice);
+                    for (User u : users) {
+                        //添加通知的消息
+                        NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
+                        newsNoticeUser.setNewsId(newsNotice.getId());
+                        newsNoticeUser.setUserId(u.getId());
+                        newsNoticeUserMapper.insert(newsNoticeUser);
+                    }
+                }
+            }
+        }
+        return msg;
     }
 
     @Override

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

@@ -180,7 +180,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
 //                            projectFile.setState(0);
 //                        }
 //                    }else{
-                        projectFile.setState(0);
+                    projectFile.setState(0);
 //                    }
                     //添加上传记录
                     MouldOperationDynamics dynamics = new MouldOperationDynamics();
@@ -199,7 +199,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         NewsNotice newsNotice = new NewsNotice();
                         newsNotice.setRefId(projectFile.getModelId());
                         newsNotice.setProjectId(project.getId());
-                        newsNotice.setProjectName(project.getProjectName()+"-"+mould.getModelName());
+                        newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
                         newsNotice.setNoticeType(Constant.APPROVEL_TYPE);
                         if (blongType == 0) {
                             content = "模具文档";
@@ -245,7 +245,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 NewsNotice newsNotice = new NewsNotice();
                 newsNotice.setRefId(projectFile.getModelId());
                 newsNotice.setProjectId(project.getId());
-                newsNotice.setProjectName(project.getProjectName()+"-"+mould.getModelName());
+                newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
                 newsNotice.setNoticeType(Constant.APPROVEL_TYPE);
                 if (blongType == 4) {
                     content = "模具更新";
@@ -303,9 +303,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 }
                 mouldFileMapper.updateById(mf);
                 if (oldData.getBlongType() == 4) {
-                    if(mf.getState()==3){
+                    if (mf.getState() == 3) {
                         Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>().eq("belong_type", 4).eq("is_pass", 1).eq("mould_id", oldData.getModelId()));
-                        if(count == 0){
+                        if (count == 0) {
                             dynamics.setMouldId(oldData.getModelId());
                             dynamics.setApplicantName(oldData.getUploadtor());
                             dynamics.setApplicantId(oldData.getUplodtorId());
@@ -315,9 +315,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                             dynamics.setIsPass(1);
                             mouldOperationDynamicsMapper.insert(dynamics);
                         }
-                    }else if(mf.getState() < 0){
+                    } else if (mf.getState() < 0) {
                         Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>().eq("belong_type", 4).eq("is_pass", 0).eq("mould_id", oldData.getModelId()));
-                        if(count == 0){
+                        if (count == 0) {
                             dynamics.setMouldId(oldData.getModelId());
                             dynamics.setApplicantName(oldData.getUploadtor());
                             dynamics.setApplicantId(oldData.getUplodtorId());
@@ -366,9 +366,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 }
                 mouldFileMapper.updateById(mf);
                 if (oldData.getBlongType() == 4) {
-                    if(mf.getState()==3){
+                    if (mf.getState() == 3) {
                         Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>().eq("belong_type", 4).eq("is_pass", 1).eq("mould_id", oldData.getModelId()));
-                        if(count == 0){
+                        if (count == 0) {
                             dynamics.setMouldId(oldData.getModelId());
                             dynamics.setApplicantName(oldData.getUploadtor());
                             dynamics.setApplicantId(oldData.getUplodtorId());
@@ -378,9 +378,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                             dynamics.setIsPass(1);
                             mouldOperationDynamicsMapper.insert(dynamics);
                         }
-                    }else if(mf.getState() < 0){
+                    } else if (mf.getState() < 0) {
                         Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>().eq("belong_type", 4).eq("is_pass", 0).eq("mould_id", oldData.getModelId()));
-                        if(count == 0){
+                        if (count == 0) {
                             dynamics.setMouldId(oldData.getModelId());
                             dynamics.setApplicantName(oldData.getUploadtor());
                             dynamics.setApplicantId(oldData.getUplodtorId());
@@ -390,7 +390,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                             mouldOperationDynamicsMapper.insert(dynamics);
                         }
                     }
-                }else{
+                } else {
                     //添加审批记录
                     dynamics.setMouldId(oldData.getModelId());
                     dynamics.setBelongType(oldData.getBlongType());
@@ -447,7 +447,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     }
 
     @Override
-    public HttpRespMsg getFileList(int mouldId, Integer blongType, UserVO userVO,String path) {
+    public HttpRespMsg getFileList(int mouldId, Integer blongType, UserVO userVO, String path) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         List<MouldFile> list = new ArrayList<>();
@@ -456,7 +456,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
 //            List<Integer> recursion = recursion(mouldId, ids);
 //            list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().in("model_id", recursion).orderByDesc("id"));
 //        }else{
-            list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", blongType).orderByDesc("id"));
+        list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", blongType).orderByDesc("id"));
 //        }
 //        for (MouldFile mouldFile : list) {
 //            mouldFile.setFileUrl(path+mouldFile.getFileUrl().substring("/upload/".length()));
@@ -534,9 +534,26 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         HttpRespMsg msg = new HttpRespMsg();
         if (null != userVO.getIds()) {
             List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(userVO.getIds());
+            List<MouldFile> mouldFiles = new ArrayList<>();
             for (Integer id : ids) {
                 Mould mould = mouldMapper.selectById(id);
-                List<MouldFile> mouldFiles = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", id).eq("state", 3));
+                if (0 == userVO.getDwgType()) {
+                     mouldFiles = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", id).eq("state", 3));
+                }else if(1 == userVO.getDwgType()){
+                    //模具2D
+                     mouldFiles = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", id).eq("state", 3).isNull("part_id").eq("dwg_type",0).eq("blong_type",0));
+                }else if(2 == userVO.getDwgType()){
+                    //模具3D
+                     mouldFiles = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", id).eq("state", 3).isNull("part_id").eq("dwg_type",1).eq("blong_type",0));
+                }else if(3 == userVO.getDwgType()){
+                    //零件2D
+                     mouldFiles = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", id).eq("state", 3).isNotNull("part_id").eq("dwg_type",0).eq("blong_type",1));
+                }else if(4 == userVO.getDwgType()){
+                    //零件3D
+                     mouldFiles = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", id).eq("state", 3).isNotNull("part_id").eq("dwg_type",0).eq("blong_type",1));
+                }else{
+                     mouldFiles = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", id).eq("state", 3).eq("blong_type",3));
+                }
                 feedBackDirectMultiDownload(request, response, downloadPath, mould, mouldFiles, path);
             }
         }
@@ -626,7 +643,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     }
 
     @Override
-    public HttpRespMsg downloadFileListExcel(UserVO userVO, HttpServletResponse response,String downloadPath) throws ParseException {
+    public HttpRespMsg downloadFileListExcel(UserVO userVO, HttpServletResponse response, String downloadPath) throws ParseException {
         HttpRespMsg msg = new HttpRespMsg();
         List<List<String>> list = new ArrayList<List<String>>();
         //标题
@@ -646,12 +663,12 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         Date date2 = df.parse(end);
         System.out.println(date2);
 //        SimpleDateFormat df1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.CHINA);
-        Calendar calendar=new GregorianCalendar();
+        Calendar calendar = new GregorianCalendar();
         calendar.setTime(date1);
-        calendar.add(calendar.DATE,-1);//把日期往后增加一天.整数往后推,负数往前移动        date=calendar.getTime();
+        calendar.add(calendar.DATE, -1);//把日期往后增加一天.整数往后推,负数往前移动        date=calendar.getTime();
         Date startDate1 = calendar.getTime();
         calendar.setTime(date2);
-        calendar.add(calendar.DATE,-1);
+        calendar.add(calendar.DATE, -1);
 //        Date startDate = df1.parse(date1.toString());
         Date endDate2 = calendar.getTime();
 //        Date endDate = df1.parse(date2.toString());
@@ -660,9 +677,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         SimpleDateFormat dateSdf2 = new SimpleDateFormat("yyyy年MM月dd+HH时mm分ss秒");
         String startDate = dateSdf.format(startDate1);
         String endDate = dateSdf.format(endDate2);
-        List<MouldOperationDynamics> mouldOperationDynamics  = new ArrayList<>();
+        List<MouldOperationDynamics> mouldOperationDynamics = new ArrayList<>();
         if (userVO.getStartTime() != null && userVO.getEndTime() != null) {
-            mouldOperationDynamics = mouldOperationDynamicsMapper.selectOperationDynamicsList(startDate,endDate,userVO);
+            mouldOperationDynamics = mouldOperationDynamicsMapper.selectOperationDynamicsList(startDate, endDate, userVO);
         }
         for (MouldOperationDynamics dynamic : mouldOperationDynamics) {
             List<String> rowList = new ArrayList<String>();
@@ -688,11 +705,11 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
 
 
             rowList.add(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(dynamic.getIndate())
-                    );
+            );
             list.add(rowList);
         }
         Mould mould = mouldMapper.selectById(userVO.getMouldId());
-        msg.data = ExcelUtil.exportGeneralExcelByTitleAndList(response, mould.getModelNo() + mould.getModelName()+dateSdf2.format(new Date()), list,downloadPath);
+        msg.data = ExcelUtil.exportGeneralExcelByTitleAndList(response, mould.getModelNo() + mould.getModelName() + dateSdf2.format(new Date()), list, downloadPath);
         return msg;
     }
 
@@ -704,13 +721,13 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         if (user == null) {
             msg.setError("用户不存在或者未登录");
             return msg;
-        }else{
+        } else {
             MouldOperationDynamics dynamics = mouldOperationDynamicsMapper.selectOne(new QueryWrapper<MouldOperationDynamics>().eq("belongType", 4).eq("mould_id", userVO.getMouldId()).orderByDesc("id"));
-            if(null != dynamics){
-                if(0 == dynamics.getIsPass()){
+            if (null != dynamics) {
+                if (0 == dynamics.getIsPass()) {
                     isCanCreate = true;
                 }
-            }else{
+            } else {
                 isCanCreate = true;
             }
         }

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

@@ -311,6 +311,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 //添加通知消息
                 //查询到参与该项目的人
                 List<Integer> userIds = new ArrayList<>();
+                userIds.add(-1);
                 userIds.add(project.getCreatorId());
                 userIds.add(project.getManagerId());
                 List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("project_id", project.getId()));
@@ -388,7 +389,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     newsNotice.setNoticeType(Constant.MAINTAIN_TYPE);
                     newsNotice.setProjectId(project.getId());
                     newsNotice.setProjectName(project.getProjectName());
-//                    newsNotice.setRefId(mould.getId());
+                    newsNotice.setRefId(mould.getId());
                     newsNotice.setContent(Constant.SCRAP_NOTICE);
                     newsNoticeMapper.insert(newsNotice);
                     for (User u : users) {