From 7c5b03f261845c4e0ec2b4f1f59e21222d055232 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 18 三月 2024 17:44:56 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
index 6cc9e33..b5d72fa 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
@@ -1,6 +1,8 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
@@ -32,6 +34,22 @@
*/
@Service
public class CalibrationOrderServiceImpl extends ServiceImpl<CalibrationOrderMapper, CalibrationOrder> implements ICalibrationOrderService {
+
+
+ /**
+ * 鐢ㄦ埛绫诲瀷(1 鏅�氭垚鍛� 2 宸ユ 3 鍒嗗巶/涓績 4 鍏徃锛�
+ */
+ private static final Integer USER_TYPE_1 = 1;
+ private static final Integer USER_TYPE_2 = 2;
+ private static final Integer USER_TYPE_3 = 3;
+ private static final Integer USER_TYPE_4 = 4;
+
+ /**
+ * 杞﹂棿灞傜骇绫诲瀷(1 鍏徃 2 鍒嗗巶銆佷腑蹇� 3 宸ユ锛�
+ */
+ private static final String ORG_TYPE_1 = "1";
+ private static final String ORG_TYPE_2 = "2";
+ private static final String ORG_TYPE_3 = "3";
@Autowired
private CalibrationOrderMapper calibrationOrderMapper;
@@ -233,18 +251,33 @@
* qsw 2024-3-15
*/
@Override
- public List<Map<String, Object>> getTwoMaintenancePlanList() {
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
- List<Area> areaList = areaService.lambdaQuery().eq(Area::getType, "1").eq(Area::getDelFlag, "0").list();
- List<Map<String, Object>> arrayList = new ArrayList<>();
+ public List<Map<String, Object>> getTwoMaintenancePlanList(String productionCode) {
+ List<Map<String, Object>> list = new ArrayList<>();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ List<Area> areaList = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ areaList = areaService.lambdaQuery().eq(Area::getType, "1").eq(Area::getDelFlag, "0").list();
+ }else{
+ String orgType = this.baseMapper.findOrgType(productionCode);
+ if(ORG_TYPE_2.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ areaList = areaService.lambdaQuery().eq(Area::getType, "1").eq(Area::getId,area.getId()).eq(Area::getDelFlag, "0").list();
+ }
+// else if(ORG_TYPE_3.equals(orgType)){
+// Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+// list = calibrationOrderService.getThisMonthMaintenanceFinishList("",area.getId());
+// }
+ }
+ }
for (Area area : areaList) {
String id = area.getId();
List<Map<String, Object>> centerTwoMaintenancePlanList = this.baseMapper.getCenterTwoMaintenancePlanList(id);
if(centerTwoMaintenancePlanList.size()>0){
- arrayList.add(centerTwoMaintenancePlanList.get(0));
+ list.add(centerTwoMaintenancePlanList.get(0));
}
}
- return null;
+ return list;
}
}
--
Gitblit v1.9.3