内部报验派单逻辑更改

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -256,11 +256,23 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                 //取消时，登录人与被指派检验员一致，不管该登录人是否具有站长或主任角色，都认定为检验员取消
                 //如果角色中存在站长或者主任
 //                boolean match = operDto.getOperUser().getRoleDos().stream().anyMatch(item -> "role095".equals(item.getCode()) || "role080".equals(item.getCode()));
-                if(operDto.getOperUser().getId().equals(inOper.getDispatch().getSupervisionid())) {
-                   dispatch.setCanceltype("20");
+//                if(operDto.getOperUser().getId().equals(inOper.getDispatch().getSupervisionid())) {
+//                   dispatch.setCanceltype("20");
+//                } else {
+//                   dispatch.setCanceltype("30");
+//                }
+
+                //派单前
+                if("10".equals(inOper.getDispatch().getDispatchstatus())) {
+                    dispatch.setCanceltype("40");
+                }
+                //派单后
+                else if("20".equals(inOper.getDispatch().getDispatchstatus())) {
+                    dispatch.setCanceltype("50");
                 } else {
-                   dispatch.setCanceltype("30");
+                    msgList.add("服务器异常，请联系管理：派单状态异常");
                 }
+
             } else {
                 msgList.add("服务器异常，请联系管理：未知取消页面");
             }
@@ -1498,15 +1510,19 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         }
 
         //执行页面，既不是站长也不是被派检验员，不能执行取消操作
-        boolean leaderFlag = false;
-        //站长/主任/副主任
-        List<SysRoleDo> roleDos = operDto.getOperUser().getRoleDos().stream()
-                .filter(item -> "role080".equals(item.getCode()) || "role095".equals(item.getCode()))
-                .collect(Collectors.toList());
-        if(roleDos.size() > 0) {
-            leaderFlag = true;
-        }
-        if("execute".equals(dto.getPageType()) && !leaderFlag && !operDto.getOperUser().getId().equals(operDto.getDispatch().getSupervisionid())) {
+//        boolean leaderFlag = false;
+//        //站长/主任/副主任
+//        List<SysRoleDo> roleDos = operDto.getOperUser().getRoleDos().stream()
+//                .filter(item -> "role080".equals(item.getCode()) || "role095".equals(item.getCode()))
+//                .collect(Collectors.toList());
+//        if(roleDos.size() > 0) {
+//            leaderFlag = true;
+//        }
+//        if("execute".equals(dto.getPageType()) && !leaderFlag && !operDto.getOperUser().getId().equals(operDto.getDispatch().getSupervisionid())) {
+//            return "单据号:".concat(operDto.getInspection().getInspectioncode()).concat("已被改派或权限不够不能取消,请刷新数据查看");
+//        }
+
+        if("execute".equals(dto.getPageType())  && !operDto.getOperUser().getId().equals(operDto.getDispatch().getSupervisionid())) {
             return "单据号:".concat(operDto.getInspection().getInspectioncode()).concat("已被改派或权限不够不能取消,请刷新数据查看");
         }