guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

优化导出

0927cmt
zhaoyu 2024-04-15 15:05:41 +08:00
parent 515b953f8e
commit 622d72a257
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java
View File

@ -1428,8 +1428,9 @@ public class HiddenApiController extends BaseController {
} }
//月 //月
if(StringUtils.equals("3",type)){ if(StringUtils.equals("3",type)){
String[] month = year.split("-");
map.put("type","统计月度:"); map.put("type","统计月度:");
map.put("num",year+"年第"+num+"月"); map.put("num",month[0]+"年第"+month[1]+"月");
} }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
String date =sdf.format(new Date()); String date =sdf.format(new Date());

18
src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java
View File

@ -743,7 +743,7 @@ public class HiddenServiceImpl implements HiddenService{
map.put("zcbZcZs","0"); //总数 map.put("zcbZcZs","0"); //总数
map.put("zcbZcZg","0"); //整改数 map.put("zcbZcZg","0"); //整改数
map.put("zcbZcWwcZg","0"); //整改未完成数 map.put("zcbZcWwcZg","0"); //整改未完成数
map.put("zcbZcZgl","100%"); //整改率 map.put("zcbZcZgl","0%"); //整改率
map.put("zcbZcZgZj","0"); //资金 map.put("zcbZcZgZj","0"); //资金
} }
//卸车部自查数据 //卸车部自查数据
@ -767,7 +767,7 @@ public class HiddenServiceImpl implements HiddenService{
map.put("xcbZcZs","0"); //总数 map.put("xcbZcZs","0"); //总数
map.put("xcbZcZg","0"); //整改数 map.put("xcbZcZg","0"); //整改数
map.put("xcbZcWwcZg","0"); //整改未完成数 map.put("xcbZcWwcZg","0"); //整改未完成数
map.put("xcbZcZgl","100%"); //整改率 map.put("xcbZcZgl","0%"); //整改率
map.put("xcbZcZgZj","0"); //资金 map.put("xcbZcZgZj","0"); //资金
} }
//保障部自查数据 //保障部自查数据
@ -791,7 +791,7 @@ public class HiddenServiceImpl implements HiddenService{
map.put("bzbZcZs","0"); //总数 map.put("bzbZcZs","0"); //总数
map.put("bzbZcZg","0"); //整改数 map.put("bzbZcZg","0"); //整改数
map.put("bzbZcWwcZg","0"); //整改未完成数 map.put("bzbZcWwcZg","0"); //整改未完成数
map.put("bzbZcZgl","100%"); //整改率 map.put("bzbZcZgl","0%"); //整改率
map.put("bzbZcZgZj","0"); //资金 map.put("bzbZcZgZj","0"); //资金
} }
//公司查数据 //公司查数据
@ -819,7 +819,7 @@ public class HiddenServiceImpl implements HiddenService{
map.put("zcbGscZs","0"); //总数 map.put("zcbGscZs","0"); //总数
map.put("zcbGscZg","0"); //整改数 map.put("zcbGscZg","0"); //整改数
map.put("zcbGscWwcZg","0"); //整改未完成数 map.put("zcbGscWwcZg","0"); //整改未完成数
map.put("zcbGscZgl","100%"); //整改率 map.put("zcbGscZgl","0%"); //整改率
map.put("zcbGscZgZj","0"); //资金 map.put("zcbGscZgZj","0"); //资金
} }
//卸车部自查数据 //卸车部自查数据
@ -843,7 +843,7 @@ public class HiddenServiceImpl implements HiddenService{
map.put("xcbGscZs","0"); //总数 map.put("xcbGscZs","0"); //总数
map.put("xcbGscZg","0"); //整改数 map.put("xcbGscZg","0"); //整改数
map.put("xcbGscWwcZg","0"); //整改未完成数 map.put("xcbGscWwcZg","0"); //整改未完成数
map.put("xcbGscZgl","100%"); //整改率 map.put("xcbGscZgl","0%"); //整改率
map.put("xcbGscZgZj","0"); //资金 map.put("xcbGscZgZj","0"); //资金
} }
//保障部自查数据 //保障部自查数据
@ -867,7 +867,7 @@ public class HiddenServiceImpl implements HiddenService{
map.put("bzbGscZs","0"); //总数 map.put("bzbGscZs","0"); //总数
map.put("bzbGscZg","0"); //整改数 map.put("bzbGscZg","0"); //整改数
map.put("bzbGscWwcZg","0"); //整改未完成数 map.put("bzbGscWwcZg","0"); //整改未完成数
map.put("bzbGscZgl","100%"); //整改率 map.put("bzbGscZgl","0%"); //整改率
map.put("bzbGscZgZj","0"); //资金 map.put("bzbGscZgZj","0"); //资金
} }
// 处理汇总数据 // 处理汇总数据
@ -881,7 +881,7 @@ public class HiddenServiceImpl implements HiddenService{
BigDecimal zcbResult = new BigDecimal(zcbHjZg).divide(new BigDecimal(zcbHjZs), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); BigDecimal zcbResult = new BigDecimal(zcbHjZg).divide(new BigDecimal(zcbHjZs), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
map.put("zcbHjZgl",zcbResult.intValue()+"%"); //整改率 map.put("zcbHjZgl",zcbResult.intValue()+"%"); //整改率
}else { }else {
map.put("zcbHjZgl","100%"); //整改率 map.put("zcbHjZgl","0%"); //整改率
} }
int zcbHjZgZj = Integer.parseInt(map.get("zcbZcZgZj").toString())+Integer.parseInt(map.get("zcbGscZgZj").toString()); int zcbHjZgZj = Integer.parseInt(map.get("zcbZcZgZj").toString())+Integer.parseInt(map.get("zcbGscZgZj").toString());
map.put("zcbHjZgZj",zcbHjZgZj); //资金 map.put("zcbHjZgZj",zcbHjZgZj); //资金
@ -895,7 +895,7 @@ public class HiddenServiceImpl implements HiddenService{
BigDecimal xcbResult = new BigDecimal(xcbHjZg).divide(new BigDecimal(xcbHjZs), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); BigDecimal xcbResult = new BigDecimal(xcbHjZg).divide(new BigDecimal(xcbHjZs), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
map.put("xcbHjZgl",xcbResult.intValue()+"%"); //整改率 map.put("xcbHjZgl",xcbResult.intValue()+"%"); //整改率
}else { }else {
map.put("xcbHjZgl","100%"); //整改率 map.put("xcbHjZgl","0%"); //整改率
} }
int xcbHjZgZj = Integer.parseInt(map.get("xcbZcZgZj").toString())+Integer.parseInt(map.get("xcbGscZgZj").toString()); int xcbHjZgZj = Integer.parseInt(map.get("xcbZcZgZj").toString())+Integer.parseInt(map.get("xcbGscZgZj").toString());
map.put("xcbHjZgZj",xcbHjZgZj); //资金 map.put("xcbHjZgZj",xcbHjZgZj); //资金
@ -909,7 +909,7 @@ public class HiddenServiceImpl implements HiddenService{
BigDecimal bzbResult = new BigDecimal(bzbHjZg).divide(new BigDecimal(bzbHjZs), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); BigDecimal bzbResult = new BigDecimal(bzbHjZg).divide(new BigDecimal(bzbHjZs), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
map.put("bzbHjZgl",bzbResult.intValue()+"%"); //整改率 map.put("bzbHjZgl",bzbResult.intValue()+"%"); //整改率
}else { }else {
map.put("bzbHjZgl","100%"); //整改率 map.put("bzbHjZgl","0%"); //整改率
} }
int bzbHjZgZj = Integer.parseInt(map.get("bzbZcZgZj").toString())+Integer.parseInt(map.get("bzbGscZgZj").toString()); int bzbHjZgZj = Integer.parseInt(map.get("bzbZcZgZj").toString())+Integer.parseInt(map.get("bzbGscZgZj").toString());
map.put("bzbHjZgZj",bzbHjZgZj); //资金 map.put("bzbHjZgZj",bzbHjZgZj); //资金