|
@@ -187,12 +187,14 @@ public class RepairInfoService {
|
|
|
return null;
|
|
|
}
|
|
|
String subTitle = RepairStatusEnumMsg.getByStatus(log.getRepairStatus()).getMessage();
|
|
|
- List<Integer> noUserNameList = Arrays.asList(10, 30,40, 80, 110);
|
|
|
+ List<Integer> noUserNameList = Arrays.asList( 30,40, 80, 110);
|
|
|
|
|
|
if(!noUserNameList.contains(log.getRepairStatus())){
|
|
|
OrderReceiving orderReceiving = orderReceivingService.getByRepairId(repairLogVo.getRepairId());
|
|
|
Long sysUserId = null;
|
|
|
switch (log.getRepairStatus()){
|
|
|
+ case 10 :
|
|
|
+ sysUserId = orderReceiving.getRepairManId();
|
|
|
case 20 :
|
|
|
case 100 :
|
|
|
sysUserId = orderReceiving.getSysUserId();break;
|
|
@@ -301,6 +303,8 @@ public class RepairInfoService {
|
|
|
switch (status){
|
|
|
case 0: return 1;
|
|
|
case 10 :
|
|
|
+ case 60 :
|
|
|
+ return detailVo.getOrderReceivingVo().getRepairManId().equals(user.getId()) ? 1 : 0;
|
|
|
case 20 :
|
|
|
case 30 :
|
|
|
case 40 :
|
|
@@ -311,8 +315,6 @@ public class RepairInfoService {
|
|
|
case 90 :
|
|
|
case 91 :
|
|
|
return detailVo.getOrderReceivingVo().getSupplyAdminId().equals(user.getId()) ? 1 : 0;
|
|
|
- case 60 :
|
|
|
- return detailVo.getOrderReceivingVo().getRepairManId().equals(user.getId()) ? 1 : 0;
|
|
|
case 70 :
|
|
|
return detailVo.getOrderReceivingVo().getTesterId().equals(user.getId()) ? 1 : 0;
|
|
|
}
|