|
@@ -8,12 +8,14 @@ import com.platform.dao.bean.MyPage;
|
|
|
import com.platform.dao.dto.hidden.HiddenDangerDTO;
|
|
|
import com.platform.dao.dto.repair.RepairApplicationFormDTO;
|
|
|
import com.platform.dao.entity.hidden.HiddenDanger;
|
|
|
+import com.platform.dao.entity.sb.SbInfo;
|
|
|
import com.platform.dao.entity.upms.SysFile;
|
|
|
import com.platform.dao.enums.HiddenDangerStatusEnum;
|
|
|
import com.platform.dao.enums.RepairApplicationFormSourceEnum;
|
|
|
import com.platform.dao.enums.SysFileTypeEnum;
|
|
|
import com.platform.dao.enums.SysRoleCodeEnum;
|
|
|
import com.platform.dao.mapper.hidden.HiddenDangerMapper;
|
|
|
+import com.platform.dao.mapper.sb.SbPositionMapper;
|
|
|
import com.platform.dao.vo.query.hidden.HiddenDangerVO;
|
|
|
import com.platform.service.base.impl.BaseServiceImpl;
|
|
|
import com.platform.service.hidden.HiddenDangerService;
|
|
@@ -27,6 +29,7 @@ import tk.mybatis.mapper.weekend.WeekendCriteria;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -41,6 +44,8 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
|
|
|
private SysFileService sysFileService;
|
|
|
@Resource
|
|
|
private SbInfoService sbInfoService;
|
|
|
+ @Resource
|
|
|
+ private SbPositionMapper sbPositionMapper;
|
|
|
|
|
|
@Override
|
|
|
public int batchDelete(List<String> ids) {
|
|
@@ -54,6 +59,16 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
|
|
|
@Override
|
|
|
public AbstractPageResultBean<HiddenDangerVO> selectPageList(HiddenDangerDTO record, int pageNum, int pageSize) {
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
+ if(record.getSearchType() != null){
|
|
|
+ List<Integer> statusList = new ArrayList<>();
|
|
|
+ if(record.getSearchType() == 1) { // 待转任务
|
|
|
+ statusList.add(HiddenDangerStatusEnum.NEW_APPLY.getValue());
|
|
|
+ }else if(record.getSearchType() == 2){
|
|
|
+ statusList.add(HiddenDangerStatusEnum.ON_GOING.getValue());
|
|
|
+ statusList.add(HiddenDangerStatusEnum.FINISHED.getValue());
|
|
|
+ }
|
|
|
+ record.setStatusList(statusList);
|
|
|
+ }
|
|
|
return new MyPage(mapper.selectList(record));
|
|
|
}
|
|
|
|
|
@@ -77,7 +92,7 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
|
|
|
throw new DeniedException("隐患任务ID不能为空");
|
|
|
}
|
|
|
String role = StringUtils.getRoles();
|
|
|
- if(role.contains(SysRoleCodeEnum.Maintenance_Leader.name())){
|
|
|
+ if(!role.contains(SysRoleCodeEnum.Maintenance_Leader.name())){
|
|
|
throw new DeniedException("不具备该权限");
|
|
|
}
|
|
|
sysFileService.saveFile(model.getId(), SysFileTypeEnum.HIDDEN_DANGER_BEFORE_IMGS.getValue(), model.getBeforeImageList());
|
|
@@ -131,7 +146,10 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
|
|
|
});
|
|
|
vo.setBeforeImageList(beforeImageList);
|
|
|
vo.setFileList(fileList);
|
|
|
- vo.setSbCph(sbInfoService.getById(vo.getSbId()).getCph());
|
|
|
+ SbInfo sbInfo = sbInfoService.getModelById(vo.getSbId());
|
|
|
+ vo.setSbCph(sbInfo.getCph());
|
|
|
+ vo.setSbName(sbInfo.getName());
|
|
|
+ vo.setPositionName(sbPositionMapper.selectNameById(vo.getPositionId()));
|
|
|
return vo;
|
|
|
}
|
|
|
|