From cba21a832d2f8ddda3e610d9772c76dced0abc54 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 22 七月 2024 11:02:19 +0800
Subject: [PATCH] 工单阈值deleted改为Integer
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 133 ++++++++++++++++++++++++++------------------
1 files changed, 79 insertions(+), 54 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index b1568b9..8ec391a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -1,10 +1,12 @@
package com.ycl.platform.service.impl;
+import annotation.DataScope;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.base.CheckIndex;
import com.ycl.platform.domain.dto.CheckScoreDTO;
import com.ycl.platform.domain.dto.CheckScoreIndexDTO;
+import com.ycl.platform.domain.dto.ScoreIndexDTO;
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.vo.CheckScoreDetailVO;
import com.ycl.platform.mapper.CheckRuleMapper;
@@ -68,12 +70,13 @@
@Autowired
private ISysDeptService deptService;
/**
- * 鏌ヨ鑰冩牳绉垎
+ * 鏌ヨ鑰冩牳绉垎鎸囨爣
*
* @param id 鑰冩牳绉垎涓婚敭
* @return 鑰冩牳绉垎
*/
@Override
+ @DataScope(deptAlias = "d",userAlias = "u")
public CheckScoreDetailVO selectCheckScoreById(CheckScoreIndexDTO checkScoreIndexDTO)
{
Long checkScoreId = checkScoreIndexDTO.getId();
@@ -104,7 +107,13 @@
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
date = formatter.format(createTime);
}
- List<Map> map = scoreMapper.selectScoreIndex(tableName,checkScore.getDeptId(),date);
+
+ ScoreIndexDTO scoreIndexDTO = new ScoreIndexDTO()
+ .setTableName(tableName)
+ .setDeptId(checkScore.getDeptId())
+ .setDate(date);
+ scoreIndexDTO.setParams(checkScoreIndexDTO.getParams());
+ List<Map> map = scoreMapper.selectScoreIndex(scoreIndexDTO);
scoreMap.put("tableData",checkRules);
scoreMap.put("dataMap",map);
@@ -122,9 +131,11 @@
* @return 鑰冩牳绉垎
*/
@Override
+ @DataScope(deptAlias = "d",userAlias = "u")
public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore)
{
- //TODO:鏁版嵁鏉冮檺
+ //鍖哄幙鍙兘鐪嬪凡鍙戝竷
+ roleControl(checkScore);
//鏌ヨ鎴愮哗
String date = checkScore.getDate();
@@ -142,6 +153,8 @@
Map<Long, List<CheckScore>> deptMap = checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
return deptMap;
}
+
+
/**
* 鍖哄幙璇︽儏
*
@@ -149,61 +162,13 @@
* @return 鑰冩牳绉垎
*/
@Override
+ @DataScope(deptAlias = "d",userAlias = "u")
public List<CheckScore> page(CheckScore checkScore) {
- //TODO:鏁版嵁鏉冮檺
+ //鍖哄幙鍙兘鐪嬪凡鍙戝竷
+ roleControl(checkScore);
return scoreMapper.selectCheckScoreList(checkScore);
}
-
- /**
- * 鏂板鑰冩牳绉垎
- *
- * @param checkScore 鑰冩牳绉垎
- * @return 缁撴灉
- */
- @Override
- public int insertCheckScore(CheckScore checkScore)
- {
- checkScore.setCreateTime(DateUtils.getNowDate());
- return scoreMapper.insertCheckScore(checkScore);
- }
-
- /**
- * 淇敼鑰冩牳鏄庣粏
- *
- * @param checkScore 鑰冩牳绉垎鏄庣粏
- * @return 缁撴灉
- */
- @Override
- public int updateCheckScore(CheckScore checkScore)
- {
-
- return scoreMapper.updateCheckScore(checkScore);
- }
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳绉垎
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳绉垎涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteCheckScoreByIds(Long[] ids)
- {
- return scoreMapper.deleteCheckScoreByIds(ids);
- }
-
- /**
- * 鍒犻櫎鑰冩牳绉垎淇℃伅
- *
- * @param id 鑰冩牳绉垎涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteCheckScoreById(Long id)
- {
- return scoreMapper.deleteCheckScoreById(id);
- }
/**
* 鍙戝竷鑰冩牳绉垎淇℃伅
*
@@ -301,4 +266,64 @@
util.exportExcel(response, checkIndexes, "鑰冩牳绉垎鏄庣粏鏁版嵁");
}
+
+ private void roleControl(CheckScore checkScore) {
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ SysRole sysRole = roles.get(0);
+ if("zg_province".equals(sysRole.getRoleKey())){
+ Map<String, Object> params = checkScore.getParams();
+ params.put("publish",PublishType.PUBLISHED.getCode());
+ }
+ }
+
+
+ // /**
+// * 鏂板鑰冩牳绉垎
+// *
+// * @param checkScore 鑰冩牳绉垎
+// * @return 缁撴灉
+// */
+// @Override
+// public int insertCheckScore(CheckScore checkScore)
+// {
+// checkScore.setCreateTime(DateUtils.getNowDate());
+// return scoreMapper.insertCheckScore(checkScore);
+// }
+//
+// /**
+// * 淇敼鑰冩牳鏄庣粏
+// *
+// * @param checkScore 鑰冩牳绉垎鏄庣粏
+// * @return 缁撴灉
+// */
+// @Override
+// public int updateCheckScore(CheckScore checkScore)
+// {
+//
+// return scoreMapper.updateCheckScore(checkScore);
+// }
+//
+// /**
+// * 鎵归噺鍒犻櫎鑰冩牳绉垎
+// *
+// * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳绉垎涓婚敭
+// * @return 缁撴灉
+// */
+// @Override
+// public int deleteCheckScoreByIds(Long[] ids)
+// {
+// return scoreMapper.deleteCheckScoreByIds(ids);
+// }
+//
+// /**
+// * 鍒犻櫎鑰冩牳绉垎淇℃伅
+// *
+// * @param id 鑰冩牳绉垎涓婚敭
+// * @return 缁撴灉
+// */
+// @Override
+// public int deleteCheckScoreById(Long id)
+// {
+// return scoreMapper.deleteCheckScoreById(id);
+// }
}
--
Gitblit v1.8.0