0618

src/main/java/cn/ezhizao/project/business/product/mapper/BizProductMapper.java

@@ -1,6 +1,8 @@
 package cn.ezhizao.project.business.product.mapper;
 
 import java.util.List;
+
+import cn.ezhizao.project.business.process.mapper.BizProcessMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.ezhizao.project.business.product.domain.BizProduct;
 
@@ -19,6 +21,7 @@ public interface BizProductMapper extends BaseMapper<BizProduct>
      * @return 产品管理集合
      */
     public List<BizProduct> getList(BizProduct bizProduct);
+    public BizProduct getProductById(BizProduct bizProduct);
 
     public List<BizProduct> getProductsForSupplier(BizProduct bizProduct);
 

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

@@ -387,9 +387,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
                             message.setMessage(mes);
                         }
                     }
-                    String mes = bizProduct.getDescription() + "产品，工艺版本" + d.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + d.getDrawingName() + "图纸名，图纸已作废，请注意查看。";
 //                    message.setMessage("您有图纸待批准，请前往【工艺管理】下【等待批准图纸】菜单进行操作。");
-                    message.setMessage(mes);
                     message.setMessageDate(new Date());
                     messages.add(message);
                 });

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

@@ -213,6 +213,7 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
                     case 1:
                         issuer(item,personalSeal,user);
                         sendMessage(item);
+                        sendMessageDept(item);
                         break;
                 }
             }
@@ -609,6 +610,12 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
     }
 
     private void sendMessage(BizTechnologicalProcessDetailDrawing drawing) {
+        BizProduct bizProduct = new BizProduct();
+        bizProduct.setId(drawing.getProductId());
+        BizProduct product = bizProductMapper.getProductById(bizProduct);
+        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);
@@ -625,7 +632,50 @@ public class BizTechnologicalProcessDetailDrawingServiceImpl extends ServiceImpl
                 message.setToNickName(v.getNickName());
                 message.setToUserId(v.getUserId());
                 message.setToUserName(v.getUserName());
-                message.setMessage("您有图纸待批准，请前往【工艺管理】下【等待批准图纸】菜单进行操作。");
+//                message.setMessage("您有图纸待批准，请前往【工艺管理】下【等待批准图纸】菜单进行操作。");
+                String mes = product.getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + process.getProcessAlias() + "工序" + drawing.getDrawingName() + "图纸名，图纸已变化，请注意审批。";
+                message.setMessage(mes);
+                message.setMessageDate(new Date());
+                messages.add(message);
+            });
+        });
+        bizMessageService.saveBatch(messages);
+    }
+    private void sendMessageDept(BizTechnologicalProcessDetailDrawing drawing) {
+        BizProduct bizProduct = new BizProduct();
+        bizProduct.setId(drawing.getProductId());
+        BizProduct product = bizProductMapper.getProductById(bizProduct);
+        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);
+            items.forEach(v -> {
+                BizMessage message = new BizMessage();
+                message.setFromNickName(SecurityUtils.getLoginUser().getUser().getNickName());
+                message.setFromUserId(SecurityUtils.getLoginUser().getUser().getUserId());
+                message.setFromUserName(SecurityUtils.getLoginUser().getUser().getUserName());
+                message.setToNickName(v.getNickName());
+                message.setToUserId(v.getUserId());
+                message.setToUserName(v.getUserName());
+                if(drawing.getAbandoned() == 1){
+                    String mes = bizProduct.getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + drawing.getDrawingName() + "图纸名，图纸已作废，请注意审批。";
+                    message.setMessage(mes);
+                }else{
+                    if(drawing.getPattern().trim().equals("替换产品")){
+                        String mes = bizProduct.getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + drawing.getDrawingName() + "图纸名，图纸已变更，请注意审批。";
+                        message.setMessage(mes);
+                    }else{
+                        String mes = bizProduct.getDescription() + "产品，工艺版本" + drawing.getProductVersion()  + bizProcess.getProcessAlias() + "工序" + drawing.getDrawingName() + "图纸名，图纸已上传，请注意审批。";
+                        message.setMessage(mes);
+                    }
+                }
                 message.setMessageDate(new Date());
                 messages.add(message);
             });

src/main/resources/mybatis/business/product/BizProductMapper.xml

@@ -16,6 +16,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getTechnological" resultMap="BizTechnologicalProcessResult">
         SELECT technology_version as Label,id as `Value` FROM biz_technological_process where deleted = 0 and product_id = #{id} AND product_drawing_number = #{drawingNumber}
     </select>
+    <select id="getProductById" parameterType="Long" resultType="BizProduct">
+        select * from biz_product where id = #{id} limit 1
+    </select>
     <select id="getList" parameterType="BizProduct" resultMap="BizProductResult">
         WITH product_counts AS (
         SELECT