diff --git a/jwtech-admin-page/src/views/build/attendance/index.vue b/jwtech-admin-page/src/views/build/attendance/index.vue index b08456ef..a28bf681 100644 --- a/jwtech-admin-page/src/views/build/attendance/index.vue +++ b/jwtech-admin-page/src/views/build/attendance/index.vue @@ -141,7 +141,7 @@ - + diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSubProjectController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSubProjectController.java index 28f43359..f6f79d0b 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSubProjectController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSubProjectController.java @@ -3,6 +3,7 @@ package com.kms.build.controller; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; @@ -78,14 +79,24 @@ public class BsSgcJsjdBuiSubProjectController extends BaseController return AjaxResult.success(bsSgcJsjdBuiSubProjectService.getById(id)); } + + @GetMapping("/getSubProject/{id}") + public AjaxResult getSubProject(@PathVariable("id") String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("unit_id", id); + return AjaxResult.success(bsSgcJsjdBuiSubProjectService.list(queryWrapper)); + + + } + /** * 新增分部工程 */ @Log(title = "分部工程新增", businessType = BusinessType.INSERT) @PostMapping @ApiOperation("分部工程新增") - public AjaxResult add(@RequestBody BsSgcJsjdBuiSubProject bsSgcJsjdBuiSubProject) - { + public AjaxResult add(@RequestBody BsSgcJsjdBuiSubProject bsSgcJsjdBuiSubProject) { + BaseEntityUtils.preInsert(bsSgcJsjdBuiSubProject); return toAjax(bsSgcJsjdBuiSubProjectService.save(bsSgcJsjdBuiSubProject)); } diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java index 6d7d0fe3..cee100f0 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java @@ -2,10 +2,14 @@ package com.kms.build.controller; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; +import com.kms.build.domain.BsSgcJsjdBuiSubProjectQuality; +import com.kms.build.service.BsSgcJsjdBuiSubProjectQualityService; import com.kms.common.utils.BaseEntityUtils; @@ -45,6 +49,13 @@ public class BsSgcJsjdBuiUnitQualityRateController extends BaseController @Autowired private BsSgcJsjdBuiUnitQualityRateService bsSgcJsjdBuiUnitQualityRateService; + @Autowired + private BsSgcJsjdBuiSubProjectQualityService bsSgcJsjdBuiSubProjectQualityService; + + + + + /** * 查询单位工程质量评定列表 */ @@ -52,7 +63,27 @@ public class BsSgcJsjdBuiUnitQualityRateController extends BaseController @ApiOperation("单位工程质量评定列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcJsjdBuiUnitQualityRateService.selectPage(sp); + IPage selectedPage = bsSgcJsjdBuiUnitQualityRateService.selectPage(sp); + List records = selectedPage.getRecords(); + if (records != null && !records.isEmpty()) { + for (BsSgcJsjdBuiUnitQualityRate record : records) { + String id = record.getId(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("unit_id", id); + List list = bsSgcJsjdBuiSubProjectQualityService.list(queryWrapper); + if (!list.isEmpty()) { + List rate = list.stream().map(BsSgcJsjdBuiSubProjectQuality::getCellProjectRate).collect(Collectors.toList()); + double v = rate.stream().mapToDouble(i -> i).average().orElse(0.00); + record.setDivisionalRate(v + ""); + }else { + record.setDivisionalRate(""); + + } + } + } + + + return selectedPage; } /** diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiAttendanceInformation.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiAttendanceInformation.java index 312b819f..49727dae 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiAttendanceInformation.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiAttendanceInformation.java @@ -78,4 +78,6 @@ public class BsSgcJsjdBuiAttendanceInformation extends BaseEntity @ApiModelProperty("考勤所属年月考勤天数") private String attendanceDay; + private String belowUnit; + } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProjectQuality.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProjectQuality.java index 4b3c8663..09e92977 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProjectQuality.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProjectQuality.java @@ -56,7 +56,7 @@ public class BsSgcJsjdBuiSubProjectQuality extends BaseEntity /** 单元工程优良率 */ @Excel(name = "单元工程优良率") @ApiModelProperty("单元工程优良率") - private String cellProjectRate; + private double cellProjectRate; /** 关键部位和重要隐藏单元优良率 */ @Excel(name = "关键部位和重要隐藏单元优良率") diff --git a/pom.xml b/pom.xml index 3955ef64..887677e1 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ jwtech-system jwtech-generator jwtech-framework + jwtech-quartz pom