Merge remote-tracking branch 'origin/developer-2023-02-15' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/TransferActiveCodeDTO.java

@@ -28,10 +28,22 @@ public class TransferActiveCodeDTO implements Serializable {
      */
     private Integer failedNum;
     /**
+     * 成功明细
+     */
+    private List<Map<String, String>> successList;
+    /**
      * 失败明细
      */
     private List<Map<String, String>> failedList;
 
+    public List<Map<String, String>> getSuccessList() {
+        return successList;
+    }
+
+    public void setSuccessList(List<Map<String, String>> successList) {
+        this.successList = successList;
+    }
+
     public Integer getTotalNum() {
         return totalNum;
     }
@@ -67,6 +79,13 @@ public class TransferActiveCodeDTO implements Serializable {
     //操作日志记录
     public String logRecord() {
         StringBuilder log = new StringBuilder();
+        //记录单个转移的成功日志
+        if (CollUtil.isNotEmpty(this.successList) && this.totalNum==1){
+            Map<String, String> stringMap = this.successList.get(0);
+            log.append("将"+stringMap.get("handoverStaffName")+"-"+stringMap.get("handoverStaffPhone")+"的许可手动转移给"
+                    +stringMap.get("takeoverStaffStaffName")+"-"+stringMap.get("takeoverStaffStaffPhone"));
+            return log.toString();
+        }
         log.append("共需转移" + this.totalNum + "，成功" + this.successNum + "，失败" + this.failedNum + "。");
         if (CollUtil.isNotEmpty(this.failedList)) {
             log.append("失败明细：");

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -971,6 +971,7 @@ public class StaffApiServiceImpl implements StaffApiService {
         logger.info("转移成员返回结果：{}",JSONObject.toJSONString(listServiceResponse));
         int successNum=0,failedNum=0;
         List<Map<String,String>> failedList =new ArrayList<>();
+        List<Map<String,String>> successList =new ArrayList<>();
         if (Constant.SUCCESS.equals(listServiceResponse.getCode())){
             List<AccountTransferUserDTO> resultList = listServiceResponse.getResult();
             result.setTotalNum(resultList.size());
@@ -984,6 +985,13 @@ public class StaffApiServiceImpl implements StaffApiService {
                     staffMapper.updateStaffInfoByStaffId(handoverStaff.getStaffId(),null,null,null);
                     //更新接收成员的许可信息
                     staffMapper.updateStaffInfoByStaffId(takeOverStaff.getStaffId(),handoverStaff.getActiveTime(),handoverStaff.getExpireTime(), handoverStaff.getActiveCode());
+                    //记录转移成功明细
+                    Map<String,String> stringMap = new HashMap<>(8);
+                    stringMap.put("handoverStaffName",handoverStaff.getStaffName());
+                    stringMap.put("handoverStaffPhone",handoverStaff.getPhoneNumber());
+                    stringMap.put("takeoverStaffName",takeOverStaff.getStaffName());
+                    stringMap.put("takeoverStaffPhone",takeOverStaff.getPhoneNumber());
+                    successList.add(stringMap);
 
                 }else{
                     //企微转移失败,记录失败明细