fix(核查模块): 修改省给市发起检查，市做完流程后，看不到业务记录

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckStatTableVo.java

@@ -45,4 +45,7 @@ public class CheckStatTableVo {
     private Integer checkType;
 
     private String queryField;
+
+    @ApiModelProperty("展示类型,0-统计，1-详情")
+    private Integer showType;
 }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/ConfirmCheckServiceImpl.java

 package com.tykj.dev.device.confirmcheck.service.impl;
 
+import com.github.wenhao.jpa.Specifications;
 import com.google.common.collect.Lists;
 import com.tykj.dev.blockcha.subject.entity.BcHash;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
@@ -10,6 +11,7 @@ import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckDetail;
 import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckPeriod;
 import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckStat;
 import com.tykj.dev.device.confirmcheck.entity.vo.CheckBillSelectVo;
+import com.tykj.dev.device.confirmcheck.entity.vo.CheckDetailVo;
 import com.tykj.dev.device.confirmcheck.entity.vo.CheckDeviceStatVo;
 import com.tykj.dev.device.confirmcheck.entity.vo.CheckStatTableVo;
 import com.tykj.dev.device.confirmcheck.repository.DeviceCheckBillDao;
@@ -23,6 +25,7 @@ import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.domin.Task;
+import com.tykj.dev.device.task.subject.vo.TaskUserVo;
 import com.tykj.dev.device.user.cache.AreaCache;
 import com.tykj.dev.device.user.subject.dao.AreaDao;
 import com.tykj.dev.device.user.subject.dao.UnitsDao;
@@ -34,6 +37,7 @@ import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.MapperUtils;
 import com.tykj.dev.misc.utils.PageUtil;
+import com.tykj.dev.misc.utils.TimestampUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -41,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.scheduling.support.CronTrigger;
@@ -325,6 +330,34 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
                 .filter(v1->unitIdFilter(v1,checkBillSelectVo.getUnitId()))
                 .collect(Collectors.toList());
 
+        //市级需要添加详情账单信息
+        Units unit = unitsRepo.findById(checkBillSelectVo.getUnitId()).get();
+        if(unit.getLevel() == 2) {
+            Specification<DeviceCheckDetail> pred = Specifications.<DeviceCheckDetail>and()
+                    .eq("checkUnit", unit.getName())
+                    .build();
+            List<CheckDetailVo> detailVoList = detailRepo.findAll(pred).stream()
+                    .map(transUtil::CheckDetailDo2Vo)
+                    .collect(toList());
+            List<CheckStatTableVo> cityDetailToStatList = detailVoList.stream().map(checkDetailVo -> {
+                CheckStatTableVo checkStatTableVo = new CheckStatTableVo();
+                checkStatTableVo.setId(checkDetailVo.getId());
+                String[] titles = checkDetailVo.getTitle().split("\\%\\^\\&");
+                if(titles.length > 1) {
+                    checkStatTableVo.setTitle(titles[1]);
+                }
+                checkStatTableVo.setShowType(1);
+                checkStatTableVo.setCreateTime(TimestampUtil.dateToLocalDateTime(checkDetailVo.getCheckTime()));
+                //设置完成情况
+                List<TaskUserVo> taskUserVos = taskService.findByBillIdAndBusinessType(checkDetailVo.getId(), 8).stream().map(Task::parse2Bto).map(TaskBto::toVo).collect(toList());
+                if (taskUserVos.size() == 1) {
+                    checkStatTableVo.setCompletion(taskUserVos.get(0).getStatus());
+                }
+                return checkStatTableVo;
+            }).collect(toList());
+            tableVos.addAll(cityDetailToStatList);
+        }
+
         return PageUtil.getPerPage(checkBillSelectVo.getPage(),checkBillSelectVo.getSize(),tableVos,checkBillSelectVo.getPageable());
 
     }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -194,7 +194,8 @@ public class ObjTransUtil {
                 stat.getCreateTime(),
                 completion,
                 stat.getCheckType().getId(),
-                joiner.toString()
+                joiner.toString(),
+                0
         );
 
     }

dev-misc/src/main/java/com/tykj/dev/misc/utils/TimestampUtil.java

@@ -4,6 +4,7 @@ import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
@@ -135,10 +136,14 @@ public class TimestampUtil {
                 .toLocalDate();
     }
 
+    public static LocalDateTime dateToLocalDateTime(Date date) {
+        return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+    }
+
     /**
      * @return 当前时间的Date类型
      */
     public static Date getNowDate() {
-        return Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        return Date.from(LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant());
     }
 }