0618

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -348,7 +348,11 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
             // 给所有有图纸审批权限的人发站内信，通知审批
             sendMessage(bizTechnologicalProcessDetailDrawing);
             //给所有工段长发送站内信，通知图纸审批
-            sendMessageToDept(bizTechnologicalProcessDetailDrawing);
+            List<BizTechnologicalProcessDetailDrawing> collect = bizTechnologicalProcessDetailDrawing.stream().filter(d -> d.getStatus() != null && d.getStatus() == 1).collect(Collectors.toList());
+            if(collect.size() > 0){
+                sendMessageToDept(bizTechnologicalProcessDetailDrawing);
+            }
+
             return success();
         }
     }

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/service/impl/BizTechnologicalProcessDetailDrawingServiceImpl.java

@@ -9,6 +9,10 @@ import cn.ezhizao.project.business.message.domain.BizMessage;
 import cn.ezhizao.project.business.message.service.IBizMessageService;
 import cn.ezhizao.project.business.personSeal.domain.BizPersonalSeal;
 import cn.ezhizao.project.business.personSeal.mapper.BizPersonalSealMapper;
+import cn.ezhizao.project.business.process.domain.BizProcess;
+import cn.ezhizao.project.business.process.mapper.BizProcessMapper;
+import cn.ezhizao.project.business.product.domain.BizProduct;
+import cn.ezhizao.project.business.product.mapper.BizProductMapper;
 import cn.ezhizao.project.business.publicSeal.domain.BizPublicSeal;
 import cn.ezhizao.project.business.publicSeal.mapper.BizPublicSealMapper;
 import cn.ezhizao.project.business.technologicalProcessDetailDrawing.domain.BizTechnologicalProcessDetailDrawing;
@@ -42,6 +46,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 电子图纸Service业务层处理
@@ -75,6 +80,10 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
 
     @Resource
     BizTechnologicalProcessDetailDrawingUserMapper bizTechnologicalProcessDetailDrawingUserMapper;
+    @Resource
+    BizProductMapper bizProductMapper;
+    @Resource
+    BizProcessMapper bizProcessMapper;
 
 
     /**
@@ -203,7 +212,7 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
                         break;
                     case 1:
                         issuer(item,personalSeal,user);
-                        sendMessage();
+                        sendMessage(item);
                         break;
                 }
             }
@@ -599,7 +608,7 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
         out.close();
     }
 
-    private void sendMessage() {
+    private void sendMessage(BizTechnologicalProcessDetailDrawing drawing) {
         SysRole role = new SysRole();
         role.setRoleKey("drawingRatify");
         List<SysRole> roles = sysRoleMapper.selectRoleList(role);