工程质量分析
This commit is contained in:
parent
a5d41afb51
commit
9499c91f60
|
|
@ -42,6 +42,7 @@ public class DataAnalysisController extends BaseController {
|
|||
|
||||
@Resource(name = "DataAnalysisMapper")
|
||||
private DataAnalysisMapper mapper;
|
||||
|
||||
@ApiOperation("根据类型获取数据分析应用")
|
||||
@GetMapping("getDataAnalysisByType")
|
||||
public AjaxResult getDataAnalysisByType(ScreenParamDto dto) {
|
||||
|
|
@ -129,9 +130,10 @@ public class DataAnalysisController extends BaseController {
|
|||
List<String> list = table1.get(0);
|
||||
ProjectQualityVo vo = new ProjectQualityVo();
|
||||
vo.setProjectName(list.get(0));
|
||||
vo.setProjectManager(list.get(1));
|
||||
vo.setTeam(list.get(2));
|
||||
vo.setStartTime(list.get(3));
|
||||
vo.setCheckItems(list.get(1));
|
||||
vo.setProjectManager(list.get(2));
|
||||
vo.setTeam(list.get(3));
|
||||
vo.setStartTime(list.get(4));
|
||||
|
||||
int allValues = 0;
|
||||
int passValues = 0;
|
||||
|
|
@ -139,40 +141,31 @@ public class DataAnalysisController extends BaseController {
|
|||
List<List<String>> table2 = result.get("表格2");
|
||||
allValues = allValues + table2.size();
|
||||
for (List<String> row : table2) {
|
||||
for (String cell : row) {
|
||||
if (cell.equals("合格")) {
|
||||
passValues++;
|
||||
} else if (cell.equals("不合格")) {
|
||||
noPassReason.append(row.get(row.size() - 1));
|
||||
noPassReason.append(",");
|
||||
}
|
||||
if (row.get(1).equals("合格")) {
|
||||
passValues++;
|
||||
} else if (row.get(1).equals("不合格")) {
|
||||
noPassReason.append(row.get(row.size() - 1));
|
||||
noPassReason.append(",");
|
||||
}
|
||||
}
|
||||
List<List<String>> table3 = result.get("表格3");
|
||||
allValues = allValues + table3.size();
|
||||
for (List<String> row : table3) {
|
||||
for (String cell : row) {
|
||||
if (cell.equals("合格")) {
|
||||
passValues++;
|
||||
} else if (cell.equals("不合格")) {
|
||||
noPassReason.append(row.get(row.size() - 1));
|
||||
noPassReason.append(",");
|
||||
}
|
||||
if (row.get(1).equals("合格")) {
|
||||
passValues++;
|
||||
} else if (row.get(1).equals("不合格")) {
|
||||
noPassReason.append(row.get(row.size() - 1));
|
||||
noPassReason.append(",");
|
||||
}
|
||||
String lastValue = row.get(row.size() - 1);
|
||||
noPassReason.append(lastValue);
|
||||
noPassReason.append(",");
|
||||
}
|
||||
List<List<String>> table4 = result.get("表格4");
|
||||
allValues = allValues + table4.size();
|
||||
for (List<String> row : table4) {
|
||||
for (String cell : row) {
|
||||
if (cell.equals("合格")) {
|
||||
passValues++;
|
||||
} else if (cell.equals("不合格")) {
|
||||
noPassReason.append(row.get(row.size() - 1));
|
||||
noPassReason.append(",");
|
||||
}
|
||||
if (row.get(1).equals("合格")) {
|
||||
passValues++;
|
||||
} else if (row.get(1).equals("不合格")) {
|
||||
noPassReason.append(row.get(row.size() - 1));
|
||||
noPassReason.append(",");
|
||||
}
|
||||
}
|
||||
vo.setCheckNum(new BigDecimal(allValues));
|
||||
|
|
|
|||
|
|
@ -66,8 +66,8 @@ public class DataAnalysisServiceImpl implements DataAnalysisService {
|
|||
// 转换为百分制分数(乘以 100)
|
||||
BigDecimal score = result.multiply(new BigDecimal("100"));
|
||||
|
||||
//保留0位小数,变成整数分
|
||||
BigDecimal integerScore = score.setScale(0, RoundingMode.HALF_UP);
|
||||
//保留2位小数
|
||||
BigDecimal integerScore = score.setScale(2, RoundingMode.HALF_UP);
|
||||
|
||||
// 转换为百分比格式(自动 ×100 并加上 %)
|
||||
NumberFormat percentFormat = NumberFormat.getPercentInstance(Locale.getDefault());
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.securitycontrol.screen.mapper.DataAnalysisMapper">
|
||||
<insert id="addProjectQuality">
|
||||
INSERT INTO tb_project_quality(project_name, project_manager, team, start_time, check_num, pass_num,unqualified_items)
|
||||
VALUES (#{projectName}, #{projectManager}, #{team}, #{startTime}, #{checkNum}, #{passNum}, #{unqualifiedItems})
|
||||
INSERT INTO tb_project_quality(project_name, project_manager, team, start_time, check_num, pass_num,unqualified_items,check_items)
|
||||
VALUES (#{projectName}, #{projectManager}, #{team}, #{startTime}, #{checkNum}, #{passNum}, #{unqualifiedItems},#{checkItems})
|
||||
</insert>
|
||||
|
||||
<!--根据类型获取数据分析应用-->
|
||||
|
|
|
|||
Loading…
Reference in New Issue