LY 苯乙烯 邮件抄送

master/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -122,7 +122,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/plant/meeting/meetingReport").anonymous()
                 .antMatchers("/training/training/trainingReport").anonymous()
                 .antMatchers("/pdf/**").anonymous()
-//                .antMatchers("/**/exportPDF").anonymous()
+                .antMatchers("/**/exportPDF").anonymous()
                 .antMatchers("/ehs/approvedanger/processImg/**").anonymous()
                 .antMatchers("/sems/historyYlrq/exportPDFForYear").anonymous()
                 .antMatchers("/sems/historyYlgd/exportPDFForYear").anonymous()

master/src/main/java/com/ruoyi/framework/task/TrainingRegularTask.java

@@ -1,5 +1,6 @@
 package com.ruoyi.framework.task;
 
+import com.alibaba.fastjson.JSON;
 import com.github.stuxuhai.jpinyin.PinyinFormat;
 import com.github.stuxuhai.jpinyin.PinyinHelper;
 import com.ruoyi.common.sendEmail.IMailService;
@@ -7,7 +8,9 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SpringContextUtils;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.TAlarmPrincipal;
 import com.ruoyi.project.system.service.ISysUserService;
+import com.ruoyi.project.system.service.ITAlarmPrincipalService;
 import com.ruoyi.project.training.domain.TTrainingRegular;
 import com.ruoyi.project.training.service.ITTrainingRegularService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,15 +28,37 @@ public class TrainingRegularTask extends BaseController {
 
     @Autowired
     private ISysUserService sysUserService;
+    private static Long AlarmtypeId = 1300l;
+    /**
+     * 注入报警管理负责人的接口
+     */
+    @Autowired
+    private ITAlarmPrincipalService alarmPrincipalService;
 
     public void execute() {
         try {
             TTrainingRegular tTrainingRegular = new TTrainingRegular();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
             tTrainingRegular.setPlanDate(sdf.format(new Date()));
+            tTrainingRegular.setDeptId(10010l);
             List<TTrainingRegular> list = tTrainingRegularService.selectTTrainingRegularByPlanDate(tTrainingRegular);
             IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
             logger.info("=====================本次装置培训计划清单：{}", list);
+
+            TAlarmPrincipal alarmPrincipal = new TAlarmPrincipal();
+            //预警类型对应负责人
+            alarmPrincipal.setTypeId(AlarmtypeId);
+            List<TAlarmPrincipal> alarmPrincipals = alarmPrincipalService.selectList(alarmPrincipal);
+            System.out.println(JSON.toJSONString(alarmPrincipals));
+            for (TAlarmPrincipal t : alarmPrincipals) {
+                SysUser user = this.sysUserService.selectUserByStaffId(t.getStaffid());
+                if (user != null) {
+                    logger.info("抄送人" + user.getNickName() + "--抄送邮箱：" + user.getEmail());
+                    t.setPrincipalName(user.getNickName());
+                    t.setPrincipalEmail(user.getEmail());
+                }
+            }
+
             for (TTrainingRegular regular : list) {
                 for (String staffId : regular.getLecturer().split(",")) {
                     try {
@@ -72,7 +97,8 @@ public class TrainingRegularTask extends BaseController {
                         //拼接html
                         String html = start + result + end;
                         logger.info("html:" + html);
-                        mailService.sendHtmlMail(email, "您本月有装置培训计划 You have a device training plan for this month", html);
+                        String emailCc = alarmPrincipal.getPrincipalEmail();
+                        mailService.sendHtmlMail(email, "您本月有装置培训计划 You have a device training plan for this month", html,emailCc);
                     } catch (Exception e) {
                         logger.error(e.getMessage(), e);
                     }

master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -259,7 +259,7 @@ public class TApproveDangerController extends BaseController {
                         TApprove approve = tApproveService.selectTApproveById(Long.parseLong(h.getBusinessKey()));
                         devProcess.setSpecApprove(approve);
                         devProcess.setApNo(approve.getApNo());
-                    } else if (pi.getProcessDefinitionName().equals("设备修改/删除审核")) {
+                    } else if (pi.getProcessDefinitionName().equals("设备修改/删除审核") || pi.getProcessDefinitionName().equals("设备新增/删除审核")) {
                         TApproveSpecModify approve = tApproveSpecModifyService.selectTApproveSpecModifyById(Long.parseLong(pi.getBusinessKey()));
                         devProcess.setApproveSpecModify(approve);
                         devProcess.setApNo(approve.getApNo());

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlgdController.java

@@ -128,7 +128,7 @@ public class TReportHiYlgdController extends BaseController {
         return toAjax(tReportHiYlgdService.deleteTReportHiYlgdByIds(ids));
     }
 
-    @GetMapping("/exportPDF")
+    @GetMapping("/exportReportPDF")
     public String exportPDF(@RequestParam String id, HttpServletRequest request, HttpServletResponse response) {
 //        OutputStream out = null;
         try {

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlrqController.java

@@ -129,7 +129,7 @@ public class TReportHiYlrqController extends BaseController {
         return toAjax(tReportHiYlrqService.deleteTReportHiYlrqByIds(ids));
     }
 
-    @GetMapping("/exportPDF")
+    @GetMapping("/exportReportPDF")
     public String exportPDF(@RequestParam String id, HttpServletRequest request, HttpServletResponse response) {
 //        OutputStream out = null;
         try {

master/src/main/resources/mybatis/training/TTrainingRegularMapper.xml

@@ -57,6 +57,7 @@
     <select id="selectTTrainingRegularByPlanDate" parameterType="TTrainingRegular" resultMap="TTrainingRegularResult">
         <include refid="selectTTrainingRegularVo"/>
          where to_char(plan_trainingdate, 'YYYY-MM' ) = #{planDate} and d.del_flag=0
+         and d.dept_id =  #{deptId}
     </select>
 
     <insert id="insertTTrainingRegular" parameterType="TTrainingRegular" useGeneratedKeys="true" keyProperty="id">

ui/src/api/sems/reportYlgd.js

@@ -72,7 +72,7 @@ export function exportReportYlgdSelected(query) {
 // 导出pdf
 export function exportPDF(query) {
   return request({
-    url: '/sems/historyYlgd/exportPDF',
+    url: '/sems/historyYlgd/exportReportPDF',
     method: 'get',
     params: query
   })

ui/src/api/sems/reportYlrq.js

@@ -72,7 +72,7 @@ export function exportReportYlrqSelected(query) {
 // 导出pdf
 export function exportPDF(query) {
   return request({
-    url: '/sems/historyYlrq/exportPDF',
+    url: '/sems/historyYlrq/exportReportPDF',
     method: 'get',
     params: query
   })

ui/src/views/approve/myapprove/index.vue

@@ -188,7 +188,7 @@
             console.log(row.taskName)
             this.$refs.specDeal.init(row.specApprove.id, row.taskId, row.processId,row.taskName)
           })
-        }else if (row.processName == "设备修改/删除审核"){
+        }else if (row.processName == "设备修改/删除审核" || row.processName == "设备新增/删除审核"){
           this.specModifyDealVisible = true
           this.$nextTick(() => {
             console.log(row.taskName)