添加隐患处理类型等接口
parent
8a1947dbd3
commit
bd1690cea5
|
@ -120,7 +120,7 @@ public class StatisticsDataController extends BaseController {
|
|||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID",CORPINFO_ID);
|
||||
pd.put("CORPINFO_ID", CORPINFO_ID);
|
||||
|
||||
//清单类型占比统计
|
||||
List<PageData> chartData = listmanagerService.statisticsGroupType(pd);
|
||||
|
@ -151,7 +151,7 @@ public class StatisticsDataController extends BaseController {
|
|||
for (int i = 0; i < legendData.size(); i++) {
|
||||
PageData pd = new PageData();
|
||||
pd.put("CORPINFO_ID", CORPINFO_ID);
|
||||
pd.put("STATENAME",legendData.get(i));
|
||||
pd.put("STATENAME", legendData.get(i));
|
||||
List data = new ArrayList();
|
||||
List<PageData> hdRecChart = hiddenService.statisticsGroupMonthByState(pd); //根据状态按时间分组统计隐患数据
|
||||
for (int j = 0; j < halfYearMonth.size(); j++) {
|
||||
|
@ -193,7 +193,7 @@ public class StatisticsDataController extends BaseController {
|
|||
Map<String, Object> chartData = new HashMap<String, Object>();
|
||||
List<PageData> deptList = riskpointService.listDeptByPoint(pd);
|
||||
List<String> yAxisData = new ArrayList<String>();
|
||||
for(PageData d :deptList){
|
||||
for (PageData d : deptList) {
|
||||
PageData pdf = new PageData();
|
||||
yAxisData.add(d.getString("DEPT_NAME"));
|
||||
}
|
||||
|
@ -202,7 +202,7 @@ public class StatisticsDataController extends BaseController {
|
|||
List<Dictionaries> varList = dictionariesService.listSubDictByParentId("5a81e63ec0e94d919b3138bc01dbef6b");
|
||||
List<String> legendData = new ArrayList<String>();
|
||||
List seriesData = new ArrayList();
|
||||
for(Dictionaries d :varList){
|
||||
for (Dictionaries d : varList) {
|
||||
PageData pdf = new PageData();
|
||||
legendData.add(d.getNAME());
|
||||
seriesData.add(new ArrayList());
|
||||
|
@ -211,7 +211,7 @@ public class StatisticsDataController extends BaseController {
|
|||
//隐患整改趋势(近半年)
|
||||
for (int i = 0; i < deptList.size(); i++) {
|
||||
PageData dept = new PageData();
|
||||
dept.put("DEPARTMENT_ID",deptList.get(i).getString("DEPARTMENT_ID"));
|
||||
dept.put("DEPARTMENT_ID", deptList.get(i).getString("DEPARTMENT_ID"));
|
||||
List<PageData> dataChart = riskpointService.statisticsGroupLevelByDept(dept); //按照级别分类统计各部门风险管控数据
|
||||
for (int j = 0; j < varList.size(); j++) {
|
||||
List secondList = (List) seriesData.get(j);
|
||||
|
@ -345,17 +345,19 @@ public class StatisticsDataController extends BaseController {
|
|||
return map;
|
||||
}
|
||||
|
||||
/**数据可视化平台首页获取
|
||||
/**
|
||||
* 数据可视化平台首页获取
|
||||
* 1.获取企业的置顶视频
|
||||
* 2.获取管理的置顶视频
|
||||
* 3.没有视频或者没有置顶视频
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/getObjectForBiLogin")
|
||||
@RequestMapping(value = "/getObjectForBiLogin")
|
||||
@ResponseBody
|
||||
public Object getObjectForBiLogin() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
public Object getObjectForBiLogin() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd.put("TYPE", "1");
|
||||
|
@ -373,14 +375,16 @@ public class StatisticsDataController extends BaseController {
|
|||
return map;
|
||||
}
|
||||
|
||||
/**获取重大危险源数据
|
||||
/**
|
||||
* 获取重大危险源数据
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/findValidateData")
|
||||
@RequestMapping(value = "/findValidateData")
|
||||
@ResponseBody
|
||||
public Object findValidateData() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
public Object findValidateData() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
List<PageData> varList = majordangersourcedisposalService.listAll(pd); //根据ID读取
|
||||
|
@ -654,14 +658,16 @@ public class StatisticsDataController extends BaseController {
|
|||
return lastDayOfMonth;
|
||||
}
|
||||
|
||||
/**首页 获取折线图
|
||||
/**
|
||||
* 首页 获取折线图
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/listmanagerIndexCount")
|
||||
@RequestMapping(value = "/listmanagerIndexCount")
|
||||
@ResponseBody
|
||||
public Object listmanagerIndexCount() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
public Object listmanagerIndexCount() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", CORPINFO_ID); //企业
|
||||
|
@ -672,30 +678,30 @@ public class StatisticsDataController extends BaseController {
|
|||
// {months: "2022-06", count: 0, screenType: "riskChecklistType0001"}
|
||||
// 6 * 3 近6個月 ,3 三种类型
|
||||
|
||||
Map<String,String> monSCrMap = new HashMap<>();
|
||||
for (PageData pageData : valList){
|
||||
String key = pageData.getString("months")+"*"+pageData.getString("screenType");
|
||||
monSCrMap.put(key,pageData.getString("count"));
|
||||
Map<String, String> monSCrMap = new HashMap<>();
|
||||
for (PageData pageData : valList) {
|
||||
String key = pageData.getString("months") + "*" + pageData.getString("screenType");
|
||||
monSCrMap.put(key, pageData.getString("count"));
|
||||
}
|
||||
|
||||
|
||||
List<String> halfYearMonth = DateUtil.getHalfYearMonth(true);
|
||||
String [] typeAll = new String[]{"riskChecklistType0001","riskChecklistType0002","zhqd03"};
|
||||
String[] typeAll = new String[]{"riskChecklistType0001", "riskChecklistType0002", "zhqd03"};
|
||||
|
||||
|
||||
List<Map<String,Object>> list = new ArrayList<>(); // 整理完成的数据 size 6 * 3
|
||||
for(String month : halfYearMonth){
|
||||
for (String type : typeAll){
|
||||
List<Map<String, Object>> list = new ArrayList<>(); // 整理完成的数据 size 6 * 3
|
||||
for (String month : halfYearMonth) {
|
||||
for (String type : typeAll) {
|
||||
String count = "0";
|
||||
|
||||
String key = month +"*" + type;
|
||||
if (monSCrMap.containsKey(key)){
|
||||
String key = month + "*" + type;
|
||||
if (monSCrMap.containsKey(key)) {
|
||||
count = monSCrMap.get(key);
|
||||
}
|
||||
Map<String,Object> monAndType = new HashMap<>();
|
||||
monAndType.put("months",month);
|
||||
monAndType.put("screenType",type);
|
||||
monAndType.put("count",count);
|
||||
Map<String, Object> monAndType = new HashMap<>();
|
||||
monAndType.put("months", month);
|
||||
monAndType.put("screenType", type);
|
||||
monAndType.put("count", count);
|
||||
list.add(monAndType);
|
||||
}
|
||||
}
|
||||
|
@ -867,14 +873,16 @@ public class StatisticsDataController extends BaseController {
|
|||
return map;
|
||||
}
|
||||
|
||||
/**平台公告
|
||||
/**
|
||||
* 平台公告
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/listByIndex")
|
||||
@RequestMapping(value = "/listByIndex")
|
||||
@ResponseBody
|
||||
public Object listByIndex(Page page) throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
public Object listByIndex(Page page) throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
//获取发布给这个企业的信息
|
||||
|
@ -888,18 +896,20 @@ public class StatisticsDataController extends BaseController {
|
|||
return map;
|
||||
}
|
||||
|
||||
/**企业公告
|
||||
/**
|
||||
* 企业公告
|
||||
*
|
||||
* @param page
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/enterpriseListByIndex")
|
||||
@RequestMapping(value = "/enterpriseListByIndex")
|
||||
@ResponseBody
|
||||
public Object enterpriseListByIndex(Page page) throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
public Object enterpriseListByIndex(Page page) throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
|
||||
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
|
||||
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
|
||||
pd.put("USER_ID", USER_ID);
|
||||
page.setPd(pd);
|
||||
List<PageData> varList = noticecorpService.listByIndex(page); //列出NOTICECORP列表
|
||||
|
@ -910,35 +920,37 @@ public class StatisticsDataController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
/**清單列表
|
||||
/**
|
||||
* 清單列表
|
||||
*
|
||||
* @param
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value="/checkListIndex")
|
||||
@RequestMapping(value = "/checkListIndex")
|
||||
@ResponseBody
|
||||
public Object checkListIndex() throws Exception{
|
||||
Map<String,Object> map = new HashMap<String,Object>();
|
||||
public Object checkListIndex() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
PageData pd = new PageData();
|
||||
pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", CORPINFO_ID); //企业
|
||||
pd.put("USER_ID",USER_ID);
|
||||
pd.put("USER_ID", USER_ID);
|
||||
pd.put("DEPARTMENT_ID", DEPT_ID);
|
||||
|
||||
pd.put("USER_ID","");
|
||||
pd.put("USER_ID", "");
|
||||
List<PageData> varList = listmanagerService.listAll(pd); //列出ListManager列表
|
||||
int wjcNum = 0;
|
||||
int yjcNum = 0;
|
||||
for (PageData list : varList) {
|
||||
if(list.getString("TYPE").equals("listType0005")) {
|
||||
if(Integer.parseInt(list.get("checkCount").toString()) > 0) {
|
||||
if (list.getString("TYPE").equals("listType0005")) {
|
||||
if (Integer.parseInt(list.get("checkCount").toString()) > 0) {
|
||||
yjcNum++;
|
||||
} else {
|
||||
wjcNum++;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if(Integer.parseInt(list.get("checkCount").toString()) > 0) {
|
||||
if (Integer.parseInt(list.get("checkCount").toString()) > 0) {
|
||||
yjcNum++;
|
||||
} else {
|
||||
wjcNum++;
|
||||
|
@ -951,5 +963,278 @@ public class StatisticsDataController extends BaseController {
|
|||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* <h1>隐患处理</h1>
|
||||
*
|
||||
* <p>
|
||||
* 数据可视化/任务处理情况/隐患处理
|
||||
* </p>
|
||||
*
|
||||
* @Data 2024年9月30日
|
||||
*/
|
||||
@RequestMapping(value = "/getBICount")
|
||||
@ResponseBody
|
||||
public Object getBICount() throws Exception {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", CORPINFO_ID);
|
||||
// 旬
|
||||
if (pd.get("IS_XUN") != null && Tools.notEmpty(pd.get("IS_XUN").toString())) {
|
||||
// 1-10
|
||||
if (DateUtil.timeCalendar(new Date(),
|
||||
DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00"),
|
||||
DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59"))) {
|
||||
pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "01 00:00:00");
|
||||
pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "10 23:59:59");
|
||||
}
|
||||
// 10-20
|
||||
if (DateUtil.timeCalendar(new Date(),
|
||||
DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00"),
|
||||
DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59"))) {
|
||||
pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "11 00:00:00");
|
||||
pd.put("ENDTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "20 23:59:59");
|
||||
}
|
||||
// 20-月底
|
||||
if (DateUtil.timeCalendar(new Date(),
|
||||
DateUtil.fomatDateTime(DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00"),
|
||||
DateUtil.fomatDateTime(DateUtil.getMonthEndDay() + " 23:59:59"))) {
|
||||
pd.put("STARTTIME", DateUtil.getYear() + "-" + DateUtil.getMonth() + "-" + "21 00:00:00");
|
||||
pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59");
|
||||
}
|
||||
}
|
||||
// 季度
|
||||
if (pd.get("IS_QUARTER") != null && Tools.notEmpty(pd.get("IS_QUARTER").toString())) {
|
||||
pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00");
|
||||
pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59");
|
||||
}
|
||||
|
||||
List<PageData> varList = hiddenService.getBICount(pd);
|
||||
if (varList != null && !varList.isEmpty()) {
|
||||
map.put("total", varList.size());
|
||||
int checked = 0;
|
||||
int uncheck = 0;
|
||||
for (PageData hidden : varList) {
|
||||
if (hidden.get("STATE").toString().equals("4") || hidden.get("STATE").toString().equals("15") || hidden.get("STATE").toString().equals("5") || hidden.get("STATE").toString().equals("6")) {
|
||||
checked++;
|
||||
} else {
|
||||
uncheck++;
|
||||
}
|
||||
|
||||
}
|
||||
map.put("checked", checked);
|
||||
map.put("uncheck", uncheck);
|
||||
} else {
|
||||
map.put("total", 0);
|
||||
map.put("checked", 0);
|
||||
map.put("uncheck", 0);
|
||||
}
|
||||
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* <h1>日常检查<h1/>
|
||||
*
|
||||
* <p>数据可视化/任务处理情况/日常检查</p>
|
||||
*/
|
||||
@RequestMapping(value = "/goBiListCount")
|
||||
@ResponseBody
|
||||
public Object goBiListCount() throws Exception {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", CORPINFO_ID); // 企业
|
||||
|
||||
switch (pd.get("COUNTTYPE").toString()) {
|
||||
case "day":// 每日
|
||||
pd.put("STARTTIME", DateUtil.getDay() + " 00:00:00");
|
||||
pd.put("ENDTIME", DateUtil.getDay() + " 23:59:59");
|
||||
break;
|
||||
|
||||
case "week":// 每周
|
||||
pd.put("STARTTIME", DateUtil.getWeekStart());
|
||||
pd.put("ENDTIME", DateUtil.getWeekEnd());
|
||||
break;
|
||||
|
||||
case "xun":// 每旬
|
||||
String year = DateUtil.getYear();
|
||||
String month = DateUtil.getMonth();
|
||||
Integer day = Integer.parseInt(DateUtil.getOnlyDay());
|
||||
String startTime = year + "-" + month + "-";
|
||||
String endTime = year + "-" + month + "-";
|
||||
if (day <= 10) {
|
||||
startTime = startTime + "01 00:00:00";
|
||||
endTime = endTime + "10 23:59:59";
|
||||
} else if (day > 10 && day <= 20) {
|
||||
startTime = startTime + "11 00:00:00";
|
||||
endTime = endTime + "20 23:59:59";
|
||||
} else {
|
||||
startTime = startTime + "21 00:00:00";
|
||||
endTime = DateUtil.getMonthEndDay() + " 23:59:59";
|
||||
}
|
||||
pd.put("STARTTIME", startTime);
|
||||
pd.put("ENDTIME", endTime);
|
||||
break;
|
||||
|
||||
case "month":// 每月
|
||||
pd.put("STARTTIME", DateUtil.getMonthFirstDay() + " 00:00:00");
|
||||
pd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59");
|
||||
break;
|
||||
|
||||
case "quarter":// 每季
|
||||
pd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00");
|
||||
pd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59");
|
||||
break;
|
||||
|
||||
case "year":// 每年
|
||||
pd.put("STARTTIME", DateUtil.getCurrYearFirst() + " 00:00:00");
|
||||
pd.put("ENDTIME", DateUtil.getCurrYearLast() + " 23:59:59");
|
||||
break;
|
||||
|
||||
case "halfyear":// 半年
|
||||
String byear = DateUtil.getYear();
|
||||
Integer bmonth = Integer.parseInt(DateUtil.getMonth());
|
||||
if (bmonth <= 6) {
|
||||
pd.put("STARTTIME", byear + "-01-01 00:00:00");
|
||||
pd.put("ENDTIME", byear + "-06-30 23:59:59");
|
||||
} else if (bmonth > 6) {
|
||||
pd.put("STARTTIME", byear + "-07-01 00:00:00");
|
||||
pd.put("ENDTIME", byear + "-12-31 23:59:59");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
String STARTTIME = pd.getString("STARTTIME");
|
||||
String ENDTIME = pd.getString("ENDTIME");
|
||||
|
||||
PageData all = new PageData();
|
||||
all.put("type", "all");
|
||||
all.put("name", "合计");
|
||||
all.put("molecule", 0);
|
||||
all.put("denominator", 0);
|
||||
all.put("percentage", 0d);
|
||||
|
||||
List<PageData> countList = listStatisticsService.getCountList(pd);// 统计分母
|
||||
|
||||
if (countList != null && !countList.isEmpty()) {
|
||||
int sum = 0;
|
||||
List<PageData> dayList = checkrecordService.listCountDay(pd); // 统计--日
|
||||
if (dayList != null && !dayList.isEmpty()) {
|
||||
for (PageData count : dayList) {
|
||||
sum += Integer.parseInt(count.get("NUM").toString());
|
||||
}
|
||||
}
|
||||
List<PageData> weekList = checkrecordService.listCountWeek(pd); // 统计--周
|
||||
if (weekList != null && !weekList.isEmpty()) {
|
||||
for (PageData count : weekList) {
|
||||
sum += Integer.parseInt(count.get("NUM").toString());
|
||||
}
|
||||
}
|
||||
List<PageData> monthList = checkrecordService.listCountMonth(pd); // 统计--月
|
||||
|
||||
if (monthList != null && !monthList.isEmpty()) {
|
||||
for (PageData count : monthList) {
|
||||
sum += Integer.parseInt(count.get("NUM").toString());
|
||||
}
|
||||
}
|
||||
List<PageData> quarterList = checkrecordService.listCountQuarter(pd); // 统计--季
|
||||
|
||||
if (quarterList != null && !quarterList.isEmpty()) {
|
||||
for (PageData count : quarterList) {
|
||||
sum += Integer.parseInt(count.get("NUM").toString());
|
||||
}
|
||||
}
|
||||
List<PageData> halfYearList = checkrecordService.listCountHalfYear(pd); // 统计--半年
|
||||
|
||||
if (halfYearList != null && !halfYearList.isEmpty()) {
|
||||
for (PageData count : halfYearList) {
|
||||
sum += Integer.parseInt(count.get("NUM").toString());
|
||||
}
|
||||
}
|
||||
List<PageData> yearList = checkrecordService.listCountYear(pd); // 统计--年
|
||||
if (yearList != null && !yearList.isEmpty()) {
|
||||
for (PageData count : yearList) {
|
||||
sum += Integer.parseInt(count.get("NUM").toString());
|
||||
}
|
||||
}
|
||||
// 处理旬时间
|
||||
StringBuilder stt = new StringBuilder();
|
||||
stt.append(pd.getString("STARTTIME"));
|
||||
stt.setCharAt(9, '1');
|
||||
pd.put("STARTTIME", stt.toString());
|
||||
|
||||
String endDay = ENDTIME.substring(8, 10);
|
||||
Integer endTime = Integer.parseInt(endDay);
|
||||
StringBuffer et = new StringBuffer();
|
||||
et.append(pd.getString("ENDTIME"));
|
||||
|
||||
if (endTime <= 10) {
|
||||
stt.setCharAt(8, '1');
|
||||
stt.setCharAt(9, '0');
|
||||
pd.put("ENDTIME", et.toString());
|
||||
} else if (endTime <= 20) {
|
||||
stt.setCharAt(8, '2');
|
||||
stt.setCharAt(9, '0');
|
||||
pd.put("ENDTIME", et.toString());
|
||||
} else {
|
||||
Integer endMonth = Integer.parseInt(ENDTIME.substring(5, 7));
|
||||
Integer endYear = Integer.parseInt(ENDTIME.substring(0, 4));
|
||||
pd.put("ENDTIME", getLastDayOfMonth(endYear, endMonth) + " 23:59:59");
|
||||
}
|
||||
List<PageData> tenDaysList = checkrecordService.listCountTenDays(pd); // 统计--旬
|
||||
if (tenDaysList != null && !tenDaysList.isEmpty()) {
|
||||
for (PageData count : tenDaysList) {
|
||||
sum += Integer.parseInt(count.get("NUM").toString());
|
||||
}
|
||||
}
|
||||
// 分母
|
||||
for (PageData count : countList) {
|
||||
|
||||
Integer allDenominator = Integer.parseInt(count.get("NOTEXAMINEDNUM").toString())
|
||||
+ Integer.parseInt(all.get("denominator").toString());
|
||||
all.put("denominator", allDenominator);
|
||||
}
|
||||
|
||||
Integer jjr = checkrecordService.listCountJjr(pd) == null ? 0 : checkrecordService.listCountJjr(pd);
|
||||
all.put("molecule", sum + jjr);
|
||||
}
|
||||
|
||||
if (!all.get("denominator").toString().equals("0")) {
|
||||
if (all.get("molecule").toString().equals("0")) {
|
||||
all.put("percentage", 0d);
|
||||
} else {
|
||||
Double denominator = Double.parseDouble(all.get("denominator").toString());
|
||||
Double molecule = Double.parseDouble(all.get("molecule").toString());
|
||||
Double percentage = molecule / denominator * 100;
|
||||
DecimalFormat df = new DecimalFormat("#.00");
|
||||
all.put("percentage", df.format(percentage));
|
||||
}
|
||||
}
|
||||
|
||||
map.put("all", all);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* <h1>排查信息</h1>
|
||||
* <p>辨识部位检查记录(排查信息)</p>
|
||||
*/
|
||||
@RequestMapping(value = "/listLogByIde")
|
||||
@ResponseBody
|
||||
public Object listLogByIde() throws Exception {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
String errInfo = "success";
|
||||
PageData pd = this.getPageData();
|
||||
pd.put("CORPINFO_ID", CORPINFO_ID); // 企业
|
||||
List<PageData> varList = checkrecordService.listLogByIde(pd);
|
||||
map.put("varList", varList);
|
||||
map.put("result", errInfo);
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue