diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue
index 87793d32..d9636dd6 100644
--- a/ruoyi-ui/src/views/project/projectChecking/index.vue
+++ b/ruoyi-ui/src/views/project/projectChecking/index.vue
@@ -24,14 +24,7 @@
@keyup.enter.native="handleQuery"
/>
-
-
-
+
+
+
+
+
+
+
-
-
-
搜索
-
+
diff --git a/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue b/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue
index 139aef99..ef041c3c 100644
--- a/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue
+++ b/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue
@@ -140,7 +140,11 @@
-
+
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java
index d49cdba9..a2aba3ed 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java
@@ -1,10 +1,11 @@
package com.yanzhu.jh.bigscreen.web.controller;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.text.Convert;
-import com.yanzhu.jh.project.domain.SurProjectInsurance;
+import com.yanzhu.jh.project.domain.SurProjectChecking;
import com.yanzhu.jh.project.service.ISurProjectCheckingService;
-import com.yanzhu.jh.project.service.ISurProjectInsuranceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,26 +16,44 @@ import org.springframework.web.bind.annotation.RestController;
*/
@RestController
@RequestMapping("/bgscreen/projectChecking")
-public class ProjectCheckingController {
+public class ProjectCheckingController extends BaseController {
@Autowired
private ISurProjectCheckingService surProjectCheckingService;
/**
- * 根据条件查询项目保险
+ * 根据条件查询项目举牌验收列表
* @param deptId
* @param projectId
* @return
*/
- @GetMapping("/getProjectInsuranceList")
- public TableDataInfo getProjectInsuranceList(String deptId, String projectId){
- SurProjectInsurance surProjectInsurance = new SurProjectInsurance();
+ @GetMapping("/getProjectCheckingList")
+ public TableDataInfo getProjectCheckingList(String deptId, String projectId){
+ SurProjectChecking surProjectChecking = new SurProjectChecking();
if(deptId!=null && !"0".equals(deptId)){
- surProjectInsurance.setNowDept(deptId);
+ surProjectChecking.setProjectDeptId(deptId);
}
if(projectId!=null && !"0".equals(projectId)){
- surProjectInsurance.setProjectId(Convert.toLong(projectId));
+ surProjectChecking.setProjectId(Convert.toLong(projectId));
}
- return getDataTable(surProjectInsuranceService.selectBgscreenInsuranceList(surProjectInsurance));
+ return getDataTable(surProjectCheckingService.selectBgscreenProjectCheckingList(surProjectChecking));
+ }
+
+ /**
+ * 根据条件查询项目举牌验收统计
+ * @param deptId
+ * @param projectId
+ * @return
+ */
+ @GetMapping("/getProjectCheckingView")
+ public AjaxResult getProjectCheckingView(String deptId, String projectId){
+ SurProjectChecking surProjectChecking = new SurProjectChecking();
+ if(deptId!=null && !"0".equals(deptId)){
+ surProjectChecking.setProjectDeptId(deptId);
+ }
+ if(projectId!=null && !"0".equals(projectId)){
+ surProjectChecking.setProjectId(Convert.toLong(projectId));
+ }
+ return success(surProjectCheckingService.selectBgscreenProjectCheckingView(surProjectChecking));
}
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java
index 1447a64e..75cc2ea1 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java
@@ -1,6 +1,8 @@
package com.yanzhu.jh.project.mapper;
import java.util.List;
+import java.util.Map;
+
import com.yanzhu.jh.project.domain.SurProjectChecking;
/**
@@ -27,6 +29,22 @@ public interface SurProjectCheckingMapper
*/
public List selectSurProjectCheckingList(SurProjectChecking surProjectChecking);
+ /**
+ * 查询项目验收列表
+ *
+ * @param surProjectChecking 项目验收
+ * @return 项目验收集合
+ */
+ public List selectBgscreenProjectCheckingList(SurProjectChecking surProjectChecking);
+
+ /**
+ * 查询项目验收统计
+ *
+ * @param surProjectChecking 项目验收
+ * @return 项目验收集合
+ */
+ public List> selectBgscreenProjectCheckingView(SurProjectChecking surProjectChecking);
+
/**
* 新增项目验收
*
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java
index 9ce4dd8d..644f81de 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java
@@ -1,6 +1,8 @@
package com.yanzhu.jh.project.service;
import java.util.List;
+import java.util.Map;
+
import com.yanzhu.jh.project.domain.SurProjectChecking;
/**
@@ -27,6 +29,22 @@ public interface ISurProjectCheckingService
*/
public List selectSurProjectCheckingList(SurProjectChecking surProjectChecking);
+ /**
+ * 查询项目验收列表
+ *
+ * @param surProjectChecking 项目验收
+ * @return 项目验收集合
+ */
+ public List selectBgscreenProjectCheckingList(SurProjectChecking surProjectChecking);
+
+ /**
+ * 查询项目验收统计
+ *
+ * @param surProjectChecking 项目验收
+ * @return 项目验收集合
+ */
+ public Map selectBgscreenProjectCheckingView(SurProjectChecking surProjectChecking);
+
/**
* 新增项目验收
*
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
index 142b2334..0543fadd 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
@@ -1,7 +1,9 @@
package com.yanzhu.jh.project.service.impl;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.PublicStateEnum;
@@ -48,6 +50,41 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService
return surProjectCheckingMapper.selectSurProjectCheckingList(surProjectChecking);
}
+ /**
+ * 查询项目验收列表
+ *
+ * @param surProjectChecking 项目验收
+ * @return 项目验收集合
+ */
+ @Override
+ public List selectBgscreenProjectCheckingList(SurProjectChecking surProjectChecking) {
+ return surProjectCheckingMapper.selectBgscreenProjectCheckingList(surProjectChecking);
+ }
+
+ /**
+ * 查询项目验收统计
+ *
+ * @param surProjectChecking 项目验收
+ * @return 项目验收集合
+ */
+ @Override
+ public Map selectBgscreenProjectCheckingView(SurProjectChecking surProjectChecking) {
+ List> list = surProjectCheckingMapper.selectBgscreenProjectCheckingView(surProjectChecking);
+ Map dataMap = new HashMap<>();
+ int sum=0;
+ int okSum=0;
+ for(Map map:list){
+ sum += Convert.toInt(map.get("total"));
+ //"1"为验收合格
+ if("1".equals(map.get("check_result").toString())){
+ okSum+=Convert.toInt(map.get("total"));
+ }
+ }
+ dataMap.put("sum",sum);//验收数
+ dataMap.put("okSum",Math.floor(okSum/sum));//合格率
+ return dataMap;
+ }
+
/**
* 新增项目验收
*
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
index 11a57310..3f0379d9 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sur_project_userinfo spu on spu.project_id = sp.id
- and is_del=0
+ and spc.is_del=0
and spc.project_id = #{projectId}
and sp.projectName like concat('%', #{projectName}, '%')
and spc.dept_id = #{deptId}
@@ -77,7 +77,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by checking_date desc
-
+
+
+
+
+