增加记录点检人 点检时间

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -1568,7 +1568,9 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 Map<String, String> beanMap = Convert.toMap(String.class, String.class, item1);
                 List<Integer> worksNumList = IntStream.rangeClosed(item1.getSnoStart(), item1.getSnoEnd()).boxed().collect(Collectors.toList());
                 workMap.forEach((key, value) -> {
-                    beanMap.merge(key, value, (v1, v2) -> v1);
+                    if (value != null) {
+                        beanMap.merge(key, value, (v1, v2) -> v1);
+                    }
                 });
                 List<String> frequencyList = new ArrayList<>();
                 if (item1.getFirstFlag().equals(1)) {

application-file/src/main/resources/application-uat.yml

@@ -17,12 +17,12 @@ spring:
       strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
       datasource:
         self:
-          url: jdbc:mysql://39.100.230.190:8092/longdy?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://39.100.230.190:8092/longdy?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
           username: root
           password: Jh@Jh2019!
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
         file:
-          url: jdbc:mysql://39.100.230.190:8092/longdy?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://39.100.230.190:8092/longdy?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
           username: root
           password: Jh@Jh2019!
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置