0618

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

@@ -357,8 +357,6 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
         }
     }
     private void sendMessageToDept(List<BizTechnologicalProcessDetailDrawing> drawingDetails) {
-        List<Long> productIds = drawingDetails.stream().map(BizTechnologicalProcessDetailDrawing::getProductId).collect(Collectors.toList());
-        List<BizProduct> productList = bizProductService.query().in("id", productIds).list();
         List<String> processCodes = drawingDetails.stream().map(BizTechnologicalProcessDetailDrawing::getProcessCode).collect(Collectors.toList());
         List<BizProcess> processList = bizProcessService.query().in("process_code", processCodes).list();
         List<BizMessage> messages = new ArrayList<>();
@@ -373,17 +371,16 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
                     message.setToNickName(v.getNickName());
                     message.setToUserId(v.getUserId());
                     message.setToUserName(v.getUserName());
-                    BizProduct bizProduct = productList.stream().filter(p -> p.getId().equals(d.getProductId())).findFirst().orElse(null);
                     BizProcess bizProcess = processList.stream().filter(p -> p.getProcessCode().equals(d.getProcessCode())).findFirst().orElse(null);
                     if(d.getAbandoned() == 1){
-                        String mes = bizProduct.getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已作废，请注意审批。";
+                        String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已作废，请注意审批。";
                         message.setMessage(mes);
                     }else{
                         if(d.getPattern().trim().equals("替换产品")){
-                            String mes = bizProduct.getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已变更，请注意审批。";
+                            String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已变更，请注意审批。";
                             message.setMessage(mes);
                         }else{
-                            String mes = bizProduct.getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已上传，请注意审批。";
+                            String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已上传，请注意审批。";
                             message.setMessage(mes);
                         }
                     }
@@ -399,8 +396,6 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
      * 发送审批信息
      */
     private void sendMessage(List<BizTechnologicalProcessDetailDrawing> drawingDetails) {
-        List<Long> productIds = drawingDetails.stream().map(BizTechnologicalProcessDetailDrawing::getProductId).collect(Collectors.toList());
-        List<BizProduct> productList = bizProductService.query().in("id", productIds).list();
         List<String> processCodes = drawingDetails.stream().map(BizTechnologicalProcessDetailDrawing::getProcessCode).collect(Collectors.toList());
         List<BizProcess> processList = bizProcessService.query().in("process_code", processCodes).list();
         SysRole role = new SysRole();
@@ -422,9 +417,8 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
                     message.setToNickName(v.getNickName());
                     message.setToUserId(v.getUserId());
                     message.setToUserName(v.getUserName());
-                    BizProduct bizProduct = productList.stream().filter(p -> p.getId().equals(d.getProductId())).findFirst().orElse(null);
                     BizProcess bizProcess = processList.stream().filter(p -> p.getProcessCode().equals(d.getProcessCode())).findFirst().orElse(null);
-                    String mes = bizProduct.getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已变化，请注意审批。";
+                    String mes = d.getProduct().getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias().trim() + "工序" + d.getDrawingName() + "图纸名，图纸已变化，请注意审批。";
 //                    message.setMessage("您有图纸待批准，请前往【工艺管理】下【等待批准图纸】菜单进行操作。");
                     message.setMessage(mes);
                     message.setMessageDate(new Date());

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

@@ -644,14 +644,9 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
         BizProcess bizProcess = new BizProcess();
         bizProcess.setProcessCode(drawing.getProcessCode());
         BizProcess process = bizProcessMapper.getList(bizProcess).get(0);
-        SysRole role = new SysRole();
-        role.setRoleKey("drawingRatify");
-        List<SysRole> roles = sysRoleMapper.selectRoleList(role);
         List<BizMessage> messages = new ArrayList<>();
-        roles.forEach(l -> {
-            SysUser conditions = new SysUser();
-            conditions.setRoleId(l.getRoleId());
-            List<SysUser> items = sysUserMapper.selectAllocatedList(conditions);
+        Long tenantId = Long.parseLong(request.getHeader("tenantId"));
+        List<SysUser> items = sysUserMapper.getAllFormman(tenantId);
             items.forEach(v -> {
                 BizMessage message = new BizMessage();
                 message.setFromNickName(SecurityUtils.getLoginUser().getUser().getNickName());
@@ -675,7 +670,6 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
                 message.setMessageDate(new Date());
                 messages.add(message);
             });
-        });
         bizMessageService.saveBatch(messages);
     }
 }