CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang

Browse Source
This commit is contained in:
闫阳
2023-03-08 10:43:29 +08:00
parent 4e932a09fd fe10292885
commit 1684075a9c
6 changed files with 290 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
View File

@@ -129,7 +129,7 @@ public class WoPackagingBoxSubstrateController {
@PostMapping("/powerReport")
public Result<PowerReportVo> powerReport(@RequestBody PowerReportQueryParam queryParam){
List<PowerReportDTO> powerReportDTOS = boxServiceBiz.powerReport(queryParam);
System.out.println(powerReportDTOS.toString());
PowerReportVo powerReportVo = new PowerReportVo();
Float totalLevelPower = new Float(0);
Float totalCompensatePower = new Float(0);
@@ -144,12 +144,12 @@ public class WoPackagingBoxSubstrateController {
totalSubNum+= subNum;
}
for(PowerReportDTO power : powerReportDTOS){
Float prop = Float.valueOf(power.getSubNum())/Float.valueOf(totalSubNum);
Float prop = (Float.valueOf(power.getSubNum())/Float.valueOf(totalSubNum))*100;
DecimalFormat df = new DecimalFormat("0.00");
String propS = df.format(prop)+"%";
power.setProportion(propS);
}
diversePower = totalLevelPower - totalCompensatePower;
diversePower = totalCompensatePower - totalLevelPower;
powerReportVo.setPowerReports(powerReportDTOS);
powerReportVo.setDiversePower(diversePower);
powerReportVo.setTotalCompensatePower(totalCompensatePower);

7
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
View File

@@ -46,6 +46,11 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
private WoPackagingBoxSubstrateServiceBiz woPackagingBoxSubstrateServiceBiz;
public static void main(String[] args) {
LocalDateTime localDate=LocalDateTime.parse("2023-03-23 09:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
System.out.println(localDate);
}
@Override
public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){
@@ -55,6 +60,8 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
if(params.get("startTime")!=null && params.get("endTime")!=null){
LocalDateTime startTime = LocalDateTime.parse(params.get("startTime").toString(),df);
LocalDateTime endTime = LocalDateTime.parse(params.get("endTime").toString(),df);
wrapper.between(startTime!=null && endTime!=null, WoPackagingBox.CREATE_TIME, startTime, endTime);
}
String boxNo = (String) params.get("boxNo");

6
ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java
View File

@@ -12,9 +12,9 @@ import java.util.List;
*/
@Data
public class PowerReportVo {
private Float totalLevelPower;
private Float totalCompensatePower;
private Float diversePower;
private Float totalLevelPower; //档位功率汇总
private Float totalCompensatePower; //补偿功率汇总
private Float diversePower; //差异功率汇总
private List<PowerReportDTO> powerReports;