From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-api/src/main/java/com/java110/api/listener/ownerRepair/ListStaffFinishRepairsListener.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListStaffFinishRepairsListener.java b/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListStaffFinishRepairsListener.java
index e70644b..e9515d5 100644
--- a/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListStaffFinishRepairsListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/ownerRepair/ListStaffFinishRepairsListener.java
@@ -5,10 +5,12 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.user.UserDto;
import com.java110.intf.community.IRepairInnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.constant.ServiceCodeOwnerRepairConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -21,7 +23,6 @@
import java.util.Arrays;
import java.util.List;
-
/**
* 鏌ヨ灏忓尯渚﹀惉绫�
*/
@@ -31,9 +32,11 @@
@Autowired
private IRepairInnerServiceSMO repairInnerServiceSMOImpl;
-
@Autowired
private IRepairUserInnerServiceSMO repairUserInnerServiceSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMO;
@Override
public String getServiceCode() {
@@ -45,12 +48,10 @@
return HttpMethod.GET;
}
-
@Override
public int getOrder() {
return DEFAULT_ORDER;
}
-
public IRepairInnerServiceSMO getRepairInnerServiceSMOImpl() {
return repairInnerServiceSMOImpl;
@@ -65,53 +66,51 @@
super.validatePageInfo(reqJson);
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰涓湭鍖呭惈灏忓尯ID");
Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰涓湭鍖呭惈鍛樺伐淇℃伅");
-
}
@Override
protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
RepairDto ownerRepairDto = BeanConvertUtil.covertBean(reqJson, RepairDto.class);
- ownerRepairDto.setStaffId(reqJson.getString("userId"));
-
- if(reqJson.containsKey("repairStates")){
+ String userId = reqJson.getString("userId");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ //鏌ヨ鐢ㄦ埛淇℃伅
+ List<UserDto> users = userInnerServiceSMO.getUsers(userDto);
+ Assert.listOnlyOne(users, "鏁版嵁寮傚父鏈壘鍒扮敤鎴蜂俊鎭�");
+ if (!users.get(0).getLevelCd().equals("00")) { //褰撳墠鐢ㄦ埛涓嶆槸绠＄悊鍛樻椂鏀惧叆staffId鐨勫��
+ ownerRepairDto.setStaffId(reqJson.getString("userId"));
+ }
+ if (reqJson.containsKey("repairStates")) {
String[] states = reqJson.getString("repairStates").split(",");
ownerRepairDto.setStates(Arrays.asList(states));
+ }else{
+ //Pc WEB缁翠慨宸插姙
+ String[] states={RepairDto.STATE_BACK, RepairDto.STATE_TRANSFER, RepairDto.STATE_PAY_ERROR, RepairDto.STATE_APPRAISE, RepairDto.STATE_RETURN_VISIT, RepairDto.STATE_COMPLATE};
+ ownerRepairDto.setStates(Arrays.asList(states));
}
-
int count = repairInnerServiceSMOImpl.queryStaffFinishRepairsCount(ownerRepairDto);
-
-
List<RepairDto> ownerRepairs = null;
if (count > 0) {
ownerRepairs = repairInnerServiceSMOImpl.queryStaffFinishRepairs(ownerRepairDto);
-
//refreshStaffName(ownerRepairs);
} else {
ownerRepairs = new ArrayList<>();
}
-
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, ownerRepairs);
-
-
context.setResponseEntity(responseEntity);
-
}
private void refreshStaffName(List<RepairDto> ownerRepairs) {
-
List<String> repairIds = new ArrayList<>();
for (RepairDto apiOwnerRepairDataVo : ownerRepairs) {
repairIds.add(apiOwnerRepairDataVo.getRepairId());
}
-
if (repairIds.size() < 1) {
return;
}
RepairUserDto repairUserDto = new RepairUserDto();
repairUserDto.setRepairIds(repairIds.toArray(new String[repairIds.size()]));
List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
-
for (RepairUserDto tmpRepairUserDto : repairUserDtos) {
for (RepairDto apiOwnerRepairDataVo : ownerRepairs) {
if (tmpRepairUserDto.getRepairId().equals(apiOwnerRepairDataVo.getRepairId())) {
@@ -120,6 +119,5 @@
}
}
}
-
}
}
--
Gitblit v1.8.0