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-community/src/main/java/com/java110/community/bmo/repair/impl/AppraiseRepairBMOImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/bmo/repair/impl/AppraiseRepairBMOImpl.java b/service-community/src/main/java/com/java110/community/bmo/repair/impl/AppraiseRepairBMOImpl.java
index 2270e5b..086a2c1 100644
--- a/service-community/src/main/java/com/java110/community/bmo/repair/impl/AppraiseRepairBMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/bmo/repair/impl/AppraiseRepairBMOImpl.java
@@ -7,8 +7,11 @@
import com.java110.dto.appraise.AppraiseDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.user.UserDto;
import com.java110.intf.common.IAppraiseInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.appraise.AppraisePo;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;
@@ -18,8 +21,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-
/**
* 鎶ヤ慨璇勪环
@@ -29,23 +32,32 @@
@Autowired
private IAppraiseInnerServiceSMO appraiseInnerServiceSMOImpl;
+
@Autowired
private IRepairServiceDao repairServiceDaoImpl;
@Autowired
private IRepairUserServiceDao repairUserServiceDaoImpl;
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMO;
+
@Override
@Java110Transactional
public ResponseEntity<String> appraiseRepair(@RequestBody AppraiseDto appraiseDto) {
-
-
+ //鑾峰彇瑁呬慨id
+ String repairId = appraiseDto.getObjId();
+ Map repairInfo = new HashMap();
+ repairInfo.put("repairId", repairId);
+ repairInfo.put("state", RepairUserDto.STATE_EVALUATE);
+ List<Map> repairUserInfo = repairUserServiceDaoImpl.getRepairUserInfo(repairInfo);
+ Assert.listOnlyOne(repairUserInfo, "璇ョ敤鎴锋病鏈夊緟璇勪环鐨勬姤淇崟");
Map info = new HashMap();
+ info.put("ruId", repairUserInfo.get(0).get("ruId"));
info.put("repairId", appraiseDto.getObjId());
- info.put("staffId", appraiseDto.getAppraiseUserId());
- info.put("state", RepairUserDto.STATE_CLOSE);
+ info.put("state", RepairUserDto.STATE_FINISH);
info.put("endTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- info.put("context", "璇勪环瀹屾垚");
+ info.put("context", appraiseDto.getContext());
info.put("statusCd", "0");
repairUserServiceDaoImpl.updateRepairUserInfoInstance(info);
//灏嗗伐鍗曡〃鐨勭姸鎬佷慨鏀逛负瀹屾垚
@@ -54,16 +66,17 @@
info.put("statusCd", "0");
info.put("state", RepairDto.STATE_RETURN_VISIT);
repairServiceDaoImpl.updateRepairInfoInstance(info);
-
-
//璇勪环琛ㄤ腑鍔犲叆璇勪环鍐呭
AppraisePo appraisePo = BeanConvertUtil.covertBean(appraiseDto, AppraisePo.class);
+ UserDto userDto = new UserDto();
+ userDto.setUserId(appraisePo.getAppraiseUserId());
+ List<UserDto> users = userInnerServiceSMO.getUsers(userDto);
+ Assert.listOnlyOne(users, "淇℃伅閿欒锛岀敤鎴蜂笉瀛樺湪锛�");
+ appraisePo.setAppraiseUserName(users.get(0).getName());
appraisePo.setParentAppraiseId("-1");
appraisePo.setObjType(AppraiseDto.OBJ_TYPE_REPAIR);
appraisePo.setAppraiseType(AppraiseDto.APPRAISE_TYPE_PUBLIC);
-
appraiseInnerServiceSMOImpl.saveAppraise(appraisePo);
-
return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
}
--
Gitblit v1.8.0