|
@@ -5,6 +5,8 @@ import com.zd.common.core.annotation.PreAuthorize;
|
|
|
import com.zd.common.core.log.BusinessType;
|
|
import com.zd.common.core.log.BusinessType;
|
|
|
import com.zd.common.core.security.TokenService;
|
|
import com.zd.common.core.security.TokenService;
|
|
|
import com.zd.common.core.utils.ExcelUtil;
|
|
import com.zd.common.core.utils.ExcelUtil;
|
|
|
|
|
+import com.zd.common.core.utils.FileConfigUtils;
|
|
|
|
|
+import com.zd.common.core.utils.StringUtils;
|
|
|
import com.zd.common.core.web.controller.BaseController;
|
|
import com.zd.common.core.web.controller.BaseController;
|
|
|
import com.zd.laboratory.domain.LabWhitelist;
|
|
import com.zd.laboratory.domain.LabWhitelist;
|
|
|
import com.zd.laboratory.domain.XxpClassify;
|
|
import com.zd.laboratory.domain.XxpClassify;
|
|
@@ -44,6 +46,9 @@ public class LabXxpInspectionController extends BaseController
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private TokenService tokenService;
|
|
private TokenService tokenService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private FileConfigUtils fileConfigUtils;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 查询巡查列表
|
|
* 查询巡查列表
|
|
|
*/
|
|
*/
|
|
@@ -218,6 +223,15 @@ public class LabXxpInspectionController extends BaseController
|
|
|
@PostMapping("/app/selectUserXxpInspectionList")
|
|
@PostMapping("/app/selectUserXxpInspectionList")
|
|
|
public ResultData selectUserXxpInspectionList(Long labId,String startTime,String endTime )
|
|
public ResultData selectUserXxpInspectionList(Long labId,String startTime,String endTime )
|
|
|
{
|
|
{
|
|
|
- return ResultData.success(xxpInspectionService.selectUserXxpInspectionList(labId,startTime,endTime));
|
|
|
|
|
|
|
+ List<Map<String,Object>> list = xxpInspectionService.selectUserXxpInspectionList(labId,startTime,endTime);
|
|
|
|
|
+ Optional.ofNullable(list).orElseGet(Collections::emptyList)
|
|
|
|
|
+ .stream()
|
|
|
|
|
+ .forEach(a->{
|
|
|
|
|
+ if(StringUtils.isNotNull(a.get("userImg"))){
|
|
|
|
|
+ String url = fileConfigUtils.getFileDomainApp() + a.get("userImg");
|
|
|
|
|
+ a.put("userImg",url);
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ return ResultData.success(list);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|