只保留年月

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictbval/DynamicTbValServiceImpl.java

@@ -141,7 +141,7 @@ public class DynamicTbValServiceImpl extends ServiceImpl<DynamicTbValMapper, Dyn
                     java.time.LocalDateTime dateTime = OADateFormat.convertOADateToLocalDateTime(oaDate);
                     //后缀为_yearMonth的字段只保留年月
                     if (colCode.endsWith("_yearMonth")) {
-                        valValue = dateTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM"));
+                        valValue = dateTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                     }else{
                         valValue = dateTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                     }
@@ -297,7 +297,12 @@ public class DynamicTbValServiceImpl extends ServiceImpl<DynamicTbValMapper, Dyn
 
         var listTbVal = this.lambdaQuery().eq(DynamicTbValDO::getInsId, dynamicTBInsDO.getId()).list();
         listTbVal = listTbVal.stream().filter(val -> StrUtil.isNotBlank(val.getValValue())).toList();
-
+        listTbVal.forEach(val -> {
+            //后缀为_yearMonth的字段只显示年月，将YYYY-MM-dd转为YYYY-MM
+            if (val.getColCode().endsWith("_yearMonth") && StrUtil.isNotBlank(val.getValValue()) && val.getValValue().length() >= 7) {
+                val.setValValue(val.getValValue().substring(0, 7));
+            }
+        });
 
         result.setDynamicTbValRespVOList(BeanUtils.toBean(listTbVal, DynamicTbValRespVO.class));
         result.setDynamicTbColRespVOList(BeanUtils.toBean(dynamicTbColDOS, DynamicTbColRespVO.class));