报道bug

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/certificate/vo/CertDetailVO.java

@@ -1,5 +1,7 @@
 package com.zjugis.module.adm.controller.admin.certificate.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -14,8 +16,12 @@ public class CertDetailVO {
     /**
      * 主键ID
      */
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
-
+    /**
+     * 用户ID
+     */
+    private String userId;
     /**
      * 姓名
      */
@@ -55,4 +61,9 @@ public class CertDetailVO {
      */
     private String certDetail;
 
+    /**
+     * 原件地址
+     */
+    private String filePath;
+
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/certificate/vo/CertPageResVO.java

@@ -1,5 +1,7 @@
 package com.zjugis.module.adm.controller.admin.certificate.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -15,8 +17,12 @@ public class CertPageResVO {
     /**
      * 主键ID
      */
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
-
+    /**
+     * 用户ID
+     */
+    private String userId;
     /**
      * 姓名
      */
@@ -56,4 +62,9 @@ public class CertPageResVO {
      */
     private String certDetail;
 
+    /**
+     * 原件地址
+     */
+    private String filePath;
+
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -20,6 +20,7 @@ import com.zjugis.module.adm.dal.dataobject.staff.*;
 import com.zjugis.module.adm.dal.mysql.certificate.CertMapper;
 import com.zjugis.module.adm.dal.mysql.staff.*;
 import com.zjugis.module.infra.api.ding.DingApi;
+import com.zjugis.module.infra.api.ding.dto.DingMessageDto;
 import com.zjugis.module.infra.api.ding.dto.StaffDTO;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
@@ -350,15 +351,6 @@ public class RecordsServiceImpl implements RecordsService {
         }
 
 
-        //钉钉邀请
-        StaffDTO staff = new StaffDTO();
-        staff.setNickname(staffRecordSDO.getNickname());
-        staff.setMobile(staffRecordSDO.getMobilePhone());
-        staff.setDeptName(staffRecordSDO.getDeptName());
-        staff.setLoginName(staffRecordSDO.getLoginName());
-        dingApi.entry(staff);
-
-
         return user.getUserId();
     }
 
@@ -439,7 +431,9 @@ public class RecordsServiceImpl implements RecordsService {
         return recordsMapper.updateById(staffRecordSDO);
     }
 
+
     @Override
+    @Transactional
     public String report(StaffReportDTO dto) {
         StaffRecordSDO staffRecordSDO = new StaffRecordSDO();
         if (StrUtil.isNotEmpty(dto.getUserId())) {
@@ -487,12 +481,27 @@ public class RecordsServiceImpl implements RecordsService {
         }
 
 
+        //钉钉邀请
+        StaffDTO staff = new StaffDTO();
+        staff.setNickname(staffRecordSDO.getNickname());
+        staff.setMobile(staffRecordSDO.getMobilePhone());
+        staff.setDeptName(staffRecordSDO.getDeptName());
+        staff.setLoginName(staffRecordSDO.getLoginName());
+        try {
+            dingApi.entry(staff).getCheckedData();
+        } catch (Exception e) {
+            throw new RuntimeException("钉钉邀请失败:" + e.getMessage());
+        }
+
+
         //新建员工账号以及其相关的关系 如果账号已经存在就开启账号的使用状态 以及修改其相关的权限和部门关系
         UserBaseDTO user = initUser(staffRecordSDO);
         CommonResult<String> result = userApi.createUser(user);
         if (result.getCode() != 0) {
             throw new RuntimeException(result.getMsg());
         }
+
+
         return result.getCheckedData();
     }
 

zjugis-module-infra/zjugis-module-infra-api/src/main/java/com/zjugis/module/infra/api/ding/dto/StaffDTO.java

@@ -2,7 +2,8 @@ package com.zjugis.module.infra.api.ding.dto;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
 
 /**
  * @author jzh
@@ -10,15 +11,15 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 public class StaffDTO {
-    @NotNull(message = "员工工号不能为空")
+    @NotBlank
     private String loginName;
 
-    @NotNull(message = "员工姓名不能为空")
+    @NotBlank
     private String nickname;
 
-    @NotNull(message = "手机号不能为空")
+    @NotBlank
     private String mobile;
 
-    @NotNull(message = "部门名称不能为空")
+    @NotBlank
     private String deptName;
 }

zjugis-module-infra/zjugis-module-infra-biz/src/main/java/com/zjugis/module/infra/api/ding/DingApiImpl.java

@@ -9,8 +9,10 @@ import com.zjugis.module.system.api.user.AdminUserApi;
 import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.bus.BusBridge;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -49,10 +51,12 @@ public class DingApiImpl implements DingApi {
     }
 
     @Override
-    public CommonResult<String> entry(StaffDTO dto) {
+    public CommonResult<String> entry(@RequestBody StaffDTO dto) {
         try {
-            String res = dingService.createStaff(dto);
-            return CommonResult.success(res);
+
+//            String res = dingService.createStaff(dto);
+            throw new ApiException("错误");
+//            return CommonResult.success(res);
         } catch (ApiException e) {
             return CommonResult.error(101, e.getMessage());
         }
@@ -61,7 +65,7 @@ public class DingApiImpl implements DingApi {
     }
 
     @Override
-    public CommonResult<String> resign(String loginName) {
+    public CommonResult<String> resign(@RequestParam("loginName") String loginName) {
         try {
             dingService.deleteStaff(loginName);
             return CommonResult.success("ok");