完成修改

user-service/src/main/java/com/diagbot/dto/AuthenticationDTO.java

@@ -27,7 +27,7 @@ public class AuthenticationDTO {
 	    @TableId(value = "id", type = IdType.AUTO)
 	    private Long userId;//用户ID
 	    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-	    private Date userGmtCreate;//记录创建时间
+	    private Date autGmtCreate;//记录创建时间
 	    private Date certificationDate;//认证时间
 	    private String userName;// 用户名
 	    private String linkman;//联系人
@@ -54,7 +54,7 @@ public class AuthenticationDTO {
 	        return OrganizationTypeEnum.getName(this.orgType);
 	    }
 
-	    public  String getSuthStatusStr(){
+	    public  String getAuthStatusStr(){
 	        return AuthStatusEnum.getName(this.authStatus);
 	    }
 	    

user-service/src/main/java/com/diagbot/dto/CustomerDTO.java

@@ -20,6 +20,7 @@ public class CustomerDTO implements Serializable{
 	 private String userName;// 用户名
 	 private String orgName;//机构名称
 	 private Integer authStatus;//认证状态
+	 private Integer status;//处理状态（0：待处理，1：已处理）
 	 private String startTime;//开始时间
 	 private String endTime;//结束时间
 

user-service/src/main/java/com/diagbot/dto/ExportKemaDTO.java

@@ -14,7 +14,7 @@ import lombok.Setter;
 public class ExportKemaDTO {
 	  private static final long serialVersionUID = 1L;
 	    private String userId;//用户ID
-	    private String userGmtCreate;//记录创建时间
+	    private String autGmtCreate;//记录创建时间
 	    private String orderNum;
 	    private String linkman;//联系人
 	    private String orgName;//机构名称
@@ -23,10 +23,10 @@ public class ExportKemaDTO {
 	    private String email;// 邮箱
 	    private String authStatus;//认证状态
 	   
-	    public ExportKemaDTO(String userId, String userGmtCreate,String orderNum,String linkman, String orgName, String position,String userName,  String email, 
+	    public ExportKemaDTO(String userId, String autGmtCreate,String orderNum,String linkman, String orgName, String position,String userName,  String email, 
 	                             String authStatus) {
 	        this.userId = userId;
-	        this.userGmtCreate = userGmtCreate;
+	        this.autGmtCreate = autGmtCreate;
 	        this.orderNum = orderNum;
 	        this.linkman = linkman;
 	        this.orgName = orgName;

user-service/src/main/java/com/diagbot/dto/ExportOrganizationDTO.java

@@ -20,17 +20,17 @@ public class ExportOrganizationDTO {
 	private String orgPrincipal;// 负责人
 	private String orgType;// 机构属性
 	private String orgAddress;// 机构地址
-	private String userName;// 用户名
+	private String linkman;// 用户名
 
 	public ExportOrganizationDTO(String orgId, String orgGmtCreate,String orgName,String orgPrincipal,
-			String orgType,String orgAddress, String userName) {
+			String orgType,String orgAddress, String linkman) {
 	        this.orgId = orgId;
 	        this.orgGmtCreate = orgGmtCreate;
 	        this.orgName = orgName;
 	        this.orgPrincipal = orgPrincipal;
 	        this.orgType = orgType;
 	        this.orgAddress = orgAddress;
-	        this.userName = userName;
+	        this.linkman = linkman;
 	}
 
 	public ExportOrganizationDTO() {

user-service/src/main/java/com/diagbot/dto/ExportVerifiedDTO.java

@@ -15,17 +15,17 @@ public class ExportVerifiedDTO {
 	  private static final long serialVersionUID = 1L;
 	    private String userId;//用户ID
 	    private String userGmtCreate;//记录创建时间
-	    private String userGmtModified;
+	    private String passauthTime;
 	    private String linkman;//联系人
 	    private String orgName;//机构名称
 	    private String position;//岗位信息
 	    private String userName;// 用户名
 	    private String email;// 邮箱
 	    private String authStatus;//认证状态
-	    public ExportVerifiedDTO(String userId, String userGmtCreate,String userGmtModified,String linkman,String orgName,String position, String userName,  String email,String authStatus) {
+	    public ExportVerifiedDTO(String userId, String userGmtCreate,String passauthTime,String linkman,String orgName,String position, String userName,  String email,String authStatus) {
 	        this.userId = userId;
 	        this.userGmtCreate = userGmtCreate;
-	        this.userGmtModified = userGmtModified;
+	        this.passauthTime = passauthTime;
 	        this.linkman = linkman;
 	        this.orgName = orgName;
 	        this.position = position;

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -30,6 +30,7 @@ import com.diagbot.entity.UserAuthentication;
 import com.diagbot.entity.UserOrganization;
 import com.diagbot.entity.UserRole;
 import com.diagbot.entity.wrapper.MenuWrapper;
+import com.diagbot.enums.AuthHandleEnum;
 import com.diagbot.enums.AuthStatusEnum;
 import com.diagbot.enums.ConstantEnum;
 import com.diagbot.enums.IsDeleteEnum;
@@ -795,10 +796,15 @@ public class UserFacade extends UserServiceImpl {
         auditMap.put("modifier", UserUtils.getCurrentPrincipleID());
         auditMap.put("gmtModified", DateUtil.now());
         auditMap.put("certificationDate", DateUtil.now());
-        auditMap.put("isReject", userInfoAuditVO.getIsReject());
+        if(ByType == 1){
+           auditMap.put("isReject", RejectEnum.PASS.getKey());
+        }
+        if(ByType == 2){
+            auditMap.put("isReject", RejectEnum.NO_PASS.getKey());
+         }
         auditMap.put("rejectComment", userInfoAuditVO.getRejectComment());
         auditMap.put("rejectType", userInfoAuditVO.getRejectType());
-        auditMap.put("status",1);
+        auditMap.put("status",AuthHandleEnum.Handled.getKey());//已处理
         if(ByType == 1){
         	auditMap.put("authStatus", 1);
         }
@@ -806,8 +812,11 @@ public class UserFacade extends UserServiceImpl {
         	auditMap.put("authStatus", 0);
         }
         // TODO 审核前先验证该用户的的认证状态
-        auditUserInfoAll(auditMap);
-        return RespDTO.onSuc(true);
+        boolean res = auditUserInfoAll(auditMap);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
     }
 
     /**
@@ -921,8 +930,11 @@ public class UserFacade extends UserServiceImpl {
         map.put("userId", baseIdVO.getId());
         map.put("modifier", UserUtils.getCurrentPrincipleID());
         map.put("gmtModified", DateUtil.now());
-        updateDeleted(map);
-        return RespDTO.onSuc(true);
+        boolean res = updateDeleted(map);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
     }
 
     /**
@@ -931,7 +943,7 @@ public class UserFacade extends UserServiceImpl {
      * @param authStatus
      * @return 分页查询用户信息和机构信息开通产品
      */
-    public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAlls(Page page, String orgName, Integer authStatus) {
+/*    public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAlls(Page page, String orgName, Integer authStatus) {
 
         UserInfoDTO userInfo = new UserInfoDTO();
         userInfo.setOrgName(orgName);
@@ -965,7 +977,7 @@ public class UserFacade extends UserServiceImpl {
         System.out.println("====================" + GsonUtil.toJson(userData));
         user.setRecords(userData);
         return RespDTO.onSuc(user);
-    }
+    }*/
     /**
      * 1.分页查询注册用户信息接口 queryUserInformation
      * @param page
@@ -1085,6 +1097,8 @@ public class UserFacade extends UserServiceImpl {
         if(endTime != null && endTime.length() != 0){
         	userInfo.setEndTime(endTime);
         }
+        userInfo.setAuthStatus(2);//认证中。。。
+        userInfo.setStatus(0);//待处理
 		return RespDTO.onSuc(queryAuthentication(page, userInfo));
 	}
 
@@ -1172,7 +1186,7 @@ public class UserFacade extends UserServiceImpl {
         listId.add("orgPrincipal");//负责人
         listId.add("orgType");//机构属性
         listId.add("orgAddress");//机构地址
-        listId.add("userName");// 用户名
+        listId.add("linkman");// 用户名
 
         List<ExportOrganizationDTO> list = new ArrayList<>();
         for (int i = 0; i < datas.size(); i++) {
@@ -1184,7 +1198,7 @@ public class UserFacade extends UserServiceImpl {
                     userInfo.getOrgPrincipal(),
                     OrganizationTypeEnum.getName(userInfo.getOrgType()),
                     userInfo.getOrgAddress(),
-                    userInfo.getUserName()));
+                    userInfo.getLinkman()));
         }
         response.setContentType("text/html;charset=UTF-8");
         ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
@@ -1197,7 +1211,8 @@ public class UserFacade extends UserServiceImpl {
         Map<String, Object> userMap = new HashMap<String, Object>();
         userMap.put("startTime", userExportVO.getStartTime());
         userMap.put("endTime", userExportVO.getEndTime());
-        userMap.put("authStatus", userExportVO.getAuthStatus());
+        userMap.put("authStatus", 2);//认证状态: 0 未认证，1 已认证，2 认证中
+        userMap.put("status", 0);//处理状态（0：待处理，1：已处理）
         userMap.put("orgName", userExportVO.getOrgName());
         userMap.put("userName", userExportVO.getUserName());
         List<AuthenticationDTO> datas = exportKema(userMap);
@@ -1216,7 +1231,7 @@ public class UserFacade extends UserServiceImpl {
 
         List<String> listId = new ArrayList<>();
         listId.add("userId");//用户ID
-        listId.add("userGmtCreate");//记录创建时间
+        listId.add("autGmtCreate");//记录创建时间
         listId.add("orderNum");
         listId.add("linkman");//联系人
         listId.add("orgName");//机构名称
@@ -1229,7 +1244,7 @@ public class UserFacade extends UserServiceImpl {
         for (int i = 0; i < datas.size(); i++) {
         	AuthenticationDTO userInfo = datas.get(i);
             list.add(new ExportKemaDTO(String.valueOf(userInfo.getUserId()),
-                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
+                    DateUtil.formatDate(userInfo.getAutGmtCreate()),
                     userInfo.getOrderNum(),
                     userInfo.getLinkman(),
                     userInfo.getOrgName(),
@@ -1249,7 +1264,7 @@ public class UserFacade extends UserServiceImpl {
         Map<String, Object> userMap = new HashMap<String, Object>();
         userMap.put("startTime", userExportVO.getStartTime());
         userMap.put("endTime", userExportVO.getEndTime());
-        userMap.put("authStatus", userExportVO.getAuthStatus());
+        userMap.put("authStatus", 1);
         userMap.put("orgName", userExportVO.getOrgName());
         userMap.put("userName", userExportVO.getUserName());
         List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
@@ -1269,7 +1284,7 @@ public class UserFacade extends UserServiceImpl {
         List<String> listId = new ArrayList<>();
         listId.add("userId");//用户ID
         listId.add("userGmtCreate");//记录创建时间
-        listId.add("userGmtModified");
+        listId.add("passauthTime");
         listId.add("linkman");//联系人
         listId.add("orgName");//机构名称
         listId.add("position");//岗位信息
@@ -1305,8 +1320,11 @@ public class UserFacade extends UserServiceImpl {
         amendUserInfo.put("userId", amendUserInfoVO.getUserId());
         amendUserInfo.put("position", amendUserInfoVO.getPosition());
         amendUserInfo.put("linkman", amendUserInfoVO.getLinkman());
-        updateUserInfo(amendUserInfo);
-        return RespDTO.onSuc(true);
+        boolean res = updateUserInfo(amendUserInfo);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
     }
 
     //超管修改机构信息
@@ -1318,8 +1336,11 @@ public class UserFacade extends UserServiceImpl {
         amendOrg.put("type", amendOrgVO.getOrgType());
         amendOrg.put("orgId", amendOrgVO.getOrgId());
         amendOrg.put("orgSubNum", amendOrgVO.getOrgSubNum());
-        updateOrganizations(amendOrg);
-        return RespDTO.onSuc(true);
+        boolean res = updateOrganizations(amendOrg);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
     }
 
 

user-service/src/main/java/com/diagbot/vo/UserInfoAuditVO.java

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
 @Setter
 public class UserInfoAuditVO {
 
-    private Integer isReject;//是否通过认证 0:未通过，1:已通过
+    //private Integer isReject;//是否通过认证 0:未通过，1:已通过
     private Integer rejectType;//未通过类型
     private String rejectComment;//认证被拒理由
     //private Integer status;//认证状态（0：未认证，1：已认证，2：认证中）

user-service/src/main/java/com/diagbot/web/ReportFormController.java

@@ -41,7 +41,7 @@ public class ReportFormController {
          userFacade.export(userExportVO, response);
         
     }
-    @ApiOperation(value = "导出用户信息:[by:wangfeng]", notes = "根据时间 导出用户信息")
+    @ApiOperation(value = "导出用户信息(新):[by:wangfeng]", notes = "根据时间 导出用户信息")
     @PostMapping("/exportUserInfo")
     @SysLoggerExport("exportUserInfo")
     @ResponseBody
@@ -50,7 +50,7 @@ public class ReportFormController {
          userFacade.exportUserInfo(userExportVO, response);
         
     }
-    @ApiOperation(value = "导出机构信息:[by:wangfeng]", notes = "根据时间 导出用户信息和机构信息")
+    @ApiOperation(value = "导出机构信息(新):[by:wangfeng]", notes = "根据时间 导出用户信息和机构信息")
     @PostMapping("/exportOrganization")
     @SysLoggerExport("exportOrganization")
     @ResponseBody
@@ -59,7 +59,7 @@ public class ReportFormController {
          userFacade.exportOrganization(userExportVO, response);
         
     }
-    @ApiOperation(value = "导出认证中用户的信息:[by:wangfeng]", notes = "导出认证中用户的信息")
+    @ApiOperation(value = "导出认证中用户的信息(新):[by:wangfeng]", notes = "导出认证中用户的信息")
     @PostMapping("/exportKema")
     @SysLoggerExport("exportKema")
     @ResponseBody
@@ -68,7 +68,7 @@ public class ReportFormController {
          userFacade.exportKema(userExportVO, response);
         
     }
-    @ApiOperation(value = "导出已认证用户的信息:[by:wangfeng]", notes = "根据时间 导出已认证用户的信息")
+    @ApiOperation(value = "导出已认证用户的信息(新):[by:wangfeng]", notes = "根据时间 导出已认证用户的信息")
     @PostMapping("/exportVerified")
     @SysLoggerExport("exportVerified")
     @ResponseBody

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -66,7 +66,7 @@ public class UserInfoController {
     @Autowired
     UserAuthenticationFacade userAuthenticationFacade;
 
-    @ApiOperation(value = "分页查询获取用户信息[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
+    /*@ApiOperation(value = "分页查询获取用户信息[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
     @PostMapping("/getUserInfoPag")
     @SysLogger("getUserInfoPag")
     @ApiIgnore
@@ -76,9 +76,9 @@ public class UserInfoController {
         //userInfo.setAutStatus(userInfoPagVO.getAutStatus());
         IPage<UserInfoDTO> user = userFacade.selectUserInfoListPage(userInfoPagVO, userInfo);
         return RespDTO.onSuc(user);
-    }
+    }*/
 
-    @ApiOperation(value = "修改用户信息和机构信息[by:wangfeng]", notes = "用户信息和机构信息")
+    /*@ApiOperation(value = "修改用户信息和机构信息[by:wangfeng]", notes = "用户信息和机构信息")
     @PostMapping("/updateUserInfoAll")
     @SysLogger("updateUserInfoAll")
     @Transactional
@@ -86,7 +86,7 @@ public class UserInfoController {
     public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll(
             @Valid @RequestBody UserInfoOrganizationsVO userInfoOrganizationsVO) {
         return userFacade.updateUserInfoAlls(userInfoOrganizationsVO);
-    }
+    }*/
 
     @ApiOperation(value = "认证用户信息和机构信息通过接口(新)[by:wangfeng]", notes = "审核用户信息和机构信息通过")
     @PostMapping("/auditUserInfoAllPass")
@@ -105,7 +105,7 @@ public class UserInfoController {
     	return userFacade.auditUserInfoAlls(userInfoAuditVO,ByType);
     }
 
-    @ApiOperation(value = "删除用户信息和机构信息(新)[by:wangfeng]", notes = "用户信息和机构信息")
+    @ApiOperation(value = "删除用户信息和机构信息接口(新)[by:wangfeng]", notes = "用户信息和机构信息")
     @PostMapping("/updateDeleted")
     @SysLogger("updateDeleted")
     @Transactional
@@ -142,7 +142,7 @@ public class UserInfoController {
         return userFacade.addUserInfos(userAndOrganizationVO);
     }
 
-    @ApiOperation(value = "用户信息和机构信息已开通产品[by:wangfeng]", notes = "用户信息和机构信息已开通产品")
+    /*@ApiOperation(value = "用户信息和机构信息已开通产品[by:wangfeng]", notes = "用户信息和机构信息已开通产品")
     @PostMapping("/getUserOrganProductAll")
     @SysLogger("getUserOrganProductAll")
     @Transactional
@@ -150,7 +150,7 @@ public class UserInfoController {
     public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAll(@RequestBody UserOrganProductPageVO pageVO) {
 
         return userFacade.getUserOrganProductAlls(pageVO, pageVO.getOrgName(), pageVO.getAuthStatus());
-    }
+    }*/
     
     @ApiOperation(value = "分页查询注册用户信息接口(新)[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
     @PostMapping("/queryUserInformation")
@@ -195,7 +195,7 @@ public class UserInfoController {
     	
     }
     
-    @ApiOperation(value = "机构信息修改接口[by:wangfeng]", notes = "机构id必传")
+    @ApiOperation(value = "机构信息修改接口(新)[by:wangfeng]", notes = "机构id必传")
     @PostMapping("/updateOrganizations")
     @SysLogger("updateOrganizations")
     @Transactional