2 years ago
parent
commit
0bbbe57e5f

+ 4 - 0
platform-dao/src/main/java/com/platform/dao/enums/SysRoleCodeEnum.java

@@ -179,6 +179,10 @@ public enum SysRoleCodeEnum {
      * 筹建执行人
      */
     PREPARATION_USER,
+    /**
+     * 调度人员
+     */
+    DDRY,
     ;
 
 }

+ 18 - 0
platform-rest/src/main/java/com/platform/rest/controller/store/OutStoreFormController.java

@@ -1,8 +1,11 @@
 package com.platform.rest.controller.store;
 
+import com.platform.common.model.UserInfo;
 import com.platform.common.util.R;
+import com.platform.common.util.SecurityUtils;
 import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.entity.store.OutStoreForm;
+import com.platform.service.store.OutStoreDetailService;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.store.ExportOutStoreFormVO;
@@ -32,6 +35,7 @@ import javax.servlet.http.HttpServletResponse;
 public class OutStoreFormController {
 
     private final OutStoreFormService outStoreFormService;
+    private final OutStoreDetailService outStoreDetailService;
 
     /**
      * 通过id查询单条记录
@@ -154,6 +158,20 @@ public class OutStoreFormController {
         return new R<>();
     }
 
+    /**
+     *
+     *
+     * @param
+     * @return R
+     */
+    @SysLog("删除出库单关联的出库单备件详情")
+    @DeleteMapping("/detail")
+    @PreAuthorize("@pms.hasPermission('store-out-store-forms-del')")
+    public R removeDetails(@RequestBody List<String> id) {
+        outStoreDetailService.batchDelete(id);
+        return new R<>();
+    }
+
     /**
      * 获取分页
      *

+ 12 - 4
platform-service/src/main/java/com/platform/service/store/impl/OutStoreDetailServiceImpl.java

@@ -12,6 +12,7 @@ import com.platform.dao.dto.upms.SysDeptDTO;
 import com.platform.dao.entity.store.OutStoreDetail;
 import com.platform.dao.entity.upms.SysUserDept;
 import com.platform.dao.enums.DeptNatureEnum;
+import com.platform.dao.enums.SysRoleCodeEnum;
 import com.platform.dao.mapper.store.OutStoreDetailMapper;
 import com.platform.dao.mapper.upms.SysDeptMapper;
 import com.platform.dao.vo.query.store.OutStoreDetailVO;
@@ -19,6 +20,7 @@ import com.platform.dao.vo.query.upms.SysDeptVO;
 import com.platform.service.store.OutStoreDetailService;
 import com.platform.service.upms.SysDeptService;
 import com.platform.service.upms.SysUserDeptService;
+import com.platform.service.upms.SysUserRoleService;
 import org.springframework.stereotype.Service;
 import com.platform.service.base.impl.BaseServiceImpl;
 import tk.mybatis.mapper.weekend.Weekend;
@@ -39,12 +41,18 @@ public class OutStoreDetailServiceImpl extends BaseServiceImpl<OutStoreDetailMap
     private SysUserDeptService sysUserDeptService;
     private SysDeptService sysDeptService;
     private SysDeptMapper deptMapper;
+    private SysUserRoleService sysUserRoleService;
     @Override
     public int batchDelete(List<String> ids) {
-        Weekend<OutStoreDetail> weekend = new Weekend<>(OutStoreDetail.class);
-        WeekendCriteria<OutStoreDetail, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(OutStoreDetail::getId, ids);
-        mapper.deleteByExample(weekend);
+        String roleStr = sysUserRoleService.getRoleCodesByUserId();
+        if (roleStr.contains(SysRoleCodeEnum.DDRY.name())||SecurityUtils.getUserInfo().getSuperAdmin()==1) {
+            Weekend<OutStoreDetail> weekend = new Weekend<>(OutStoreDetail.class);
+            WeekendCriteria<OutStoreDetail, Object> weekendCriteria = weekend.weekendCriteria();
+            weekendCriteria.andIn(OutStoreDetail::getId, ids);
+            mapper.deleteByExample(weekend);
+        }else {
+            throw new BusinessException("对不起,你没有权限进行此操作!");
+        }
         return 1;
     }
 

+ 15 - 7
platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -29,6 +29,8 @@ import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.service.store.StoreService;
+import com.platform.service.upms.SysUserRoleService;
+import com.platform.service.upms.SysUserService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -65,6 +67,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     private RepairApplicationFormMapper repairApplicationFormMapper;
     private SbInfoMapper sbInfoMapper;
     private SbPositionMapper sbPositionMapper;
+    private SysUserRoleService sysUserService;
 
     @Override
     public List<OutStoreFormVO> selectLists(OutStoreFormDTO dto) {
@@ -73,13 +76,18 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
 
     @Override
     public int batchDelete(List<String> ids) {
-        //Weekend<OutStoreForm> weekend = new Weekend<>(OutStoreForm.class);
-        //WeekendCriteria<OutStoreForm, Object> weekendCriteria = weekend.weekendCriteria();
-        //weekendCriteria.andIn(OutStoreForm::getId, ids);
-        //mapper.deleteByExample(weekend);
-        ids.forEach(id -> {
-            cascadingDeleteByKey(id);
-        });
+        String roleStr = sysUserService.getRoleCodesByUserId();
+        if (roleStr.contains(SysRoleCodeEnum.DDRY.name())||SecurityUtils.getUserInfo().getSuperAdmin()==1) {
+            //Weekend<OutStoreForm> weekend = new Weekend<>(OutStoreForm.class);
+            //WeekendCriteria<OutStoreForm, Object> weekendCriteria = weekend.weekendCriteria();
+            //weekendCriteria.andIn(OutStoreForm::getId, ids);
+            //mapper.deleteByExample(weekend);
+            ids.forEach(id -> {
+                cascadingDeleteByKey(id);
+            });
+        }else {
+            throw new DeniedException("对不起,你没有删除权限!");
+        }
         return 1;
     }