From b9b9c6a2a4d221564262dff366af401d68665430 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Thu, 27 Jul 2023 11:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safety/service/impl/EnterpriseScoreServiceImpl.java | 2 -- src/main/resources/magic/api/惠州项目管理政务版/进度管理.ms | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java index bc6ae35..9a93f84 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java @@ -15,7 +15,6 @@ import com.zhgd.xmgl.modules.safety.dto.EnterpriseScoreDto; import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore; import com.zhgd.xmgl.modules.safety.mapper.EnterpriseScoreMapper; import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreService; -import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.util.CommonUtil; import com.zhgd.xmgl.util.ParamEnum; import org.apache.commons.collections.MapUtils; @@ -54,7 +53,6 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl page = PageUtil.getPage(map); return baseMapper.pageList(page, wrapper); } diff --git a/src/main/resources/magic/api/惠州项目管理政务版/进度管理.ms b/src/main/resources/magic/api/惠州项目管理政务版/进度管理.ms index 9edc71d..f281229 100644 --- a/src/main/resources/magic/api/惠州项目管理政务版/进度管理.ms +++ b/src/main/resources/magic/api/惠州项目管理政务版/进度管理.ms @@ -5,7 +5,7 @@ "groupId" : "1f3d3e5b9fe340bab84de67b0de08f44", "name" : "进度管理", "createTime" : null, - "updateTime" : 1690364078167, + "updateTime" : 1690368615930, "lock" : null, "createBy" : null, "updateBy" : "admin", @@ -31,7 +31,7 @@ BigDecimal totalNum = new BigDecimal(total); scheduleMap.put("scheduleRatio", completedNum == 0 ? 0 : completedNum.divide(totalNum, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).doubleValue()) -Map qualityMap = db.selectOne("SELECT COUNT( * ) qualityTotal, IFNULL(SUM(IF(question_num = 0, 1, 0)), 0) qualityQuestion, IFNULL(SUM(IF(state = 4, 1, 0)), 0) qualityCompleted, IFNULL(SUM(IF(state != 4, 1, 0)), 0) qualityUnCompleted FROM inspect_record WHERE type = 2 AND #project ") +Map qualityMap = db.selectOne("SELECT COUNT( * ) qualityTotal, IFNULL(SUM(IF(question_num = 0, 1, 0)), 0) qualityQuestion, IFNULL(SUM(IF(state = 4 AND question_num != 0, 1, 0)), 0) qualityCompleted, IFNULL(SUM(IF(state != 4, 1, 0)), 0) qualityUnCompleted FROM inspect_record WHERE type = 2 AND #project ") var completed1 = qualityMap.get("qualityCompleted")::int var total1 = qualityMap.get("qualityTotal")::int BigDecimal completedNum1 = new BigDecimal(completed1); @@ -39,7 +39,7 @@ BigDecimal totalNum1 = new BigDecimal(total1); qualityMap.put("qualityRatio", completedNum1 == 0 ? 0 : completedNum1.divide(totalNum1, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).doubleValue()) scheduleMap.putAll(qualityMap) -Map safetyMap = db.selectOne("SELECT COUNT( * ) safetyTotal, IFNULL(SUM(IF(question_num = 0, 1, 0)), 0) safetyQuestion, IFNULL(SUM(IF(state = 4, 1, 0)), 0) safetyCompleted, IFNULL(SUM(IF(state != 4, 1, 0)), 0) safetyUnCompleted FROM inspect_record WHERE type = 1 AND #project ") +Map safetyMap = db.selectOne("SELECT COUNT( * ) safetyTotal, IFNULL(SUM(IF(question_num = 0, 1, 0)), 0) safetyQuestion, IFNULL(SUM(IF(state = 4 AND question_num != 0, 1, 0)), 0) safetyCompleted, IFNULL(SUM(IF(state != 4, 1, 0)), 0) safetyUnCompleted FROM inspect_record WHERE type = 1 AND #project ") var completed2 = safetyMap.get("safetyCompleted")::int var total2 = safetyMap.get("safetyTotal")::int BigDecimal completedNum2 = new BigDecimal(completed2);