Browse Source

修改的三个问题

tags/v1.1.0
qiujinyang 2 years ago
parent
commit
ebeebc0ee3
2 changed files with 24 additions and 16 deletions
  1. +4
    -7
      tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java
  2. +20
    -9
      tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/ReportServiceImpl.java

+ 4
- 7
tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java View File

package com.tuoheng.admin.service.impl; package com.tuoheng.admin.service.impl;


import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
Map<String,Integer> resultMap=new HashMap<>(); Map<String,Integer> resultMap=new HashMap<>();
for (QuestionCountVO questionCountVo : questionCountVoList) { for (QuestionCountVO questionCountVo : questionCountVoList) {
setInfo(resultMap, questionCountVo,QuestionStatusEnum.CONFIRM.getCode(),QuestionStatusEnum.CONFIRM.name().toLowerCase()); setInfo(resultMap, questionCountVo,QuestionStatusEnum.CONFIRM.getCode(),QuestionStatusEnum.CONFIRM.name().toLowerCase());
setInfo(resultMap, questionCountVo,QuestionStatusEnum.NOTREVIEWED.getCode(),QuestionStatusEnum.NOTREVIEWED.name().toLowerCase());
setInfo(resultMap, questionCountVo,QuestionStatusEnum.NEGLECT.getCode(),QuestionStatusEnum.NEGLECT.name().toLowerCase());
} }


if(!resultMap.containsKey(QuestionStatusEnum.CONFIRM.name().toLowerCase())){ if(!resultMap.containsKey(QuestionStatusEnum.CONFIRM.name().toLowerCase())){
resultMap.put(QuestionStatusEnum.CONFIRM.name().toLowerCase(),0); resultMap.put(QuestionStatusEnum.CONFIRM.name().toLowerCase(),0);
} }
if(!resultMap.containsKey(QuestionStatusEnum.NOTREVIEWED.name().toLowerCase())){
resultMap.put(QuestionStatusEnum.NOTREVIEWED.name().toLowerCase(),0);
if(!resultMap.containsKey(QuestionStatusEnum.NEGLECT.name().toLowerCase())){
resultMap.put(QuestionStatusEnum.NEGLECT.name().toLowerCase(),0);
} }


return JsonResult.success(resultMap); return JsonResult.success(resultMap);
} }


private static Map<String, Integer> setInfo(Map<String, Integer> resultMap, QuestionCountVO questionCountVo, Integer code, String name) {
private static void setInfo(Map<String, Integer> resultMap, QuestionCountVO questionCountVo, Integer code, String name) {
if(questionCountVo.getStatus().equals(code)){ if(questionCountVo.getStatus().equals(code)){
if(resultMap.containsKey(name)){ if(resultMap.containsKey(name)){
Integer current = resultMap.get(name); Integer current = resultMap.get(name);
resultMap.put(name, questionCountVo.getQuantity()); resultMap.put(name, questionCountVo.getQuantity());
} }
} }
return resultMap;
} }


@Override @Override

+ 20
- 9
tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/ReportServiceImpl.java View File

str = "巡查里程"; str = "巡查里程";
font.setStyle(Font.NORMAL); font.setStyle(Font.NORMAL);
} else { } else {
str = reportInfoVO.getMission().getMileage();
if(StringUtils.isNotEmpty(reportInfoVO.getMission().getMileage())){
try{
int temp = Integer.parseInt(reportInfoVO.getMission().getMileage()) / 1000;
str = temp+"公里";
}catch (Exception e){
log.info("转换里程出错:{}",e.getMessage());
str="";
}
}else{
str = "";
}

} }
Paragraph p = new Paragraph(str, font); Paragraph p = new Paragraph(str, font);
cell.add(p); cell.add(p);
} else if (i == 2) { } else if (i == 2) {
str = "林场问题图斑"; str = "林场问题图斑";
} else if (i == 3) { } else if (i == 3) {
if(questionCount.containsKey("LC001")){
str = questionCount.get("LC001").toString().trim();
if(questionCount.containsKey("002000")){
str = questionCount.get("002000").toString().trim();
font.setStyle(Font.NORMAL); font.setStyle(Font.NORMAL);
}else{ }else{
str = "0"; str = "0";
} else if (i == 4) { } else if (i == 4) {
str = "病死树"; str = "病死树";
} else if (i == 5) { } else if (i == 5) {
if(questionCount.containsKey("LC002")){
str = questionCount.get("LC002").toString().trim();
if(questionCount.containsKey("002001")){
str = questionCount.get("002001").toString().trim();
font.setStyle(Font.NORMAL); font.setStyle(Font.NORMAL);
}else{ }else{
str = "0"; str = "0";
} else if (i == 6) { } else if (i == 6) {
str = "人员活动"; str = "人员活动";
} else if (i == 7) { } else if (i == 7) {
if(questionCount.containsKey("LC003")){
str = questionCount.get("LC003").toString().trim();
if(questionCount.containsKey("002003")){
str = questionCount.get("002003").toString().trim();
font.setStyle(Font.NORMAL); font.setStyle(Font.NORMAL);
}else{ }else{
str = "0"; str = "0";
} else if (i == 8) { } else if (i == 8) {
str = "火灾隐患"; str = "火灾隐患";
} else{ } else{
if(questionCount.containsKey("LC004")){
str = questionCount.get("LC004").toString().trim();
if(questionCount.containsKey("002004")){
str = questionCount.get("002004").toString().trim();
font.setStyle(Font.NORMAL); font.setStyle(Font.NORMAL);
}else{ }else{
str = "0"; str = "0";

Loading…
Cancel
Save