admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
pengjie 2023-07-27 11:19:28 +08:00
parent 6aeef7cc03
commit b9b9c6a2a4
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java
View File

@ -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.entity.EnterpriseScore;
import com.zhgd.xmgl.modules.safety.mapper.EnterpriseScoreMapper; import com.zhgd.xmgl.modules.safety.mapper.EnterpriseScoreMapper;
import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreService; 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.CommonUtil;
import com.zhgd.xmgl.util.ParamEnum; import com.zhgd.xmgl.util.ParamEnum;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
@ -54,7 +53,6 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
if (StringUtils.isNotBlank(enterpriseName)) { if (StringUtils.isNotBlank(enterpriseName)) {
wrapper.like(EnterpriseScore::getEngineeringName, enterpriseName); wrapper.like(EnterpriseScore::getEngineeringName, enterpriseName);
} }
wrapper.eq(EnterpriseScore::getCreateBy, SecurityUtil.getUser().getSn());
Page<EnterpriseScore> page = PageUtil.getPage(map); Page<EnterpriseScore> page = PageUtil.getPage(map);
return baseMapper.pageList(page, wrapper); return baseMapper.pageList(page, wrapper);
} }

6
src/main/resources/magic/api/惠州项目管理政务版/进度管理.ms
View File

@ -5,7 +5,7 @@
"groupId" : "1f3d3e5b9fe340bab84de67b0de08f44", "groupId" : "1f3d3e5b9fe340bab84de67b0de08f44",
"name" : "进度管理", "name" : "进度管理",
"createTime" : null, "createTime" : null,
"updateTime" : 1690364078167, "updateTime" : 1690368615930,
"lock" : null, "lock" : null,
"createBy" : null, "createBy" : null,
"updateBy" : "admin", "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()) 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 completed1 = qualityMap.get("qualityCompleted")::int
var total1 = qualityMap.get("qualityTotal")::int var total1 = qualityMap.get("qualityTotal")::int
BigDecimal completedNum1 = new BigDecimal(completed1); 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()) qualityMap.put("qualityRatio", completedNum1 == 0 ? 0 : completedNum1.divide(totalNum1, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).doubleValue())
scheduleMap.putAll(qualityMap) 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 completed2 = safetyMap.get("safetyCompleted")::int
var total2 = safetyMap.get("safetyTotal")::int var total2 = safetyMap.get("safetyTotal")::int
BigDecimal completedNum2 = new BigDecimal(completed2); BigDecimal completedNum2 = new BigDecimal(completed2);