From c0328edb2de39f27e47b7ad1eedf8f80b883335e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 24 一月 2023 17:41:49 +0800
Subject: [PATCH] 优化 供应链 类型的bug
---
service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java | 98 ++++++++++++++++++++++--------------------------
1 files changed, 45 insertions(+), 53 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java
index cc670fd..a3b9777 100644
--- a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java
@@ -89,19 +89,16 @@
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
Assert.hasKeyAndValue(reqJson, "action", "鏈寘鍚鐞嗗姩浣�");
- if(!reqJson.containsKey("userId")){
- reqJson.put("userId",context.getReqHeaders().get("user-id"));
+ if (!reqJson.containsKey("userId")) {
+ reqJson.put("userId", context.getReqHeaders().get("user-id"));
}
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
- RepairUserPo repairUserPo = BeanConvertUtil.covertBean(reqJson, RepairUserPo.class);
-
+// RepairUserPo repairUserPo = BeanConvertUtil.covertBean(reqJson, RepairUserPo.class);
String action = reqJson.getString("action");
-
-
switch (action) {
case ACTION_DISPATCH:
dispacthRepair(context, reqJson);
@@ -123,7 +120,6 @@
List<RepairDto> repairDtos = repairInnerServiceSMOImpl.queryRepairs(repairDto);
Assert.listOnlyOne(repairDtos, "褰撳墠鐢ㄦ埛娌℃湁闇�瑕佸鐞嗚鍗曟垨瀛樺湪澶氭潯");
int flag = 0;
-
//寰呰瘎浠�
if (RepairDto.STATE_APPRAISE.equals(repairDtos.get(0).getState())) {
FeeAttrDto feeAttrDto = new FeeAttrDto();
@@ -142,7 +138,6 @@
context.setResponseEntity(responseEntity);
return;
}
-
PayFeePo payFeePo = new PayFeePo();
payFeePo.setCommunityId(feeDtos.get(0).getCommunityId());
payFeePo.setFeeId(feeDtos.get(0).getFeeId());
@@ -160,65 +155,54 @@
// if (flag < 1) {
// throw new CmdException("鍒犻櫎璐圭敤澶辫触");
// }
-
}
-
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
-
context.setResponseEntity(responseEntity);
}
-
-
- String userId = reqJson.getString("userId");
- String userName = reqJson.getString("userName");
-
RepairUserDto repairUserDto = new RepairUserDto();
repairUserDto.setRepairId(reqJson.getString("repairId"));
repairUserDto.setCommunityId(reqJson.getString("communityId"));
repairUserDto.setState(RepairUserDto.STATE_DOING);
- repairUserDto.setStaffId(userId);
+ repairUserDto.setStaffId(reqJson.getString("userId"));
List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
if (repairUserDtos != null && repairUserDtos.size() != 1) {
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "褰撳墠鐢ㄦ埛娌℃湁闇�瑕佸鐞嗚鍗曪紒");
context.setResponseEntity(responseEntity);
return;
}
- String ruId = repairUserDtos.get(0).getRuId();
- RepairUserPo repairUserPo = new RepairUserPo();
- repairUserPo.setRuId(repairUserDtos.get(0).getRuId());
- repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- repairUserPo.setState(RepairUserDto.STATE_BACK);
- repairUserPo.setContext(reqJson.getString("context"));
- repairUserPo.setCommunityId(reqJson.getString("communityId"));
+// String ruId = repairUserDtos.get(0).getRuId();
+// RepairUserPo repairUserPo = new RepairUserPo();
+// repairUserPo.setRuId(repairUserDtos.get(0).getRuId());
+// repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+// repairUserPo.setState(RepairUserDto.STATE_BACK);
+// repairUserPo.setContext(reqJson.getString("context"));
+// repairUserInnerServiceSMOImpl.updateRepairUser(repairUserPo);
//澶勭悊浜轰俊鎭�
- repairUserPo = new RepairUserPo();
- repairUserPo.setRuId("-1");
- repairUserPo.setState(RepairUserDto.STATE_DOING);
- repairUserPo.setRepairId(reqJson.getString("repairId"));
- repairUserPo.setStaffId(reqJson.getString("staffId"));
- repairUserPo.setStaffName(reqJson.getString("staffName"));
- repairUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- repairUserDto = new RepairUserDto();
- repairUserDto.setRepairId(reqJson.getString("repairId"));
- repairUserDto.setStaffId(reqJson.getString("staffId"));
- repairUserDto.setCommunityId(reqJson.getString("communityId"));
- repairUserDto.setRuId(repairUserDtos.get(0).getPreRuId());
- repairUserDto.setStates(new String[]{RepairUserDto.STATE_TRANSFER, RepairUserDto.STATE_CLOSE, RepairUserDto.STATE_STOP});
- repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
-
- if (repairUserDtos == null || repairUserDtos.size() < 1) {
+// repairUserPo = new RepairUserPo();
+// repairUserPo.setRuId("-1");
+// repairUserPo.setState(RepairUserDto.STATE_DOING);
+// repairUserPo.setRepairId(reqJson.getString("repairId"));
+// repairUserPo.setStaffId(reqJson.getString("staffId"));
+// repairUserPo.setStaffName(reqJson.getString("staffName"));
+ RepairUserDto repair = new RepairUserDto();
+ repair.setRepairId(reqJson.getString("repairId"));
+ repair.setStaffId(reqJson.getString("staffId"));
+ repair.setCommunityId(reqJson.getString("communityId"));
+// repair.setRuId(repairUserDtos.get(0).getPreRuId());
+ repair.setStates(new String[]{RepairUserDto.STATE_TRANSFER, RepairUserDto.STATE_CLOSE, RepairUserDto.STATE_STOP});
+ List<RepairUserDto> repairUsers = repairUserInnerServiceSMOImpl.queryRepairUsers(repair);
+ if (repairUsers == null || repairUsers.size() < 1) { //鎸囨淳鐨勪笉鑳介��鍗�
if (RepairDto.REPAIR_WAY_GRABBING.equals(repairDtos.get(0).getRepairWay())
- || RepairDto.REPAIR_WAY_TRAINING.equals(repairDtos.get(0).getRepairWay())
- ) {
- modifyBusinessRepairDispatch(reqJson, RepairDto.STATE_WAIT);
+ || RepairDto.REPAIR_WAY_TRAINING.equals(repairDtos.get(0).getRepairWay())) {
+ modifyBusinessRepairDispatch(reqJson, RepairDto.STATE_WAIT);//缁翠慨鍗曞彉鎴愭湭娲惧崟
//鎶婅嚜宸辨敼鎴愰��鍗�
RepairUserPo repairUser = new RepairUserPo();
- repairUser.setRuId(ruId);
+ repairUser.setRuId(repairUserDtos.get(0).getRuId());
repairUser.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
repairUser.setState(RepairUserDto.STATE_BACK);
repairUser.setContext(reqJson.getString("context"));
repairUser.setCommunityId(reqJson.getString("communityId"));
- flag = repairUserV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
+ flag = repairUserV1InnerServiceSMOImpl.updateRepairUserNew(repairUser);
if (flag < 1) {
throw new CmdException("淇敼鐢ㄦ埛澶辫触");
}
@@ -229,24 +213,32 @@
return;
}
}
-
//鎶婅嚜宸辨敼鎴愰��鍗�
RepairUserPo repairUser = new RepairUserPo();
- repairUser.setRuId(ruId);
+ repairUser.setRuId(repairUserDtos.get(0).getRuId());
repairUser.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
repairUser.setState(RepairUserDto.STATE_BACK);
repairUser.setContext(reqJson.getString("context"));
repairUser.setCommunityId(reqJson.getString("communityId"));
- flag = repairUserV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
+ flag = repairUserV1InnerServiceSMOImpl.updateRepairUserNew(repairUser);
if (flag < 1) {
throw new CmdException("淇敼鐢ㄦ埛澶辫触");
}
- repairUserPo.setPreStaffId(repairUserDtos.get(0).getPreStaffId());
- repairUserPo.setPreStaffName(repairUserDtos.get(0).getPreStaffName());
- repairUserPo.setPreRuId(repairUserDtos.get(0).getPreRuId());
- repairUserPo.setRepairEvent(RepairUserDto.REPAIR_EVENT_AUDIT_USER);
- repairUserPo.setContext("");
+ RepairUserPo repairUserPo = new RepairUserPo();
+ repairUserPo.setRuId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ruId));
+ repairUserPo.setRepairId(reqJson.getString("repairId"));
+ repairUserPo.setbId("-1");
repairUserPo.setCommunityId(reqJson.getString("communityId"));
+ repairUserPo.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ repairUserPo.setState(RepairUserDto.STATE_DOING);
+ repairUserPo.setContext("");
+ repairUserPo.setStaffId(repairUserDtos.get(0).getPreStaffId());
+ repairUserPo.setStaffName(repairUserDtos.get(0).getPreStaffName());
+ repairUserPo.setPreStaffId(repairUserDtos.get(0).getStaffId());
+ repairUserPo.setPreStaffName(repairUserDtos.get(0).getStaffName());
+ repairUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ repairUserPo.setRepairEvent(RepairUserDto.REPAIR_EVENT_AUDIT_USER);
+ repairUserPo.setPreRuId(repairUserDtos.get(0).getRuId());
flag = repairUserV1InnerServiceSMOImpl.saveRepairUserNew(repairUserPo);
if (flag < 1) {
throw new CmdException("淇敼鐢ㄦ埛澶辫触");
--
Gitblit v1.8.0