|
|
@@ -11,10 +11,7 @@ import com.usky.fire.mapper.PatrolInspectionPlanSonMapper;
|
|
|
import com.usky.fire.mapper.PatrolInspectionRecordMapper;
|
|
|
import com.usky.fire.service.*;
|
|
|
import com.usky.fire.service.util.OnlineMethod;
|
|
|
-import com.usky.fire.service.vo.DataCountVo;
|
|
|
-import com.usky.fire.service.vo.PatrolInspectionContentVo;
|
|
|
-import com.usky.fire.service.vo.PatrolInspectionPlanSonVo;
|
|
|
-import com.usky.fire.service.vo.PlanRecordVo;
|
|
|
+import com.usky.fire.service.vo.*;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@@ -278,6 +275,56 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<PatrolInspectionSiteVo> planSonSiteDetails(Integer planSonId) {
|
|
|
+ LambdaQueryWrapper<PatrolInspectionPlanSiteSon> queryWrapper = Wrappers.lambdaQuery();
|
|
|
+ queryWrapper.eq(PatrolInspectionPlanSiteSon::getPlanId, planSonId);
|
|
|
+ List<PatrolInspectionPlanSiteSon> planSiteSonList = patrolInspectionPlanSiteSonService.list(queryWrapper);
|
|
|
+ if (planSiteSonList.size() <= 0) {
|
|
|
+ throw new BusinessException("子计划不存在地点,请联系管理人员");
|
|
|
+ }
|
|
|
+
|
|
|
+ List<Integer> siteIdList = new ArrayList<>();
|
|
|
+ for (int i = 0; i < planSiteSonList.size(); i++) {
|
|
|
+ siteIdList.add(planSiteSonList.get(i).getSiteId());
|
|
|
+ }
|
|
|
+ LambdaQueryWrapper<PatrolInspectionSite> queryWrapperTwo = Wrappers.lambdaQuery();
|
|
|
+ queryWrapperTwo.in(PatrolInspectionSite::getId, siteIdList)
|
|
|
+ .eq(PatrolInspectionSite::getEnable, 1);
|
|
|
+ List<PatrolInspectionSite> siteList = patrolInspectionSiteService.list(queryWrapperTwo);
|
|
|
+ List<PatrolInspectionSiteVo> list = new ArrayList<>();
|
|
|
+ for (int i = 0; i < siteList.size(); i++) {
|
|
|
+ PatrolInspectionSiteVo SiteVo = new PatrolInspectionSiteVo();
|
|
|
+ SiteVo.setId(siteList.get(i).getId());
|
|
|
+ SiteVo.setSiteName(siteList.get(i).getSiteName());
|
|
|
+ SiteVo.setSiteNubmber(siteList.get(i).getSiteNubmber());
|
|
|
+ SiteVo.setSiteDescribe(siteList.get(i).getSiteDescribe());
|
|
|
+ SiteVo.setSiteType(siteList.get(i).getSiteType());
|
|
|
+ SiteVo.setCollector(siteList.get(i).getCollector());
|
|
|
+ SiteVo.setCollectTime(siteList.get(i).getCollectTime());
|
|
|
+ SiteVo.setLongitude(siteList.get(i).getLongitude());
|
|
|
+ SiteVo.setLatitude(siteList.get(i).getLatitude());
|
|
|
+ SiteVo.setAreaId(siteList.get(i).getAreaId());
|
|
|
+ SiteVo.setPictureUrl(siteList.get(i).getPictureUrl());
|
|
|
+ SiteVo.setCreateTime(siteList.get(i).getCreateTime());
|
|
|
+ SiteVo.setCreator(siteList.get(i).getCreator());
|
|
|
+ SiteVo.setEnable(siteList.get(i).getEnable());
|
|
|
+ SiteVo.setDistanceRange(siteList.get(i).getDistanceRange());
|
|
|
+ SiteVo.setTenantId(siteList.get(i).getTenantId());
|
|
|
+ SiteVo.setCompanyId(siteList.get(i).getCompanyId());
|
|
|
+ for (int j = 0; j < planSiteSonList.size(); j++) {
|
|
|
+ if (siteList.get(i).getId() == planSiteSonList.get(j).getSiteId()) {
|
|
|
+ SiteVo.setInspectionTime(planSiteSonList.get(j).getCreateTime());
|
|
|
+ SiteVo.setInspectionStatus(planSiteSonList.get(j).getInspectionStatus());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ list.add(SiteVo);
|
|
|
+ }
|
|
|
+ return list;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public Integer planSiteSonCount(Integer planSonId, Integer inspectionStatus) {
|
|
|
LambdaQueryWrapper<PatrolInspectionPlanSiteSon> queryWrapper = Wrappers.lambdaQuery();
|
jichaobo