修改预约开票选人策略

master/src/main/java/com/ruoyi/project/invoice/controller/TApproveReserveInvoiceController.java

@@ -127,34 +127,34 @@ public class TApproveReserveInvoiceController extends BaseController {
                 case "700开关锅炉":
                 case "320裂解区":
                 case "250管廊-700":
-//                    devSupId="20253,20257";
-//                    break;
+                    devSupId = "20253,20257";
+                    break;
                 case "330压缩区":
                 case "废水处理":
                 case "600废碱":
                 case "250管廊-600":
-//                    devSupId="20249,20317";
-//                    break;
+                    devSupId = "20249,20317";
+                    break;
                 case "380分离区":
                 case "360分离区":
                 case "350分离区":
                 case "340分离区":
-//                    devSupId="20252";
-//                    break;
+                    devSupId = "20252";
+                    break;
                 case "400汽油加氢":
                 case "250管廊-400":
-//                    devSupId="20248";
-//                    break;
+                    devSupId = "20248";
+                    break;
                 case "500芳烃抽提":
                 case "250管廊-500":
-//                    devSupId="20244";
-//                    break;
+                    devSupId = "20244";
+                    break;
                 case "D301控制楼":
                 case " D201变电所":
                 case " 维修厂房":
                 case "危废车库":
-//                    devSupId="20332,20250,20276";
-                    devSupId = "10081";
+                    devSupId = "20332,20250,20276";
+//                    devSupId = "10081";
                     break;
             }
         }
@@ -211,12 +211,9 @@ public class TApproveReserveInvoiceController extends BaseController {
         Map<String, Object> param = new HashMap<>();
 
         TInvoiceBookingworkticket invoiceBook = workService.getById(invoice.getInvoiceId());
-//        if (devTask.getCondition().equals("1") && task.getName().equals("装置经理签字确认")) {
-//            invoiceBook.setStatus(3L);
-//        } else if (devTask.getCondition().equals("0")) {
-//            invoiceBook.setStatus(5L);
-//        }
-//        workService.updateById(invoiceBook);
+        if (task.getName().equals("装置主管签字确认")) {
+            invoice.setDevSupId(getUserId());
+        }
         if (DateUtils.dateTime(invoiceBook.getCreatedate()).equals(DateUtils.dateTime(invoiceBook.getWorkStartTime()))) {
             param.put("istoday", "1");
         } else {

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndSuccessListener.java

@@ -100,7 +100,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
             //拼接html
             String html = start + prime + end;
             logger.info("html:" + html);
-            mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 Reserve Invoice:You have a new to-do task (" + apNo + ")", html);
+          //  mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 Reserve Invoice:You have a new to-do task (" + apNo + ")", html);
         }catch (Exception e) {
             logger.error("邮件发送失败" + JSON.toJSONString(e));
         }

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/YhzgTaskCreateListener.java

@@ -73,7 +73,7 @@ public class YhzgTaskCreateListener implements Serializable, TaskListener {
             //拼接html
             String html = start + prime + end;
             logger.info("html:" + html);
-            mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 Reserve Invoice:You have a new to-do task (" + apNo + ")", html);
+            //mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 Reserve Invoice:You have a new to-do task (" + apNo + ")", html);
         }catch (Exception e) {
             logger.error("邮件发送失败" + JSON.toJSONString(e));
         }

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/ZzgcsTaskCreateListener.java

@@ -73,7 +73,7 @@ public class ZzgcsTaskCreateListener implements Serializable, TaskListener {
             //拼接html
             String html = start + prime + end;
             logger.info("html:" + html);
-            mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 Reserve Invoice:You have a new to-do task (" + apNo + ")", html);
+            //mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 Reserve Invoice:You have a new to-do task (" + apNo + ")", html);
         }catch (Exception e) {
             logger.error("邮件发送失败" + JSON.toJSONString(e));
         }

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/ZzjlTaskCreateListener.java

@@ -73,7 +73,7 @@ public class ZzjlTaskCreateListener implements Serializable, TaskListener {
             //拼接html
             String html = start + prime + end;
             logger.info("html:" + html);
-            mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 Reserve Invoice:You have a new to-do task (" + apNo + ")", html);
+           // mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 Reserve Invoice:You have a new to-do task (" + apNo + ")", html);
         }catch (Exception e) {
             logger.error("邮件发送失败" + JSON.toJSONString(e));
         }

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/ZzzgTaskCreateListener.java

@@ -79,7 +79,7 @@ public class ZzzgTaskCreateListener implements Serializable, TaskListener {
             String html = start + prime + end;
             logger.info("html:" + html);
             for (String email : emails) {
-                mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 Reserve Invoice:You have a new to-do task (" + apNo + ")", html);
+                //mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 Reserve Invoice:You have a new to-do task (" + apNo + ")", html);
             }
         }catch (Exception e) {
             logger.error("邮件发送失败" + JSON.toJSONString(e));

ui/src/views/invoice/approveinvoice/index.vue

@@ -284,10 +284,8 @@ export default {
         this.guardianUnitOptions = response.data;
       });
 
-      this.form.userSupId=10000;
-      this.form.devSupId=10081;
-      this.form.devEngineerId=10082;
-      this.form.managerconId=10084;
+      // this.form.devEngineerId=10082;
+      // this.form.managerconId=10084;
       console.log(this.form)
       this.devList = rows;
       console.log(this.devList)
@@ -295,12 +293,13 @@ export default {
           this.isToday = true;
           this.form.isToday = 1;
       }
-   
+
       if (rows[0].workType === 1 || rows[0].workType === 2 || rows[0].workType === 15) {
         this.isSpecial = true;
          this.form.isSpecial = 1;
       }
       this.form.invoiceId=rows[0].bookingticketId;
+      this.form.userSupId=rows[0].bookingworkticket.userMg;
       listPostUser({
         // postCode: 'wxjl'
       }).then(response => {
@@ -325,7 +324,7 @@ export default {
           if (this.form.workStartTime && this.form.workStartTime === this.form.createdate){
                this.form.isToday = 1;
           }
-      
+
           if (this.form.workType === 1 || this.form.workType === 2 || this.form.workType === 15) {
             this.form.isSpecial = 1;
           }