~whyclxw/LithiumBms.git

			@@ -113,10 +113,10 @@
			private List<Float> monWhs;


			@TableField(exist = false)
			private Float maxTmp;
			@ApiModelProperty(value = "最大温度")
			private Float maxTemp;

			@TableField(exist = false)
			private Float minTmp;
			@ApiModelProperty(value = "最小温度")
			private Float minTemp;

			}

			@@ -137,8 +137,8 @@
			sheet.getRow(rowNum).createCell(1).setCellValue(String.format("%.1f",tdata.getGroupVol()));
			sheet.getRow(rowNum).createCell(2).setCellValue(String.format("%.1f",tdata.getTestCurr()));
			sheet.getRow(rowNum).createCell(3).setCellValue(String.format("%.1f",tdata.getTestCap()));
			sheet.getRow(rowNum).createCell(4).setCellValue(String.format("%.1f",tdata.getMaxTmp()));
			sheet.getRow(rowNum).createCell(5).setCellValue(String.format("%.1f",tdata.getMinTmp()));
			sheet.getRow(rowNum).createCell(4).setCellValue(String.format("%.1f",tdata.getMaxTemp()));
			sheet.getRow(rowNum).createCell(5).setCellValue(String.format("%.1f",tdata.getMinTemp()));
			if (tdata.getMonVols() != null) {
			List<Float> monVols = tdata.getMonVols();
			for (int j = 0; j < monVols.size(); j++) {

			@@ -73,23 +73,16 @@
			List<Float> monVols=null;
			List<Integer> monNums=null;
			BatttestdataId tdata=null;
			Float maxTmp=0f;
			Float minTmp=0f;
			int num=0;
			try {
			while (rs.next()){
			int monNum=rs.getInt("mon_num");
			float monvol=rs.getFloat("mon_vol");
			int recordNum=rs.getInt("record_num");
			Float monTmp=rs.getFloat("mon_tmp");
			if(num!=recordNum){
			if(num!=0){
			tdata.setMonVols(monVols);
			tdata.setMonNums(monNums);
			tdata.setMaxTmp(maxTmp);
			tdata.setMinTmp(minTmp);
			maxTmp=0f;
			minTmp=0f;
			list.add(tdata);
			}
			tdata=new BatttestdataId();
			@@ -107,19 +100,13 @@
			tdata.setTestCurr(rs.getDouble("test_curr"));
			tdata.setTestCap(rs.getDouble("test_cap"));
			tdata.setNeedTest(rs.getInt("need_test"));
			tdata.setMaxTemp(rs.getFloat("max_temp"));
			tdata.setMinTemp(rs.getFloat("min_temp"));
			num=recordNum;
			}
			if(monTmp>maxTmp){
			maxTmp =monTmp;
			}
			if(monTmp<minTmp){
			minTmp=monTmp;
			}
			monVols.add(monvol);
			monNums.add(monNum);
			}
			tdata.setMaxTmp(maxTmp);
			tdata.setMinTmp(minTmp);
			tdata.setMonVols(monVols);
			tdata.setMonNums(monNums);
			list.add(tdata);

	src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataId.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/service/ExcelExportService.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/service/SubTablePageInfoService.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史