|
|
@ -1,5 +1,6 @@ |
|
|
|
package com.hnac.hzinfo.inspect.task.controller; |
|
|
|
package com.hnac.hzinfo.inspect.task.controller; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil; |
|
|
|
import com.alibaba.druid.support.json.JSONUtils; |
|
|
|
import com.alibaba.druid.support.json.JSONUtils; |
|
|
|
import com.alibaba.excel.EasyExcel; |
|
|
|
import com.alibaba.excel.EasyExcel; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
@ -49,6 +50,7 @@ import org.springblade.resource.vo.PushInfoVO; |
|
|
|
import org.springblade.system.user.cache.UserCache; |
|
|
|
import org.springblade.system.user.cache.UserCache; |
|
|
|
import org.springblade.system.user.entity.User; |
|
|
|
import org.springblade.system.user.entity.User; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
|
|
|
import org.springframework.util.CollectionUtils; |
|
|
|
import org.springframework.util.ObjectUtils; |
|
|
|
import org.springframework.util.ObjectUtils; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
|
|
@ -119,7 +121,9 @@ public class TaskController extends BladeController { |
|
|
|
if(entity.getLttd()!=null&&entity.getLgtd()!=null) |
|
|
|
if(entity.getLttd()!=null&&entity.getLgtd()!=null) |
|
|
|
{points.add(entity.getLgtd().stripTrailingZeros().toPlainString()+","+entity.getLttd().stripTrailingZeros().toPlainString());} |
|
|
|
{points.add(entity.getLgtd().stripTrailingZeros().toPlainString()+","+entity.getLttd().stripTrailingZeros().toPlainString());} |
|
|
|
} |
|
|
|
} |
|
|
|
detail.setPoint(points); |
|
|
|
if (CollectionUtil.isNotEmpty(points)){ |
|
|
|
|
|
|
|
detail.setPoint(points); |
|
|
|
|
|
|
|
} |
|
|
|
return R.data(detail); |
|
|
|
return R.data(detail); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|