fix 80818 未符合项-导出 导出内容需更改

fix 80612 未符合项-实际整改完成时间没有回显数据

laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java

@@ -52,6 +52,7 @@ import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 底层共通业务API，提供其他独立模块调用
@@ -311,7 +312,13 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 			table = QueryGenerator.getSqlRuleValue(table);
 		}
 		//update-end-author:taoyan date:20200820 for:【Online+系统】字典表加权限控制机制逻辑，想法不错 LOWCOD-799
-		return sysDictService.queryTableDictItemsByCode(table, text, code);
+		List<DictModel> dictModels = sysDictService.queryTableDictItemsByCode(table, text, code);
+		dictModels.forEach(i ->{
+			if (i.getText() == null){
+				i.setText(StringUtils.EMPTY);
+			}
+		});
+		return dictModels;
 	}
 
 	@Override
@@ -1191,7 +1198,13 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 
 	@Override
 	public List<DictModel> translateDictFromTableByKeys(String table, String text, String code, String keys) {
-		return sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(",")));
+		List<DictModel> dictModels = sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(",")));
+		dictModels.forEach(i ->{
+			if (i.getText() == null){
+				i.setText(StringUtils.EMPTY);
+			}
+		});
+		return dictModels;
 	}
 
 	@Override

laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java

@@ -1,6 +1,7 @@
 package com.jero.modules.activiti.process.projectnotmet.service;
 
 import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -293,6 +294,7 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         //更新未符合项列表状态
         LambdaUpdateWrapper<LawsEvaluationNotMet> wrapper = new LambdaUpdateWrapper<>();
         wrapper.set(LawsEvaluationNotMet::getState, UNDER_APPROVAL);
+        wrapper.set(LawsEvaluationNotMet::getRealityTime, DateUtil.date());
         wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList);
         lawsEvaluationNotMetService.update(wrapper);
     }