Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/dto/AuthDetailDTO.java

@@ -33,6 +33,11 @@ public class AuthDetailDTO implements Serializable {
      * 审核信息
      */
     private String auditStatusMsg;
+    
+    /**
+     * 不通过类型
+     */
+    private Integer rejectType;
 
     /**
      * 不通过原因

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -16,6 +16,7 @@ import com.diagbot.entity.ProductOrderIndex;
 import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.enums.AuditStatusEnum;
+import com.diagbot.enums.NotPassEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -94,6 +95,9 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
             products = detailMap.get(num);
             for(AuthDetailDTO i : products){
             	i.setAuditStatusMsg(AuditStatusEnum.getName(i.getAuditStatus()));
+            	if(i.getRejectType()!=null){
+            		i.setRejectReason(NotPassEnum.getName(i.getRejectType()));
+            	}
             }
             productAuthProgressDTO.setProducts(products);
             retList.add(productAuthProgressDTO);

diagbotman-service/src/main/resources/mapper/ProductOrderMapper.xml

@@ -50,15 +50,15 @@
 
     <select id="getOrderDetailsByNums" parameterType="list"
             resultType="com.diagbot.dto.AuthDetailDTO">
-        select
-        a.num as num,
+		select
+        b.order_num as num,
         b.audit_status as auditStatus,
         c.name as name,
+		b.reject_type as rejectType,
         b.reject_reason as rejectReason
-        from diag_product_order a join diag_order_details b on a.num=b.order_num
-        join diag_lantone_product c on b.product_id=c.id
-        where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N'
-        and a.num in
+        from diag_order_details b join diag_lantone_product c on b.product_id=c.id
+        where b.is_deleted = 'N' and c.is_deleted = 'N'
+        and b.num in
         <foreach collection="list" separator="," open="(" close=")" item="num">
             #{num}
         </foreach>

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

@@ -30,7 +30,7 @@ public class AuthenticationDTO {
 	    private Date userGmtCreate;//记录创建时间
 	    private Date certificationDate;//认证时间
 	    private String userName;// 用户名
-	    private String linKman;//联系人
+	    private String linkman;//联系人
 	    private String email;// 邮箱
 	    @TableId(value = "id", type = IdType.AUTO)
 	    private Long orgId;//机构ID
@@ -43,17 +43,19 @@ public class AuthenticationDTO {
 	    private String orgAddress;//机构地址
 	    private Long orgParentId;//上级机构id
 	    private Integer orgSubNum;//下属机构数量
-	    private String autPosition;//岗位信息
+	    private String position;//岗位信息
 	    private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
-	    private Integer autStatus;//认证状态
-	    private String autStatusStr;//认证状态String
+	    private Integer authStatus;//认证状态
+	    private String authStatusStr;//认证状态String
+	    private String orderNum;//认证单号
+	    private Integer status;//处理状态（0：待处理，1：已处理）
 	    
 	    public  String getOrgTypeStr(){
 	        return OrganizationTypeEnum.getName(this.orgType);
 	    }
 
-	    public  String getAutStatusStr(){
-	        return AuthStatusEnum.getName(this.autStatus);
+	    public  String getSuthStatusStr(){
+	        return AuthStatusEnum.getName(this.authStatus);
 	    }
 	    
 

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

@@ -19,7 +19,7 @@ public class CustomerDTO implements Serializable{
 	
 	 private String userName;// 用户名
 	 private String orgName;//机构名称
-	 private Integer autStatus;//认证状态
+	 private Integer authStatus;//认证状态
 	 private String startTime;//开始时间
 	 private String endTime;//结束时间
 

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

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

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

@@ -16,19 +16,19 @@ public class ExportUserInfoDTO {
 	 private static final long serialVersionUID = 1L;
 	    private String userId;//用户ID
 	    private String userGmtCreate;//记录创建时间
-	    private String linKman;//联系人
-	    private String autStatus;//认证状态
+	    private String linkman;//联系人
+	    private String authStatus;//认证状态
 	    private String userName;// 用户名
 	    private String email;// 邮箱
 	    private String orgName;//机构名称
 
 	    
-	    public ExportUserInfoDTO(String userId, String userGmtCreate, String linKman,String autStatus,String userName,  String email, 
+	    public ExportUserInfoDTO(String userId, String userGmtCreate, String linkman,String authStatus,String userName,  String email, 
 	                             String orgName) {
 	        this.userId = userId;
 	        this.userGmtCreate = userGmtCreate;
-	        this.linKman = linKman;
-	        this.autStatus = autStatus;
+	        this.linkman = linkman;
+	        this.authStatus = authStatus;
 	        this.userName = userName;
 	        this.email = email;
 	        this.orgName = orgName;

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

@@ -16,22 +16,22 @@ public class ExportVerifiedDTO {
 	    private String userId;//用户ID
 	    private String userGmtCreate;//记录创建时间
 	    private String userGmtModified;
-	    private String linKman;//联系人
+	    private String linkman;//联系人
 	    private String orgName;//机构名称
-	    private String autPosition;//岗位信息
+	    private String position;//岗位信息
 	    private String userName;// 用户名
 	    private String email;// 邮箱
-	    private String autStatus;//认证状态
-	    public ExportVerifiedDTO(String userId, String userGmtCreate,String userGmtModified,String linKman,String orgName,String autPosition, String userName,  String email,String autStatus) {
+	    private String authStatus;//认证状态
+	    public ExportVerifiedDTO(String userId, String userGmtCreate,String userGmtModified,String linkman,String orgName,String position, String userName,  String email,String authStatus) {
 	        this.userId = userId;
 	        this.userGmtCreate = userGmtCreate;
 	        this.userGmtModified = userGmtModified;
-	        this.linKman = linKman;
+	        this.linkman = linkman;
 	        this.orgName = orgName;
-	        this.autPosition = autPosition;
+	        this.position = position;
 	        this.userName = userName;
 	        this.email = email;
-	        this.autStatus = autStatus;
+	        this.authStatus = authStatus;
 	    }
 
 	    public ExportVerifiedDTO() {

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

@@ -21,7 +21,7 @@ public class OrganizationDTO {
 	 private String orgPrincipal;//负责人
 	 private Integer orgType;//机构属性
 	 private String orgAddress;//机构地址
-	 private String autStatus;// 状态
+	 private String authStatus;// 状态
 	 private String linkman;//联系人
 	 private Long orgParentId;//上级机构id
 	 private Integer orgSubNum;//下属机构数量

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

@@ -23,14 +23,14 @@ public class UserAllDTO {
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date userGmtCreate;//记录创建时间
 	private String userName;// 用户名
-    private String linKman;//联系人
+    private String linkman;//联系人
     private String email;// 邮箱
     private Long orgId;//机构ID
     private String orgName;//机构名称
-    private Integer autStatus;//认证状态
-    private String autStatusStr;//认证状态String
+    private Integer authStatus;//认证状态
+    private String authStatusStr;//认证状态String
 
-    public  String getAutStatusStr(){
-        return AuthStatusEnum.getName(this.autStatus);
+    public  String getAuthStatusStr(){
+        return AuthStatusEnum.getName(this.authStatus);
     }
 }

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

@@ -29,9 +29,9 @@ public class UserInfoDTO implements Serializable {
     private Long userId;//用户ID
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date userGmtCreate;//记录创建时间
-    private Date userGmtModified;//认证时间
+    private Date passauthTime;//认证时间
     private String userName;// 用户名
-    private String linKman;//联系人
+    private String linkman;//联系人
     private String email;// 邮箱
     @TableId(value = "id", type = IdType.AUTO)
     private Long orgId;//机构ID
@@ -44,17 +44,17 @@ public class UserInfoDTO implements Serializable {
     private String orgAddress;//机构地址
     private Long orgParentId;//上级机构id
     private Integer orgSubNum;//下属机构数量
-    private String autPosition;//岗位信息
+    private String  position;//岗位信息
     private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
-    private Integer autStatus;//认证状态
-    private String autStatusStr;//认证状态String
+    private Integer authStatus;//认证状态
+    private String authStatusStr;//认证状态String
     List<UserAndProdutUDTO> userAndProdutUDTO;
 
     public  String getOrgTypeStr(){
         return OrganizationTypeEnum.getName(this.orgType);
     }
 
-    public  String getAutStatusStr(){
-        return AuthStatusEnum.getName(this.autStatus);
+    public  String getAuthStatusStr(){
+        return AuthStatusEnum.getName(this.authStatus);
     }
 }

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

@@ -21,7 +21,7 @@ public class UserInfoExportDTO {
     private String userId;//用户ID
     private String userGmtCreate;//记录创建时间
     private String userName;// 用户名
-    private String linKman;//联系人
+    private String linkman;//联系人
     private String email;// 邮箱
     private String orgId;//机构ID
     private String orgGmtCreate;//记录创建时间
@@ -31,17 +31,17 @@ public class UserInfoExportDTO {
     private String orgAddress;//机构地址
     private String orgParentId;//上级机构id
     private String orgSubNum;//下属机构数量
-    private String autPosition;//岗位信息
+    private String position;//岗位信息
     private String autIsReject;//是否通过认证 N:未通过，Y:已通过
-    private String autStatus;//认证状态
+    private String authStatus;//认证状态
 
-    public UserInfoExportDTO(String userId, String userGmtCreate, String userName, String linKman, String email, String orgId,
+    public UserInfoExportDTO(String userId, String userGmtCreate, String userName, String linkman, String email, String orgId,
                              String orgName, String orgType, String orgPrincipal, String orgAddress, String orgParentId,
-                             String orgSubNum, String autPosition, String autIsReject, String autStatus) {
+                             String orgSubNum, String position, String autIsReject, String authStatus) {
         this.userId = userId;
         this.userGmtCreate = userGmtCreate;
         this.userName = userName;
-        this.linKman = linKman;
+        this.linkman = linkman;
         this.email = email;
         this.orgId = orgId;
         this.orgName = orgName;
@@ -50,9 +50,9 @@ public class UserInfoExportDTO {
         this.orgAddress = orgAddress;
         this.orgParentId = orgParentId;
         this.orgSubNum = orgSubNum;
-        this.autPosition = autPosition;
+        this.position = position;
         this.autIsReject = autIsReject;
-        this.autStatus = autStatus;
+        this.authStatus = authStatus;
     }
 
     public UserInfoExportDTO() {

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

@@ -26,9 +26,9 @@ public class UserOrgizationProductDTO {
 	    private Long userId;//用户ID
 	    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	    private Date userGmtCreate;//记录创建时间
-	    private Date certificationDate;//认证时间
+	    private Date passauthTime;//认证时间
 	    private String userName;// 用户名
-	    private String linKman;//联系人
+	    private String linkman;//联系人
 	    private String email;// 邮箱
 	    @TableId(value = "id", type = IdType.AUTO)
 	    private Long orgId;//机构ID
@@ -41,18 +41,18 @@ public class UserOrgizationProductDTO {
 	    private String orgAddress;//机构地址
 	    private Long orgParentId;//上级机构id
 	    private Integer orgSubNum;//下属机构数量
-	    private String autPosition;//岗位信息
-	    private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
-	    private Integer autStatus;//认证状态
-	    private String autStatusStr;//认证状态String
+	    private String position;//岗位信息
+	    //private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
+	    private Integer authStatus;//认证状态
+	    private String authStatusStr;//认证状态String
 	    List<UserAndProdutUDTO> userAndProdutUDTO;
 
 	    public  String getOrgTypeStr(){
 	        return OrganizationTypeEnum.getName(this.orgType);
 	    }
 
-	    public  String getAutStatusStr(){
-	        return AuthStatusEnum.getName(this.autStatus);
+	    public  String getAuthStatusStr(){
+	        return AuthStatusEnum.getName(this.authStatus);
 	    }
 
 }

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -89,5 +89,7 @@ public interface UserMapper extends BaseMapper<User> {
 
     //导出机构信息接口
 	public List<UserInfoDTO> exportOrganizations(@Param("exportOrg") Map<String, Object> exportOrg);
+	//导出认证中信息接口
+	public List<AuthenticationDTO> exportKema(@Param("exportKema") Map<String, Object> map);
 
 }

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -75,4 +75,6 @@ public interface UserService extends IService<User> {
     public boolean updateOrganizations (Map<String, Object> amendOrg);
     
     public List<UserInfoDTO> exportOrganizations(Map<String, Object> map);
+
+    public List<AuthenticationDTO> exportKema(Map<String, Object> map);
 }

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -104,7 +104,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
         return baseMapper.dependentuserInfoByTime(map);
     }
-
+    
+  //导出认证中用户和机构信息
+    @Override
+    public List<AuthenticationDTO> exportKema(Map<String, Object> map){
+    	return baseMapper.exportKema(map);
+    }
     @Override
     public List<User> getUserByOrgName(String orgName) {
         return baseMapper.getUserByOrgName(orgName);

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

@@ -19,7 +19,7 @@ public class AmendUserInfoVO {
 	
 	@NotNull(message = "请输入用户id")
 	private Long userId;//用户ID
-    private String linKman;//联系人
+    private String linkman;//联系人
     private String email;// 邮箱
-    private String autPosition;//岗位信息
+    private String position;//岗位信息
 }

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

@@ -17,7 +17,7 @@ public class UserAndOrgPageVO extends Page{
 	
 	String userName;
 	String orgName;
-	Integer autStatus;//认证状态
+	Integer authStatus;//认证状态
 	String startTime;//开始时间
 	String endTime;//结束时间
 

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

@@ -20,7 +20,7 @@ public class UserAndOrganizationVO {
      * 机构id
      */
     @NotNull(message = "请输入机构id")
-    private Long organizationid;
+    private Long organizationId;
 
     /**
      * 用户密码

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

@@ -16,6 +16,6 @@ public class UserExportVO {
     private String endTime;
 	private String userName;// 用户名
 	private String orgName;//机构名称
-	private Integer autStatus;//认证状态
+	private Integer authStatus;//认证状态
 
 }

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

@@ -18,7 +18,7 @@ public class UserInfoAuditVO {
     private Integer isReject;//是否通过认证 0:未通过，1:已通过
     private Integer rejectType;//未通过类型
     private String rejectComment;//认证被拒理由
-    private Integer status;//认证状态（0：未认证，1：已认证，2：认证中）
+    //private Integer status;//认证状态（0：未认证，1：已认证，2：认证中）
     @NotNull(message = "请输入用户id")
     private Long userId;//用户id
     @NotNull(message = "请输入申请单号")

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

@@ -16,7 +16,7 @@ import java.io.Serializable;
 public class UserInfoOrganizationsVO implements Serializable {
 
     private String email;//邮箱
-    private String linKman;//联系人
+    private String linkman;//联系人
     private String principal;//负责人
     private String address;//单位地址
     private Integer type;//机构属性

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

@@ -14,7 +14,7 @@ import lombok.Setter;
 public class UserInfoPagVO extends Page {
 	String userName;
     String orgName;
-    Integer autStatus;
+    Integer authStatus;
 	String startTime;//开始时间
 	String endTime;//结束时间
 }

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

@@ -13,5 +13,5 @@ import lombok.Setter;
 @Setter
 public class UserOrganProductPageVO extends Page {
     String orgName;
-    Integer autStatus;
+    Integer authStatus;
 }

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

@@ -308,7 +308,7 @@ public class UserController {
         return RespDTO.onSuc(userFacade.removeById(baseIdVO.getId()));
     }
 
-    @ApiOperation(value = "控制台账户信息[by:rengb]", notes = "控制台账户信息")
+    @ApiOperation(value = "控制台账户信息[by:rengb]", notes = "控制台账户信息no")
     @PostMapping("/getConsoleUserInfo")
     @SysLogger("getConsoleUserInfo")
     public RespDTO<GetConsoleUserInfoDTO> getConsoleUserInfo() {

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

@@ -66,14 +66,14 @@ public class UserInfoController {
     @Autowired
     UserAuthenticationFacade userAuthenticationFacade;
 
-    @ApiOperation(value = "分页查询获取用户信息[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态autStatus")
+    @ApiOperation(value = "分页查询获取用户信息[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
     @PostMapping("/getUserInfoPag")
     @SysLogger("getUserInfoPag")
     @ApiIgnore
     public RespDTO<UserInfoDTO> getUserInfoPag(@RequestBody UserInfoPagVO userInfoPagVO) {
         UserInfoDTO userInfo = new UserInfoDTO();
         userInfo.setOrgName(userInfoPagVO.getOrgName());
-        userInfo.setAutStatus(userInfoPagVO.getAutStatus());
+        //userInfo.setAutStatus(userInfoPagVO.getAutStatus());
         IPage<UserInfoDTO> user = userFacade.selectUserInfoListPage(userInfoPagVO, userInfo);
         return RespDTO.onSuc(user);
     }
@@ -88,12 +88,21 @@ public class UserInfoController {
         return userFacade.updateUserInfoAlls(userInfoOrganizationsVO);
     }
 
-    @ApiOperation(value = "审核用户信息和机构信息(新)[by:wangfeng]", notes = "审核用户信息和机构信息")
-    @PostMapping("/auditUserInfoAll")
-    @SysLogger("auditUserInfoAll")
+    @ApiOperation(value = "认证用户信息和机构信息通过接口(新)[by:wangfeng]", notes = "审核用户信息和机构信息通过")
+    @PostMapping("/auditUserInfoAllPass")
+    @SysLogger("auditUserInfoAllPass")
     @Transactional
-    public RespDTO<Boolean> auditUserInfoAll(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
-        return userFacade.auditUserInfoAlls(userInfoAuditVO);
+    public RespDTO<Boolean> auditUserInfoAllPass(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
+    	int ByType = 1;
+    	return userFacade.auditUserInfoAlls(userInfoAuditVO,ByType);
+    }
+    @ApiOperation(value = "认证用户信息和机构信息不通过接口(新)[by:wangfeng]", notes = "审核用户信息和机构信息不通过")
+    @PostMapping("/auditUserInfoAllNopass")
+    @SysLogger("auditUserInfoAllNopass")
+    @Transactional
+    public RespDTO<Boolean> auditUserInfoAllNopass(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
+        int ByType = 2;
+    	return userFacade.auditUserInfoAlls(userInfoAuditVO,ByType);
     }
 
     @ApiOperation(value = "删除用户信息和机构信息(新)[by:wangfeng]", notes = "用户信息和机构信息")
@@ -124,7 +133,7 @@ public class UserInfoController {
         return userFacade.addOrganizations(organizationVO);
     }
 
-    @ApiOperation(value = "添加用户信息和机构信息管理员[by:wangfeng]", notes = "用户信息和机构信息的绑定")
+    @ApiOperation(value = "添加用户信息和机构信息管理员(新)[by:wangfeng]", notes = "用户信息和机构信息的绑定")
     @PostMapping("/addUserInfo")
     @SysLogger("addUserInfo")
     @Transactional
@@ -140,19 +149,19 @@ public class UserInfoController {
     @ApiIgnore
     public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAll(@RequestBody UserOrganProductPageVO pageVO) {
 
-        return userFacade.getUserOrganProductAlls(pageVO, pageVO.getOrgName(), pageVO.getAutStatus());
+        return userFacade.getUserOrganProductAlls(pageVO, pageVO.getOrgName(), pageVO.getAuthStatus());
     }
     
-    @ApiOperation(value = "分页查询注册用户信息接口[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态autStatus")
+    @ApiOperation(value = "分页查询注册用户信息接口(新)[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
     @PostMapping("/queryUserInformation")
     @SysLogger("queryUserInformation")
     public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO){
     	
-    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getUserName(), userInfoPagVO.getAutStatus(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
+    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getUserName(), userInfoPagVO.getAuthStatus(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
     }
     
     
-    @ApiOperation(value = "分页查询机构信息接口[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
+    @ApiOperation(value = "分页查询机构信息接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryMechanismInformation")
     @SysLogger("queryMechanismInformation")
     public RespDTO<IPage<OrganizationDTO>> queryMechanismInformation(@RequestBody UserInfoPagVO userInfoPagVO){
@@ -161,7 +170,7 @@ public class UserInfoController {
     }
     
     
-    @ApiOperation(value = "分页查询已认证用户信息和机构信息及开通产品接口[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
+    @ApiOperation(value = "分页查询已认证用户信息和机构信息及开通产品接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryVerifiedUserOrganizationProduct")
     @SysLogger("queryVerifiedUserOrganizationProduct")
     public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProduct(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
@@ -169,7 +178,7 @@ public class UserInfoController {
 		return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
 	}
    
-    @ApiOperation(value = "分页查询认证中的用户信息接口[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
+    @ApiOperation(value = "分页查询认证中的用户信息接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryAuthentication")
     @SysLogger("queryAuthentication")
 	public RespDTO<IPage<AuthenticationDTO>> queryAuthentication(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
@@ -177,7 +186,7 @@ public class UserInfoController {
 		return userFacade.queryAuthentications(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
 	} 
     
-    @ApiOperation(value = "超管修改用户信息接口[by:wangfeng]", notes = "用户id必传")
+    @ApiOperation(value = "超管修改用户信息接口（新）[by:wangfeng]", notes = "用户id必传")
     @PostMapping("/updateUserInfo")
     @SysLogger("updateUserInfo")
     @Transactional

user-service/src/main/resources/mapper/UserMapper.xml

@@ -122,7 +122,7 @@
         u.id AS userId,
         u.gmt_create AS userGmtCreate,
         u.username AS userName,
-        u.linkman AS linKman,
+        u.linkman AS linkman,
         u.email AS email,
         org.id AS orgId,
         org.gmt_create AS orgGmtCreate,
@@ -132,9 +132,9 @@
         org.address as orgAddress,
         org.parent_id as orgParent_id,
         org.sub_num as orgSub_num,
-        u.position as autPosition,
+        u.position as position,
         aut.is_reject as autIsReject,
-        aut.status as autStatus
+        u.auth_status as authStatus
         FROM sys_user u
         LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
         LEFT JOIN sys_organization org ON uorg.organization_id = org.id
@@ -143,8 +143,8 @@
         <if test="userInfo.orgName != null">
             AND org.name LIKE CONCAT('%', #{userInfo.orgName}, '%')
         </if>
-        <if test="userInfo.autStatus != null">
-            AND aut.status = #{userInfo.autStatus}
+        <if test="userInfo.authStatus != null">
+            AND u.auth_status = #{userInfo.authStatus}
         </if>
         ORDER BY u.gmt_create DESC
     </select>
@@ -238,22 +238,25 @@
         AND r.user_id= #{map.userId}
     </update>
     <update id="auditUserInfoAll" parameterType="java.util.Map">
-        UPDATE sys_user_authentication
+        UPDATE sys_user_authentication a, sys_user u 
         <trim prefix="set" suffixOverrides=",">
-            <if test="auditMap.gmtModified !=null">gmt_modified=#{auditMap.gmtModified},</if>
-            <if test="auditMap.modifier != null">modifier=#{auditMap.modifier},</if>
-            <if test="auditMap.isReject != null">is_reject = #{auditMap.isReject} ,</if>
-            <if test="auditMap.certificationDate != null">certification_date = #{auditMap.certificationDate},</if>
-            <if test="auditMap.rejectType != null">reject_type =#{auditMap.rejectType},</if>
-            <if test="auditMap.rejectComment != null">reject_comment= #{auditMap.rejectComment},
-            </if>
-            <if test="auditMap.status != null">STATUS= #{auditMap.status}</if>
+            <if test="auditMap.gmtModified !=null">a.gmt_modified=#{auditMap.gmtModified},</if>
+            <if test="auditMap.modifier != null">a.modifier=#{auditMap.modifier},</if>
+            <if test="auditMap.isReject != null">a.is_reject = #{auditMap.isReject} ,</if>
+            <if test="auditMap.certificationDate != null">a.certification_date = #{auditMap.certificationDate},</if>
+            <if test="auditMap.rejectType != null">a.reject_type =#{auditMap.rejectType},</if>
+            <if test="auditMap.rejectComment != null">a.reject_comment= #{auditMap.rejectComment},</if>
+            <if test="auditMap.status != null">a.STATUS= #{auditMap.status}</if>
+            <if test="auditMap.authStatus != null">u.auth_status = #{auditMap.authStatus}</if>
+            <if test="auditMap.passauthTime != null">u.passauth_time = #{auditMap.passauthTime},</if>
+            <if test="auditMap.gmtModified !=null">u.gmt_modified=#{auditMap.gmtModified},</if>
+            <if test="auditMap.modifier != null">u.modifier=#{auditMap.modifier},</if>
         </trim>
         WHERE
         is_deleted = "N"
-        AND user_id = #{auditMap.userId}
-        AND order_num = #{auditMap.orderNum}
-
+        AND a.user_id = #{auditMap.userId}
+        AND a.order_num = #{auditMap.orderNum}
+        AND u.id = #{auditMap.userId}
     </update>
 
     <select id="dependentuserInfoByTime" parameterType="java.util.Map"
@@ -262,9 +265,9 @@
         SELECT
         u.id AS userId,
         u.gmt_create AS userGmtCreate,
-        u.gmt_modified AS userGmtModified,
+        u.passauth_time AS passauthTime,
         u.username AS userName,
-        u.linkman AS linKman,
+        u.linkman AS linkman,
         u.email AS email,
         org.id AS orgId,
         org.gmt_create AS orgGmtCreate,
@@ -274,13 +277,11 @@
         org.address as orgAddress,
         org.parent_id as orgParent_id,
         org.sub_num as orgSub_num,
-        u.position as autPosition,
-        aut.is_reject as autIsReject,
-        aut.status as autStatus
+        u.position as position,
+        u.auth_status as authStatus
         FROM sys_user u
         LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
         LEFT JOIN sys_organization org ON uorg.organization_id = org.id
-        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
         WHERE
         u.is_deleted = 'N'
         AND u.TYPE = "0"
@@ -290,8 +291,8 @@
         <if test="userExport.userName != null">
             AND u.username LIKE CONCAT('%', #{userExport.userName}, '%')
         </if>
-        <if test="userExport.autStatus != null">
-            AND aut.status = #{userExport.autStatus}
+        <if test="userExport.authStatus != null">
+            AND u.auth_status = #{userExport.authStatus}
         </if>
         <if test="userExport.startTime != null and userExport.endTime != null">
             AND u.gmt_create BETWEEN #{userExport.startTime} and #{userExport.endTime}
@@ -303,21 +304,20 @@
         u.id AS userId,
         u.gmt_create AS userGmtCreate,
         u.username AS userName,
-        u.linkman AS linKman,
+        u.linkman AS linkman,
         u.email AS email,
         org.id AS orgId,
         org.name AS orgName,
-        aut.status AS autStatus
+        u.auth_status AS authStatus
         FROM sys_user u
         LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
         LEFT JOIN sys_organization org ON uorg.organization_id = org.id
-        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
         WHERE u.is_deleted = 'N' AND u.TYPE = 0
         <if test="userInformation.userName != null">
             AND u.username LIKE CONCAT('%', #{userInformation.userName}, '%')
         </if>
-        <if test="userInformation.autStatus != null">
-            AND aut.status = #{userInformation.autStatus}
+        <if test="userInformation.authStatus != null">
+            AND u.auth_status = #{userInformation.authStatus}
         </if>
          <if test="userInformation.startTime != null and userInformation.endTime != null">
             AND u.gmt_create BETWEEN #{userInformation.startTime} and #{userInformation.endTime}
@@ -328,7 +328,7 @@
    <!-- <select id="queryMechanismInformation(jiude)" resultType="com.diagbot.dto.OrganizationDTO">
     SELECT
         u.id AS userId,
-        u.linkman AS linKman,
+        u.linkman AS linkman,
         org.id AS orgId,
         org.gmt_create AS orgGmtCreate,
         org.name AS orgName,
@@ -345,8 +345,8 @@
         <if test="mechanism.orgName != null">
             AND org.name LIKE CONCAT('%', #{mechanism.orgName}, '%')
         </if>
-        <if test="mechanism.autStatus != null">
-            AND aut.status = #{mechanism.autStatus}
+        <if test="mechanism.authStatus != null">
+            AND u.auth_status = #{mechanism.authStatus}
         </if>
          <if test="mechanism.startTime != null and mechanism.endTime != null">
             AND u.gmt_create BETWEEN #{mechanism.startTime} and #{mechanism.endTime}
@@ -363,20 +363,19 @@
         org.type AS orgType,
         org.address AS orgAddress,
         u.linkman AS linkman,
-        aut.status AS autStatus,
-        org.parent_id AS orgParent_id,
-        org.sub_num AS orgSub_num
+        u.auth_status AS authStatus,
+        org.parent_id AS orgParentId,
+        org.sub_num AS orgSubNum
         FROM 
         sys_organization org 
         LEFT JOIN  sys_user_organization uorg  ON org.id = uorg.organization_id
         LEFT JOIN sys_user u ON uorg.user_id = u.id
-        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
         WHERE org.is_deleted = 'N' 
         <if test="mechanism.orgName != null">
             AND org.name LIKE CONCAT('%', #{mechanism.orgName}, '%')
         </if>
-        <if test="mechanism.autStatus != null">
-            AND aut.status = #{mechanism.autStatus}
+        <if test="mechanism.authStatus != null">
+            AND u.auth_status = #{mechanism.authStatus}
         </if>
          <if test="mechanism.startTime != null and mechanism.endTime != null">
             AND org.gmt_create BETWEEN #{mechanism.startTime} and #{mechanism.endTime}
@@ -389,7 +388,7 @@
         u.id AS userId,
         u.gmt_create AS userGmtCreate,
         u.username AS userName,
-        u.linkman AS linKman,
+        u.linkman AS linkman,
         u.email AS email,
         org.id AS orgId,
         org.gmt_create AS orgGmtCreate,
@@ -398,14 +397,13 @@
         org.principal AS orgPrincipal,
         org.address AS orgAddress,
         org.parent_id AS orgParent_id,
-        org.sub_num AS orgSub_num,
-        aut.certification_date AS certificationDate,
-        u.position AS autPosition,
-        aut.status AS autStatus
+        org.sub_num AS orgSubNum,
+        u.passauth_time AS passauthTime,
+        u.position AS position,
+        u.auth_status AS authStatus
         FROM sys_user u
         LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
         LEFT JOIN sys_organization org ON uorg.organization_id = org.id
-        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
         WHERE u.is_deleted = 'N' AND u.TYPE = 0
         <if test="userOrg.orgName != null">
             AND org.name LIKE CONCAT('%', #{userOrg.orgName}, '%')
@@ -416,73 +414,80 @@
          <if test="userOrg.startTime != null and userOrg.endTime != null">
             AND u.gmt_create BETWEEN #{userOrg.startTime} and #{userOrg.endTime}
         </if>
-        AND aut.status = 1
+        AND u.auth_status = 1
         ORDER BY u.gmt_create DESC
     </select>
     <select id="queryAuthentication" resultType="com.diagbot.dto.AuthenticationDTO">
-    SELECT
-        u.id AS userId,
-        u.gmt_create AS userGmtCreate,
-        u.username AS userName,
-        u.linkman AS linKman,
-        u.email AS email,
-        org.id AS orgId,
-        org.gmt_create AS orgGmtCreate,
-        org.name AS orgName,
-        org.type AS orgType,
-        org.principal AS orgPrincipal,
-        org.address AS orgAddress,
-        org.parent_id AS orgParent_id,
-        org.sub_num AS orgSub_num,
-        u.position AS autPosition,
-        aut.status AS autStatus
-        FROM sys_user u
-        LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
-        LEFT JOIN sys_organization org ON uorg.organization_id = org.id
-        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
-        WHERE u.is_deleted = 'N' AND u.TYPE = 0
-        <if test="authen.orgName != null">
-            AND org.name LIKE CONCAT('%', #{authen.orgName}, '%')
-        </if>
-        <if test="authen.userName != null">
-            AND u.username LIKE CONCAT('%', #{authen.userName}, '%')
-        </if>
-        <if test="authen.startTime != null and authen.endTime != null">
-            AND u.gmt_create BETWEEN #{authen.startTime} and #{authen.endTime}
-        </if>
-        AND aut.status = 2
-        ORDER BY u.gmt_create DESC
+	SELECT
+	u.id AS userId,
+	aut.gmt_create AS autGmtCreate,
+	u.username AS userName,
+	u.linkman AS linkman,
+	u.email AS email,
+	org.id AS orgId,
+	org.gmt_create AS orgGmtCreate,
+	org.name AS orgName,
+	org.type AS orgType,
+	org.principal AS orgPrincipal,
+	org.address AS orgAddress,
+	org.parent_id AS orgParentId,
+	org.sub_num AS orgSubNum,
+	u.position AS position,
+	u.auth_status AS authStatus,
+	aut.order_num AS orderNum,
+	aut.status AS status
+	FROM sys_user_authentication aut
+	JOIN sys_user u ON u.id = aut.user_id
+	JOIN sys_user_organization uorg ON u.id = uorg.user_id
+	JOIN sys_organization org ON uorg.organization_id = org.id
+	WHERE u.is_deleted = 'N' AND aut.is_deleted = 'N' AND u.TYPE = 0 AND
+	aut.status = 0
+	<if test="authen.orgName != null">
+		AND org.name LIKE CONCAT('%', #{authen.orgName}, '%')
+	</if>
+	<if test="authen.userName != null">
+		AND u.username LIKE CONCAT('%', #{authen.userName}, '%')
+	</if>
+	<if test="authen.startTime != null and authen.endTime != null">
+		AND aut.gmt_create BETWEEN #{authen.startTime} and #{authen.endTime}
+	</if>
+
+	ORDER BY aut.gmt_create DESC
+	<!-- SELECT u.id AS userId, u.gmt_create AS userGmtCreate, u.username AS 
+		userName, u.linkman AS linKman, u.email AS email, org.id AS orgId, org.gmt_create 
+		AS orgGmtCreate, org.name AS orgName, org.type AS orgType, org.principal 
+		AS orgPrincipal, org.address AS orgAddress, org.parent_id AS orgParent_id, 
+		org.sub_num AS orgSub_num, u.position AS autPosition, u.auth_status AS authStatus 
+		FROM sys_user u LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id 
+		LEFT JOIN sys_organization org ON uorg.organization_id = org.id WHERE u.is_deleted 
+		= 'N' AND u.TYPE = 0 <if test="authen.orgName != null"> AND org.name LIKE 
+		CONCAT('%', #{authen.orgName}, '%') </if> <if test="authen.userName != null"> 
+		AND u.username LIKE CONCAT('%', #{authen.userName}, '%') </if> <if test="authen.startTime 
+		!= null and authen.endTime != null"> AND u.gmt_create BETWEEN #{authen.startTime} 
+		and #{authen.endTime} </if> AND u.auth_status = 2 ORDER BY u.gmt_create DESC -->
     </select>
 	<update id="updateUserInfo" parameterType="java.util.Map">
 	UPDATE
 	sys_user a
-	JOIN sys_user_authentication b ON a.id = b.user_id
 	<trim prefix="set" suffixOverrides=",">
-		<if test="amendUserInfo.linKman != null">
-			a.linkman = #{amendUserInfo.linKman},
+		<if test="amendUserInfo.linkman != null">
+			a.linkman = #{amendUserInfo.linkman},
 		</if>
 		<if test="amendUserInfo.email != null">
 			a.email = #{amendUserInfo.email},
 		</if>
-		<if test="amendUserInfo.autPosition != null">
-			b.position = #{amendUserInfo.autPosition},
+		<if test="amendUserInfo.position != null">
+			a.position = #{amendUserInfo.position},
 		</if>
 		<if test="amendUserInfo.gmtModified != null">
 			a.gmt_modified =#{amendUserInfo.gmtModified},
 		</if>
-		<if test="amendUserInfo.gmtModified != null">
-			b.gmt_modified = #{amendUserInfo.gmtModified},
-		</if>
 		<if test="amendUserInfo.modifier != null">
 			a.modifier = #{amendUserInfo.modifier},
 		</if>
-		<if test="amendUserInfo.modifier != null">
-			b.modifier = #{amendUserInfo.modifier}
-		</if>
 	</trim>
 	WHERE
 	a.is_deleted = "N"
-	AND b.is_deleted = "N"
 	AND a.id = #{amendUserInfo.userId}
     </update>
 	<update id="updateOrganizations" parameterType="java.util.Map">
@@ -494,8 +499,8 @@
 			<if test="amendOrg.type != null">
 				a.type = #{amendOrg.type},
 			</if>
-			<if test="amendOrg.subMum != null">
-				a.sub_num = #{amendOrg.subMum},
+			<if test="amendOrg.orgSubNum != null">
+				a.sub_num = #{amendOrg.orgSubNum},
 			</if>
 			<if test="amendOrg.gmtModified != null">
 				a.gmt_modified =#{amendOrg.gmtModified},
@@ -515,7 +520,7 @@
         u.gmt_create AS userGmtCreate,
         u.gmt_modified AS userGmtModified,
         u.username AS userName,
-        u.linkman AS linKman,
+        u.linkman AS linkman,
         u.email AS email,
         org.id AS orgId,
         org.gmt_create AS orgGmtCreate,
@@ -523,11 +528,11 @@
         org.type AS orgType,
         org.principal AS orgPrincipal,
         org.address AS orgAddress,
-        org.parent_id AS orgParent_id,
-        org.sub_num AS orgSub_num,
-        u.position AS autPosition,
+        org.parent_id AS orgParentId,
+        org.sub_num AS orgSubNum,
+        u.position AS position,
         aut.is_reject AS autIsReject,
-        aut.status AS autStatus
+        u.auth_status AS authStatus
         FROM 
         sys_organization org 
         LEFT JOIN  sys_user_organization uorg  ON org.id = uorg.organization_id
@@ -542,4 +547,41 @@
         </if>
         ORDER BY org.gmt_create DESC 
 	</select>
+	<select id="exportKema"  resultType="com.diagbot.dto.AuthenticationDTO">
+	SELECT
+	u.id AS userId,
+	aut.gmt_create AS autGmtCreate,
+	u.username AS userName,
+	u.linkman AS linkman,
+	u.email AS email,
+	org.id AS orgId,
+	org.gmt_create AS orgGmtCreate,
+	org.name AS orgName,
+	org.type AS orgType,
+	org.principal AS orgPrincipal,
+	org.address AS orgAddress,
+	org.parent_id AS orgParentId,
+	org.sub_num AS orgSubNum,
+	u.position AS position,
+	u.auth_status AS authStatus,
+	aut.order_num AS orderNum,
+	aut.status AS status
+	FROM sys_user_authentication aut
+	JOIN sys_user u ON u.id = aut.user_id
+	JOIN sys_user_organization uorg ON u.id = uorg.user_id
+	JOIN sys_organization org ON uorg.organization_id = org.id
+	WHERE u.is_deleted = 'N' AND aut.is_deleted = 'N' AND u.TYPE = 0 AND
+	aut.status = 0
+	<if test="exportKema.orgName != null">
+		AND org.name LIKE CONCAT('%', #{exportKema.orgName}, '%')
+	</if>
+	<if test="exportKema.userName != null">
+		AND u.username LIKE CONCAT('%', #{exportKema.userName}, '%')
+	</if>
+	<if test="exportKema.startTime != null and exportKema.endTime != null">
+		AND aut.gmt_create BETWEEN #{exportKema.startTime} and #{exportKema.endTime}
+	</if>
+
+	ORDER BY aut.gmt_create DESC
+	</select>
 </mapper>