Jelajahi Sumber

feat:限制日期显示解决可能带T的问题

侯茂昌 1 tahun lalu
induk
melakukan
7d27cfc405

+ 1 - 1
zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/controller/BpmExecuteNodeController.java

@@ -74,7 +74,7 @@ public class BpmExecuteNodeController extends BaseController {
     /**
      * 修改节点执行(记录)
      */
-    @PreAuthorize("@ss.hasPermi('system:node:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:node:edit')")
     @Log(title = "节点执行日志", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BpmExecuteNode bpmExecuteNode) {

+ 12 - 4
zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/CommonServiceImpl.java

@@ -288,10 +288,18 @@ public class CommonServiceImpl implements ICommonService {
                     //正则匹配成功
                     boolean validDateTimeFormat = isValidDateTimeFormat(v.toString());
                     if(validDateTimeFormat){
-                        LocalDateTime localDateTime = DateUtils.toLocalDateTime(v.toString(), "yyyy-MM-dd HH:mm:ss");
-                        DateTimeFormatter fmt = DateTimeFormatter.ofPattern(tableFormat);
-                        String dateStr = localDateTime.format(fmt);
-                        resultMap.put(k,dateStr);
+                        if(v.toString().indexOf("T")>0){
+                            DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME; // 默认支持这种格式
+                            LocalDateTime dateTime = LocalDateTime.parse(v.toString(), formatter);
+                            DateTimeFormatter fmt = DateTimeFormatter.ofPattern(tableFormat);
+                            String dateStr = dateTime.format(fmt);
+                            resultMap.put(k,dateStr);
+                        }else {
+                            LocalDateTime localDateTime = DateUtils.toLocalDateTime(v.toString(), "yyyy-MM-dd HH:mm:ss");
+                            DateTimeFormatter fmt = DateTimeFormatter.ofPattern(tableFormat);
+                            String dateStr = localDateTime.format(fmt);
+                            resultMap.put(k,dateStr);
+                        }
                     }
                 }
             });