aps 创新设备-邮件问题修复

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquMaintenanceOrderDao.java

@@ -26,7 +26,7 @@ public interface EquMaintenanceOrderDao extends BaseMapper<EquMaintenanceOrderDo
             "WHERE \n" +
             "u.DELETED = 0\n" +
             "AND ORGID = #{workshopid}\n" +
-            "AND r.NAME = '车间主任' OR r.NAME = '车间维修主管'\n" +
+            "AND (r.NAME = '车间主任' OR r.NAME = '车间维修主管')\n" +
             "GROUP BY\n" +
             "  u.EMAIL")
     List<SysUserDo> selectEmailList( @Param("workshopid") String workshopid);

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquMaintenanceReportDao.java

@@ -25,7 +25,7 @@ public interface EquMaintenanceReportDao extends BaseMapper<EquMaintenanceReport
             "WHERE \n" +
             "u.DELETED = 0\n" +
             "AND ORGID = #{workshopid}\n" +
-            "AND r.NAME = '车间主任' OR r.NAME = '车间维修主管' OR r.NAME = '生产计划员'\n" +
+            "AND (r.NAME = '车间主任' OR r.NAME = '车间维修主管' OR r.NAME = '生产计划主任')\n" +
             "GROUP BY\n" +
             "  u.EMAIL")
     List<SysUserDo> selectEmailList( @Param("workshopid") String workshopid);

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquMaintenanceOrderServiceImpl.java

@@ -182,7 +182,7 @@ public class EquMaintenanceOrderServiceImpl extends ServiceImpl<EquMaintenanceOr
                     "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
                     createusername + "于 " + maintenancetime +" 对"+workshop+"的"+equipmentname+ "（" + equipmentnumber + "） 的工装进行了保修申请，请各位领导知悉，请及时联系维修工程进行维修" +
                     "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
-                    "系统登录地址： 把内部的登录地址弄上";
+                    "系统登录地址： http://192.168.100.77/#/passport/login";
             mailDo.setContent(content);
             // 发送邮件
             R r = cxCommonFeginClient.sendHtmlMail(mailDo);

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquMaintenanceReportServiceImpl.java

@@ -59,7 +59,7 @@ public class EquMaintenanceReportServiceImpl extends ServiceImpl<EquMaintenanceR
                     "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
                     reportueser + "于 " + incidenttime +" 对"+workshop+"的"+equipmentname+ "（" + equipmentnumber + "） 的设备进行了设备故障上报登记，请各位领导知悉，请车间主管人员及时确认故障是否真实存在，同时请计划人员到设备管理平台子系统中的“维修上报设备故障”模块中对上报的设备故障进行安排时间维修，及时对设备故障进行解决修复，避免设备在生产时出现停机异常。" +
                     "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
-                    "系统登录地址： 把内部的登录地址弄上";
+                    "系统登录地址： http://192.168.100.77/#/passport/login";
             mailDo.setContent(content);
             // 发送邮件
             R r = cxCommonFeginClient.sendHtmlMail(mailDo);

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquipmentArchivesServiceImpl.java

@@ -144,7 +144,7 @@ public class EquipmentArchivesServiceImpl implements EquipmentArchivesService {
                         "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
                         "您有一个" + workshop + "的 " + equipmentname + "（" + equipmentnumber + "） 的设备处置审批任务，请及时到创新智慧工厂平台中的个人工作台中进行任务审批，若是未找到对应审批任务，则为某个领导已审批完成。可在对应APP端或者PC端进行任务审批" +
                         "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
-                        "系统登录地址： 把内部的登录地址弄上";
+                        "系统登录地址： http://192.168.100.77/#/passport/login";
                 mailDo.setContent(content);
                 // 发送邮件
                 R r = cxCommonFeginClient.sendHtmlMail(mailDo);
@@ -206,7 +206,7 @@ public class EquipmentArchivesServiceImpl implements EquipmentArchivesService {
                         "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
                         "您有一个" + workshop + "的 " + equipmentname + "（" + equipmentnumber + "） 的设备处置审批任务，请及时到创新智慧工厂平台中的个人工作台中进行任务审批，若是未找到对应审批任务，则为某个领导已审批完成。可在对应APP端或者PC端进行任务审批" +
                         "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
-                        "系统登录地址： 把内部的登录地址弄上";
+                        "系统登录地址： http://192.168.100.77/#/passport/login";
                 mailDo.setContent(content);
                 // 发送邮件
                 R r = cxCommonFeginClient.sendHtmlMail(mailDo);