Browse Source

LY 审批 预览

ly 2 years ago
parent
commit
1cf3a2796f

+ 41 - 7
master/src/main/java/com/ruoyi/project/apply/controller/TApplyOfflinevalveController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.project.apply.controller;
 
 import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.data.Pictures;
 import com.deepoove.poi.data.TextRenderData;
 import com.deepoove.poi.data.Texts;
 import com.deepoove.poi.data.style.Style;
@@ -334,43 +335,66 @@ public class TApplyOfflinevalveController extends BaseController {
         params.put("safa", Texts.of(tApplyOfflinevalve.getSafa()).fontSize(10).bold().create());
         if (StringUtils.isNotEmpty(tApplyOfflinevalve.getExecutor())) {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplyOfflinevalve.getExecutor()));
-            params.put("executor", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("execP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("executor", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (tApplyOfflinevalve.getExecutionTime() != null) {//临时措施执行时间
             params.put("execT", Texts.of(DateUtils.dateTimeMin(tApplyOfflinevalve.getExecutionTime())).fontSize(9).bold().create());
         }
         if (StringUtils.isNotEmpty(tApplyOfflinevalve.getConfirmer())) {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplyOfflinevalve.getConfirmer()));
-            params.put("confirmer", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("tpP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("confirmer", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (tApplyOfflinevalve.getTemporaryTime() != null) {//临时措施确认时间
             params.put("tpT", Texts.of(DateUtils.dateTimeMin(tApplyOfflinevalve.getTemporaryTime())).fontSize(9).bold().create());
         }
         if (StringUtils.isNotEmpty(tApplyOfflinevalve.getApplicant())) {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplyOfflinevalve.getApplicant()));
-            params.put("applicant", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("applicantP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+                params.put("applicant", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            }
         }
         if (tApplyOfflinevalve.getApplicationTime() != null) {//申请时间
             params.put("applicationTime", Texts.of(DateUtils.dateTimeMin(tApplyOfflinevalve.getApplicationTime())).fontSize(9).bold().create());
         }
         if (StringUtils.isNotEmpty(tApplyOfflinevalve.getApprover())) {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplyOfflinevalve.getApprover()));
-            params.put("approver", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("approverP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+                params.put("approver", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            }
         }
         if (tApplyOfflinevalve.getApproveTime() != null) {//批准时间
             params.put("approveTime", Texts.of(DateUtils.dateTimeMin(tApplyOfflinevalve.getApproveTime())).fontSize(9).bold().create());
         }
         if (StringUtils.isNotEmpty(tApplyOfflinevalve.getLockConfirmer1())) {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplyOfflinevalve.getLockConfirmer1()));
-            params.put("lockConfirmer1", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("lockConfirmer1P", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("lockConfirmer1", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (StringUtils.isNotEmpty(tApplyOfflinevalve.getLockConfirmer2())) {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplyOfflinevalve.getLockConfirmer2()));
-            params.put("lockConfirmer2", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("lockConfirmer2P", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("lockConfirmer2", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (StringUtils.isNotEmpty(tApplyOfflinevalve.getInfoConfirmer())) {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplyOfflinevalve.getInfoConfirmer()));
-            params.put("infoConfirmer", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("infoConfirmerP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("infoConfirmer", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (tApplyOfflinevalve.getConfirmTime() != null) {//确认时间
             params.put("confirmTime", Texts.of(DateUtils.dateTimeMin(tApplyOfflinevalve.getConfirmTime())).fontSize(9).bold().create());
@@ -442,4 +466,14 @@ public class TApplyOfflinevalveController extends BaseController {
             params.put(check1,new TextRenderData("\u006F",new Style("Wingdings",9)));
         }
     }
+    /**
+     * @param
+     * @return 映射签名的文件名
+     * @throws IOException
+     */
+    public String fileName(String filepath) {
+        String newFilePath = filepath.replace("/profile", "");
+        String pathName = RuoYiConfig.getProfile() + newFilePath;
+        return pathName;
+    }
 }

+ 44 - 9
master/src/main/java/com/ruoyi/project/apply/controller/TApplySafetychangeController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.project.apply.controller;
 
 import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.data.Pictures;
 import com.deepoove.poi.data.TextRenderData;
 import com.deepoove.poi.data.Texts;
 import com.deepoove.poi.data.style.Style;
@@ -314,7 +315,10 @@ public class TApplySafetychangeController extends BaseController {
         params.put("changeReason", Texts.of(tApplySafetychange.getChangeReason()).fontSize(10).bold().create());
         if (StringUtils.isNotEmpty(tApplySafetychange.getApplicant())) {//申请人
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getApplicant()));
-            params.put("applicant", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("applicantP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("applicant", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (tApplySafetychange.getApplicationTime() != null) {//申请时间
             params.put("applicationTime", Texts.of(DateUtils.dateTimeMin(tApplySafetychange.getApplicationTime())).fontSize(9).bold().create());
@@ -322,7 +326,10 @@ public class TApplySafetychangeController extends BaseController {
         params.put("safa", Texts.of(tApplySafetychange.getSafa()).fontSize(10).bold().create());
         if (StringUtils.isNotEmpty(tApplySafetychange.getSafaer())) {//安全评估人
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getSafaer()));
-            params.put("safaer", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("safaerP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("safaer", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
 
         if (tApplySafetychange.getSafaTime() != null) {//安全评估时间
@@ -330,21 +337,30 @@ public class TApplySafetychangeController extends BaseController {
         }
         if (StringUtils.isNotEmpty(tApplySafetychange.getApprover())) {//批准人
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getApprover()));
-            params.put("approver", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("approverP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("approver", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (tApplySafetychange.getApplicationTime() != null) {//批准时间
             params.put("approveTime", Texts.of(DateUtils.dateTimeMin(tApplySafetychange.getApplicationTime())).fontSize(9).bold().create());
         }
         if (StringUtils.isNotEmpty(tApplySafetychange.getExecutor())) {//临时安全措施执行人
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getExecutor()));
-            params.put("exe", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("exeP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("exe", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (tApplySafetychange.getExecutionTime() != null) {//临时安全措施执行(时间)
             params.put("exeT", Texts.of(DateUtils.dateTimeMin(tApplySafetychange.getExecutionTime())).fontSize(9).bold().create());
         }
         if (StringUtils.isNotEmpty(tApplySafetychange.getConfirmer())) {//临时安全措施确认人
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getConfirmer()));
-            params.put("con", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("conP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("con", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (tApplySafetychange.getConfirmTime() != null) {//临时安全措施确认(时间)
             params.put("conT", Texts.of(DateUtils.dateTimeMin(tApplySafetychange.getConfirmTime())).fontSize(9).bold().create());
@@ -353,23 +369,32 @@ public class TApplySafetychangeController extends BaseController {
 
         if (StringUtils.isNotEmpty(tApplySafetychange.getChangeExecutor())) {//执行人
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getChangeExecutor()));
-            params.put("changeExecutor", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("cEP", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("cE", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (tApplySafetychange.getChangeExecutorTime() != null) {//执行时间)
-            params.put("changeExecutorTime", Texts.of(DateUtils.dateTimeMin(tApplySafetychange.getChangeExecutorTime())).fontSize(9).bold().create());
+            params.put("cET", Texts.of(DateUtils.dateTimeMin(tApplySafetychange.getChangeExecutorTime())).fontSize(9).bold().create());
         }
         getCheck(params,tApplySafetychange.getResetConfirm(),"resetConfirm1" ,"resetConfirm2");
 
         if (StringUtils.isNotEmpty(tApplySafetychange.getResetConfirmer1())) {//状态恢复,确认人1
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getResetConfirmer1()));
-            params.put("resetConfirmer1", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("resetConfirmer1P", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("resetConfirmer1", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (tApplySafetychange.getResetConfirmTime1() != null) {//状态恢复,确认人1时间)
             params.put("resetConfirmTime1", Texts.of(DateUtils.dateTimeMin(tApplySafetychange.getResetConfirmTime1())).fontSize(9).bold().create());
         }
         if (StringUtils.isNotEmpty(tApplySafetychange.getResetConfirmer2())) {//状态恢复,确认人2
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getResetConfirmer2()));
-            params.put("resetConfirmer2", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            if (sysUser.getSignUrl() != null && new File(fileName(sysUser.getSignUrl())).exists()) {
+                params.put("resetConfirmer2P", Pictures.ofLocal(fileName(sysUser.getSignUrl())).size(50, 20).create());
+            }else {
+            params.put("resetConfirmer2", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());}
         }
         if (tApplySafetychange.getResetConfirmTime2() != null) {//状态恢复,确认人2时间)
             params.put("resetConfirmTime2", Texts.of(DateUtils.dateTimeMin(tApplySafetychange.getResetConfirmTime2())).fontSize(9).bold().create());
@@ -438,4 +463,14 @@ public class TApplySafetychangeController extends BaseController {
             params.put(check1,new TextRenderData("\u006F",new Style("Wingdings",9)));
         }
     }
+    /**
+     * @param
+     * @return 映射签名的文件名
+     * @throws IOException
+     */
+    public String fileName(String filepath) {
+        String newFilePath = filepath.replace("/profile", "");
+        String pathName = RuoYiConfig.getProfile() + newFilePath;
+        return pathName;
+    }
 }

+ 1 - 1
master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /u03/cpmsfile/uploadPath)
-  profile: /u03/cpmsfile/uploadPath
+  profile: D:/ruoyi/uploadPath
   # 邮件中链接跳转路径 示例(本地:http://localhost/#,服务器:http://47.114.101.16:8080/cpms/index.html#)
   requestJumpPath: https://cpms.basf-ypc.net.cn/cpms/index.html#
   # 获取ip地址开关

BIN
master/src/main/resources/static/word/apply/applyOfflinevalve.docx


BIN
master/src/main/resources/static/word/apply/applySafetychange.docx