嘉禾二期

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InspectionPlanController.java

@@ -14,7 +14,9 @@ import org.springblade.lims.entry.InspectionPlan;
 import org.springblade.lims.service.IInspectionPlanService;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -31,6 +33,10 @@ public class InspectionPlanController extends BladeController {
 
     @GetMapping("/page")
     public R<Object> page(InspectionPlan entry, Query query) {
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+        }
         return R.data(service.findPage(entry, query));
     }
 

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InspectionTaskController.java

@@ -33,8 +33,13 @@ public class InspectionTaskController extends BladeController {
     public R<Object> page(InspectionTask entry, Query query) {
         List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
         if(!roles.contains("admin")){
-            List<String> groupIdList = Arrays.asList(AuthUtil.getDeptId().split(","));
-            entry.setGroupIdList(groupIdList);
+            if(roles.contains("巡检管理")){
+                entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+            }
+            if(roles.contains("巡检人员")){
+                List<String> groupIdList = Arrays.asList(AuthUtil.getDeptId().split(","));
+                entry.setGroupIdList(groupIdList);
+            }
         }
         return R.data(service.findPage(entry, query));
     }

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/MaintainTaskController.java

@@ -33,8 +33,13 @@ public class MaintainTaskController extends BladeController {
     public R<Object> page(MaintainTask entry, Query query) {
         List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
         if(!roles.contains("admin")){
-            List<String> groupIdList = Arrays.asList(AuthUtil.getDeptId().split(","));
-            entry.setGroupIdList(groupIdList);
+            if(roles.contains("保养管理")){
+                entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+            }
+            if(roles.contains("保养人员")){
+                List<String> groupIdList = Arrays.asList(AuthUtil.getDeptId().split(","));
+                entry.setGroupIdList(groupIdList);
+            }
         }
         return R.data(service.findPage(entry, query));
     }

lab-service/lab-lims/src/main/java/org/springblade/lims/job/CreateMaintainTaskJob.java

@@ -3,6 +3,7 @@ package org.springblade.lims.job;
 import lombok.AllArgsConstructor;
 import org.springblade.lims.service.IInspectionPlanService;
 import org.springblade.lims.service.IMaintainPlanService;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -12,7 +13,7 @@ public class CreateMaintainTaskJob {
     private final IInspectionPlanService inspectionPlanService;
 
     //@Scheduled(cron ="0 0 0 1/1 * ? ")
-    //@Scheduled(cron ="0 0/2 * * * ? ")
+    @Scheduled(cron ="0 0/2 * * * ? ")
     public void createTask(){
         inspectionPlanService.checkAndCreateTask();
         //maintainPlanService.checkAndCreateTask();

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionPlanServiceImpl.java

@@ -72,6 +72,9 @@ public class InspectionPlanServiceImpl extends BaseServiceImpl<InspectionPlanMap
         if (StringUtils.isNotBlank(entry.getPlanType())) {
             wrapper.eq(InspectionPlan::getPlanType, entry.getPlanType());
         }
+        if(entry.getCreateDept() != null){
+            wrapper.eq(BaseEntity::getCreateDept,entry.getCreateDept());
+        }
         wrapper.eq(BaseEntity::getIsDeleted, 0);
         wrapper.orderByDesc(InspectionPlan::getCreateTime);
         IPage<InspectionPlan> page = this.page(Condition.getPage(query), wrapper);
@@ -134,6 +137,7 @@ public class InspectionPlanServiceImpl extends BaseServiceImpl<InspectionPlanMap
             entry.setCreateUser(AuthUtil.getUserId());
             entry.setCreateTime(date);
             entry.setPlanCode("XJJH" + DateFormatUtils.format(date, "yyyyMMddhhmmss") + StringUtil.randomUUID().substring(0, 5));
+            entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
             baseMapper.insert(entry);
         } else {
             entry.setUpdateUser(AuthUtil.getUserId());

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionPointPosServiceImpl.java

@@ -50,7 +50,7 @@ public class InspectionPointPosServiceImpl extends BaseServiceImpl<InspectionPoi
     @Transactional(rollbackFor = Exception.class)
     public boolean savePos(InspectionPointPos entry) {
         // 判断是否子项
-        if (entry.getParentId() == null) {
+        if (entry.getParentId() == null || entry.getParentId() == 0) {
             entry.setParentId(0L);
             entry.setAncestors("0");
             entry.setIsDeleted(0);

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainPlanServiceImpl.java

@@ -158,10 +158,12 @@ public class MaintainPlanServiceImpl extends BaseServiceImpl<MaintainPlanMapper,
             entry.setCreateTime(date);
             entry.setCode("BYJH" + DateFormatUtils.format(date, "yyyyMMddhhmmss") + StringUtil.randomUUID().substring(0, 5));
             entry.setOriginatorId(AuthUtil.getUserId().toString());
+            entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
             baseMapper.insert(entry);
         } else {
             entry.setUpdateUser(AuthUtil.getUserId());
             entry.setUpdateTime(date);
+            entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
             baseMapper.updateById(entry);
         }
 
@@ -224,6 +226,7 @@ public class MaintainPlanServiceImpl extends BaseServiceImpl<MaintainPlanMapper,
         task.setAssetSn(plan.getAssetSn());
         task.setActStartTime(new Date());
         task.setTenantId(plan.getTenantId());
+        task.setCreateDept(plan.getCreateDept());
         maintainTaskService.saveTask(task);
         //保养项目
         for(int j=0;j<projectList.size();j++){

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainTaskServiceImpl.java

@@ -17,10 +17,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.lims.entry.MaintainProject;
-import org.springblade.lims.entry.MaintainRecord;
-import org.springblade.lims.entry.MaintainTask;
-import org.springblade.lims.entry.MaintainTaskProject;
+import org.springblade.lims.entry.*;
 import org.springblade.lims.mapper.MaintainTaskMapper;
 import org.springblade.lims.service.IMaintainProjectService;
 import org.springblade.lims.service.IMaintainRecordService;
@@ -92,6 +89,9 @@ public class MaintainTaskServiceImpl extends BaseServiceImpl<MaintainTaskMapper,
         if(CollectionUtils.isNotEmpty(entry.getGroupIdList())){
             wrapper.in(MaintainTask::getGroupId,entry.getGroupIdList());
         }
+        if(entry.getCreateDept() != null){
+            wrapper.eq(MaintainTask::getCreateDept,entry.getCreateDept());
+        }
 
         wrapper.eq(BaseEntity::getIsDeleted,0);
         wrapper.orderByDesc(MaintainTask::getCreateTime);
@@ -127,6 +127,9 @@ public class MaintainTaskServiceImpl extends BaseServiceImpl<MaintainTaskMapper,
             entry.setCreateTime(date);
             entry.setBusinessCode("BYRW"+ DateFormatUtils.format(date,"yyyyMMddhhmmss")+ StringUtil.randomUUID().substring(0,5));
             entry.setOriginatorId(AuthUtil.getUserId().toString());
+            if(entry.getCreateDept() == null){
+                entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+            }
             baseMapper.insert(entry);
         }else{
             entry.setUpdateUser(AuthUtil.getUserId());