-fix bug

master/src/main/java/com/ruoyi/project/apply/controller/TApplySafetychangeController.java

@@ -86,7 +86,6 @@ public class TApplySafetychangeController extends BaseController {
     }
 
 
-
     /**
      * 导出组织保护措施状态变更申请列表
      */
@@ -126,8 +125,8 @@ public class TApplySafetychangeController extends BaseController {
         tApplySafetychange.setSafaer(null);
         // tApplySafetychange.setConfirmer(tApplySafetychange.getSafaer());
 //        tApplySafetychange.setConfirmerName(tApplySafetychange.getSafaerName());
-        if(StringUtils.isNotEmpty(tApplySafetychange.getRemarks())&&(!tApplySafetychange.getRemarks().endsWith("；")||!tApplySafetychange.getRemarks().endsWith(";")))
-            tApplySafetychange.setRemarks("申请人-" + tApplySafetychange.getRemarks()+"；");
+        if (StringUtils.isNotEmpty(tApplySafetychange.getRemarks()) && (!tApplySafetychange.getRemarks().endsWith("；") || !tApplySafetychange.getRemarks().endsWith(";")))
+            tApplySafetychange.setRemarks("申请人-" + getNickName() + "：" + tApplySafetychange.getRemarks() + "；");
         tApplySafetychangeService.insertTApplySafetychange(tApplySafetychange);
 
         // 开始申请流程
@@ -137,7 +136,7 @@ public class TApplySafetychangeController extends BaseController {
         Authentication.setAuthenticatedUserId(userId);//设置当前申请人
         Map<String, Object> variables = new HashMap<>();
         variables.put("applyuser", userId);
-        StringBuilder confirmer= new StringBuilder();
+        StringBuilder confirmer = new StringBuilder();
         for (String staffId : safaerIds.split(",")) {
             SysUser user = userService.selectUserByStaffId(staffId);
             confirmer.append(user.getUserId()).append(",");
@@ -169,7 +168,7 @@ public class TApplySafetychangeController extends BaseController {
             changeExecutors = new StringBuilder(changeExecutors.substring(0, changeExecutors.length() - 1));
         }
         variables.put("changeExecutor", changeExecutors.toString());
-        variables.put("changeNextTaskListener",new ChangeNextTaskListener());
+        variables.put("changeNextTaskListener", new ChangeNextTaskListener());
         variables.put("changeEndFailListener", new ChangeEndFailListener());
         variables.put("changeEndSuccessListener", new ChangeEndSuccessListener());
         variables.put("changeFlowListener", new ChangeFlowListener());
@@ -369,8 +368,9 @@ public class TApplySafetychangeController extends BaseController {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getApplicant()));
             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());}
+            } 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());
@@ -380,8 +380,9 @@ public class TApplySafetychangeController extends BaseController {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getSafaer()));
             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());}
+            } else {
+                params.put("safaer", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            }
         }
 
         if (tApplySafetychange.getSafaTime() != null) {//安全评估时间
@@ -391,8 +392,9 @@ public class TApplySafetychangeController extends BaseController {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getApprover()));
             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());}
+            } 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());
@@ -401,8 +403,9 @@ public class TApplySafetychangeController extends BaseController {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getExecutor()));
             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());}
+            } 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());
@@ -411,8 +414,9 @@ public class TApplySafetychangeController extends BaseController {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getConfirmer()));
             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());}
+            } 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());
@@ -423,20 +427,22 @@ public class TApplySafetychangeController extends BaseController {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getChangeExecutor()));
             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());}
+            } else {
+                params.put("cE", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
+            }
         }
         if (tApplySafetychange.getChangeExecutorTime() != null) {//执行时间）
             params.put("cET", Texts.of(DateUtils.dateTimeMin(tApplySafetychange.getChangeExecutorTime())).fontSize(9).bold().create());
         }
-        getCheck(params,tApplySafetychange.getResetConfirm(),"resetConfirm1" ,"resetConfirm2");
+        getCheck(params, tApplySafetychange.getResetConfirm(), "resetConfirm1", "resetConfirm2");
 
         if (StringUtils.isNotEmpty(tApplySafetychange.getResetConfirmer1())) {//状态恢复，确认人1
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getResetConfirmer1()));
             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());}
+            } 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());
@@ -445,15 +451,16 @@ public class TApplySafetychangeController extends BaseController {
             SysUser sysUser = userService.selectUserById(Long.parseLong(tApplySafetychange.getResetConfirmer2()));
             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());}
+            } 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());
         }
 
-        getCheck(params,tApplySafetychange.getRevokeConfirm(),"revoke1" ,"revoke2");
-        getCheck(params,tApplySafetychange.getRevokeConfirm(),"revoke3" );
+        getCheck(params, tApplySafetychange.getRevokeConfirm(), "revoke1", "revoke2");
+        getCheck(params, tApplySafetychange.getRevokeConfirm(), "revoke3");
         params.put("remarks", Texts.of(tApplySafetychange.getRemarks()).fontSize(10).bold().create());
 
         // 渲染文本
@@ -476,7 +483,7 @@ public class TApplySafetychangeController extends BaseController {
             logger.info("目录不存在，创建文件夹{}!", fileDir);
             dir.mkdirs();
         }
-        fileName = fileName.replaceAll("/" , "_"); //替换文件中敏感字段
+        fileName = fileName.replaceAll("/", "_"); //替换文件中敏感字段
         logger.info("目录文件{}!", fileName);
         String filePath = fileDir + "/" + fileName;
         logger.info("目录{}!", filePath);
@@ -494,27 +501,30 @@ public class TApplySafetychangeController extends BaseController {
         String pathFileName = FileUploadUtils.getPathFileName(RuoYiConfig.getFilePath("/" + "apply/applySafetychange"), fileName);
         return pathFileName;
     }
+
     // 勾选框判断渲染
-    public void getCheck (Map<String, Object> params, String value , String check1 , String check2){
+    public void getCheck(Map<String, Object> params, String value, String check1, String check2) {
         if ("是".equals(value)) {
-            params.put(check1,new TextRenderData("\u00FE",new Style("Wingdings",9)));
-            params.put(check2,new TextRenderData("\u006F",new Style("Wingdings",9)));
-        }else if ("否".equals(value)) {
-            params.put(check1,new TextRenderData("\u006F",new Style("Wingdings",9)));
-            params.put(check2,new TextRenderData("\u00FE",new Style("Wingdings",9)));
-        }else {
-            params.put(check1,new TextRenderData("\u006F",new Style("Wingdings",9)));
-            params.put(check2,new TextRenderData("\u006F",new Style("Wingdings",9)));
+            params.put(check1, new TextRenderData("\u00FE", new Style("Wingdings", 9)));
+            params.put(check2, new TextRenderData("\u006F", new Style("Wingdings", 9)));
+        } else if ("否".equals(value)) {
+            params.put(check1, new TextRenderData("\u006F", new Style("Wingdings", 9)));
+            params.put(check2, new TextRenderData("\u00FE", new Style("Wingdings", 9)));
+        } else {
+            params.put(check1, new TextRenderData("\u006F", new Style("Wingdings", 9)));
+            params.put(check2, new TextRenderData("\u006F", new Style("Wingdings", 9)));
         }
     }
+
     // 勾选框判断渲染
-    public void getCheck (Map<String, Object> params, String value , String check1){
+    public void getCheck(Map<String, Object> params, String value, String check1) {
         if ("NA".equals(value)) {
-            params.put(check1,new TextRenderData("\u00FE",new Style("Wingdings",9)));
+            params.put(check1, new TextRenderData("\u00FE", new Style("Wingdings", 9)));
         } else {
-            params.put(check1,new TextRenderData("\u006F",new Style("Wingdings",9)));
+            params.put(check1, new TextRenderData("\u006F", new Style("Wingdings", 9)));
         }
     }
+
     /**
      * @param
      * @return 映射签名的文件名