|
@@ -13,6 +13,7 @@ import com.usky.fire.domain.DemPoliceRecord;
|
|
|
import com.usky.fire.mapper.DemPoliceRecordMapper;
|
|
|
import com.usky.fire.service.DemPoliceInfoService;
|
|
|
import com.usky.fire.service.DemPoliceRecordService;
|
|
|
+import com.usky.fire.service.vo.DemPoliceRecordExportVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -88,6 +89,68 @@ public class DemPoliceRecordServiceImpl extends AbstractCrudService<DemPoliceRec
|
|
|
return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<DemPoliceRecordExportVO> policeRecordListExport(String caseCode, String branch){
|
|
|
+ List<DemPoliceRecordExportVO> list = new ArrayList<>();
|
|
|
+ LambdaQueryWrapper<DemPoliceRecord> queryWrapper = Wrappers.lambdaQuery();
|
|
|
+ queryWrapper.select(DemPoliceRecord::getCaseInfoId, DemPoliceRecord::getHandleStartTime, DemPoliceRecord::getHandleEndTime)
|
|
|
+ .eq(DemPoliceRecord::getDeleteFlag, "0")
|
|
|
+ .orderByDesc(DemPoliceRecord::getId);
|
|
|
+ List<DemPoliceRecord> list1 = this.list(queryWrapper);
|
|
|
+ if (CollectionUtils.isNotEmpty(list1)) {
|
|
|
+ List<String> policeIdList = new ArrayList<>();
|
|
|
+ for (int i = 0; i < list1.size(); i++) {
|
|
|
+ policeIdList.add(list1.get(i).getCaseInfoId());
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isNotEmpty(policeIdList)) {
|
|
|
+ LambdaQueryWrapper<DemPoliceInfo> queryWrapper1 = Wrappers.lambdaQuery();
|
|
|
+ queryWrapper1.select(DemPoliceInfo::getId, DemPoliceInfo::getCaseCode, DemPoliceInfo::getBranch,
|
|
|
+ DemPoliceInfo::getTimeSlot, DemPoliceInfo::getArea, DemPoliceInfo::getCaseType,
|
|
|
+ DemPoliceInfo::getFilingDate, DemPoliceInfo::getFilingTime, DemPoliceInfo::getHandleObject,
|
|
|
+ DemPoliceInfo::getCaseStatus, DemPoliceInfo::getCaseNature, DemPoliceInfo::getDispatchVehicle,
|
|
|
+ DemPoliceInfo::getPoliceId)
|
|
|
+ .in(DemPoliceInfo::getPoliceId, policeIdList)
|
|
|
+ .like(StringUtils.isNotBlank(branch), DemPoliceInfo::getBranch, branch)
|
|
|
+ .like(StringUtils.isNotBlank(caseCode), DemPoliceInfo::getCaseCode, caseCode);
|
|
|
+ List<DemPoliceInfo> list2 = demPoliceInfoService.list(queryWrapper1);
|
|
|
+ for (int i = 0; i < list1.size(); i++) {
|
|
|
+ DemPoliceRecordExportVO demPoliceRecordExportVO = new DemPoliceRecordExportVO();
|
|
|
+ demPoliceRecordExportVO.setCaseCode(null);
|
|
|
+ demPoliceRecordExportVO.setHandleStartTime(list1.get(i).getHandleStartTime());
|
|
|
+ demPoliceRecordExportVO.setHandleEndTime(list1.get(i).getHandleEndTime());
|
|
|
+ demPoliceRecordExportVO.setBranch(null);
|
|
|
+ demPoliceRecordExportVO.setTimeSlot(null);
|
|
|
+ demPoliceRecordExportVO.setArea(null);
|
|
|
+ demPoliceRecordExportVO.setCaseType(null);
|
|
|
+ demPoliceRecordExportVO.setFilingDate(null);
|
|
|
+ demPoliceRecordExportVO.setFilingTime(null);
|
|
|
+ demPoliceRecordExportVO.setHandleObject(null);
|
|
|
+ demPoliceRecordExportVO.setCaseStatus(null);
|
|
|
+ demPoliceRecordExportVO.setCaseNature(null);
|
|
|
+ demPoliceRecordExportVO.setDispatchVehicle(null);
|
|
|
+ for (int j = 0; j < list2.size(); j++) {
|
|
|
+ if (list1.get(i).getCaseInfoId().equals(list2.get(j).getPoliceId())) {
|
|
|
+ demPoliceRecordExportVO.setCaseCode(list2.get(j).getCaseCode());
|
|
|
+ demPoliceRecordExportVO.setBranch(list2.get(j).getBranch());
|
|
|
+ demPoliceRecordExportVO.setTimeSlot(list2.get(j).getTimeSlot());
|
|
|
+ demPoliceRecordExportVO.setArea(list2.get(j).getArea());
|
|
|
+ demPoliceRecordExportVO.setCaseType(list2.get(j).getCaseType());
|
|
|
+ demPoliceRecordExportVO.setFilingDate(list2.get(j).getFilingDate());
|
|
|
+ demPoliceRecordExportVO.setFilingTime(list2.get(j).getFilingTime());
|
|
|
+ demPoliceRecordExportVO.setHandleObject(list2.get(j).getHandleObject());
|
|
|
+ demPoliceRecordExportVO.setCaseStatus(list2.get(j).getCaseStatus());
|
|
|
+ demPoliceRecordExportVO.setCaseNature(list2.get(j).getCaseNature());
|
|
|
+ demPoliceRecordExportVO.setDispatchVehicle(list2.get(j).getDispatchVehicle());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ list.add(demPoliceRecordExportVO);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return list;
|
|
|
+ }
|
|
|
+
|
|
|
@Transactional
|
|
|
@Override
|
|
|
public void updatePoliceRecord(DemPoliceRecord demPoliceRecord) {
|