feat: 导出任务审核2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/init/InitController.java

@@ -1466,11 +1466,17 @@ public class InitController {
 
                   String taskUserId = task.getTaskUserId();
                   SysUser sysUser = userMap.get(Integer.parseInt(taskUserId));
-                  model.setSalesName(sysUser.getRealname());
 
+                  if (sysUser != null) {
+                  model.setSalesName(sysUser.getRealname());
                   SysDept dept = deptMap.get(sysUser.getDeptId());
-
                   model.setVendorName(dept.getName());
+                  } else {
+                    model.setSalesName("");
+                    model.setVendorName("");
+                  }
+
+
                   model.setArea("");
                   model.setTaskContentId(task.getTaskContentId());
                   model.setTaskType(task.getTaskTypeId());
@@ -1516,7 +1522,7 @@ public class InitController {
                   List<SysCheckChainNodeCheckHistory> area = nodeId2CheckMap.get(3);
 
                   if (CollUtil.isNotEmpty(area)) {
-                    Map<String, String> info = getInfo(city, dtf);
+                    Map<String, String> info = getInfo(area, dtf);
                     model.setAreaCheckTime(info.get("time"));
                     model.setAreaCheckResult(info.get("result"));
                     model.setAreaCheckMsg(info.get("msg"));
@@ -1525,8 +1531,8 @@ public class InitController {
                   // 市场
                   List<SysCheckChainNodeCheckHistory> mkt = nodeId2CheckMap.get(8);
 
-                  if (CollUtil.isNotEmpty(vendor)) {
-                    Map<String, String> info = getInfo(city, dtf);
+                  if (CollUtil.isNotEmpty(mkt)) {
+                    Map<String, String> info = getInfo(mkt, dtf);
                     model.setMktCheckTime(info.get("time"));
                     model.setMktCheckResult(info.get("result"));
                     model.setMktCheckMsg(info.get("msg"));
@@ -1536,7 +1542,7 @@ public class InitController {
                   List<SysCheckChainNodeCheckHistory> biz = nodeId2CheckMap.get(9);
 
                   if (CollUtil.isNotEmpty(biz)) {
-                    Map<String, String> info = getInfo(city, dtf);
+                    Map<String, String> info = getInfo(biz, dtf);
                     model.setBizCheckTime(info.get("time"));
                     model.setBizCheckResult(info.get("result"));
                     model.setBizCheckMsg(info.get("msg"));
@@ -1571,6 +1577,7 @@ public class InitController {
 
   private Map<String, String> getInfo(
       List<SysCheckChainNodeCheckHistory> v, DateTimeFormatter dtf) {
+
     v =
         v.stream()
             .sorted(Comparator.comparing(SysCheckChainNodeCheckHistory::getHistoryId))