Merge remote-tracking branch 'origin/master'

jwtech-admin-page/src/views/build/attendance/index.vue

@@ -141,7 +141,7 @@
     <el-table v-loading="loading" :data="attendanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center"/>
-
+      <el-table-column label="所属单位" align="center" prop="belowUnit" />
       <el-table-column label="所属单位统一社会信用代码" align="center" prop="socialCreditCode" />
       <el-table-column label="身份证号码" align="center" prop="idNo" />
       <el-table-column label="身份证号码" align="center" prop="name" />

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<BsSgcJsjdBuiSubProject> 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));
     }

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<BsSgcJsjdBuiUnitQualityRate> sp)
     {
-        return bsSgcJsjdBuiUnitQualityRateService.selectPage(sp);
+        IPage<BsSgcJsjdBuiUnitQualityRate> selectedPage = bsSgcJsjdBuiUnitQualityRateService.selectPage(sp);
+        List<BsSgcJsjdBuiUnitQualityRate> records = selectedPage.getRecords();
+        if (records != null && !records.isEmpty()) {
+            for (BsSgcJsjdBuiUnitQualityRate record : records) {
+                String id = record.getId();
+                QueryWrapper<BsSgcJsjdBuiSubProjectQuality> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("unit_id", id);
+                List<BsSgcJsjdBuiSubProjectQuality> list = bsSgcJsjdBuiSubProjectQualityService.list(queryWrapper);
+                if (!list.isEmpty()) {
+                    List<Double> 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;
     }
 
     /**

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;
+
 }

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 = "关键部位和重要隐藏单元优良率")

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSupervisionAtt.java

@@ -53,10 +53,6 @@ public class BsSgcJsjdBuiSupervisionAtt extends BaseEntity
     @ApiModelProperty("工程监测id")
     private Date uploadTime;
 
-    /** $column.columnComment */
-    @Excel(name = "工程监测id")
-    @ApiModelProperty("工程监测id")
-    private String remarks;
 
     /** $column.columnComment */
     @Excel(name = "工程监测id")