导出时间排序修改

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

@@ -1269,7 +1269,7 @@ public class UserFacade extends UserServiceImpl {
         userMap.put("authStatus", 1);
         userMap.put("orgName", userExportVO.getOrgName());
         userMap.put("userName", userExportVO.getUserName());
-        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
+        List<UserInfoDTO> datas = exportVerified(userMap);
         GsonUtil.toJson(datas);
         List<String> listName = new ArrayList<>();
 

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

@@ -91,5 +91,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);
+	
+	public List<UserInfoDTO> exportVerified(@Param("Verified") Map<String, Object> map);
 
 }

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

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

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

@@ -159,6 +159,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		return baseMapper.exportOrganizations(map);
 	}
 	
+	@Override
+	public List<UserInfoDTO> exportVerified(Map<String, Object> map){
+		return baseMapper.exportVerified(map);
+	}
 
 
 }

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

@@ -130,7 +130,7 @@
         org.type as orgType,
         org.principal AS orgPrincipal,
         org.address as orgAddress,
-        org.parent_id as orgParent_id,
+        org.parent_id as orgParentId,
         org.sub_num as orgSub_num,
         u.position as position,
         aut.is_reject as autIsReject,
@@ -275,7 +275,7 @@
         org.type as orgType,
         org.principal AS orgPrincipal,
         org.address as orgAddress,
-        org.parent_id as orgParent_id,
+        org.parent_id as orgParentId,
         org.sub_num as orgSub_num,
         u.position as position,
         u.auth_status as authStatus
@@ -335,7 +335,7 @@
         org.type AS orgType,
         org.principal AS orgPrincipal,
         org.address AS orgAddress,
-        org.parent_id AS orgParent_id,
+        org.parent_id AS orgParentId,
         org.sub_num AS orgSub_num
         FROM sys_user u
         LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
@@ -396,7 +396,7 @@
         org.type AS orgType,
         org.principal AS orgPrincipal,
         org.address AS orgAddress,
-        org.parent_id AS orgParent_id,
+        org.parent_id AS orgParentId,
         org.sub_num AS orgSubNum,
         u.passauth_time AS passauthTime,
         u.position AS position,
@@ -461,7 +461,7 @@
 	<!-- 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, 
+		AS orgPrincipal, org.address AS orgAddress, org.parent_id AS orgParentId, 
 		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 
@@ -587,4 +587,40 @@
 
 	ORDER BY aut.gmt_create DESC
 	</select>
+	 <select id="exportVerified" resultType="com.diagbot.dto.UserInfoDTO">
+     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 orgParentId,
+        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
+        WHERE 
+		u.is_deleted = 'N' 
+		AND u.TYPE = 0
+        <if test="Verified.orgName != null">
+            AND org.name LIKE CONCAT('%', #{Verified.orgName}, '%')
+        </if>
+        <if test="Verified.userName != null">
+            AND u.username LIKE CONCAT('%', #{Verified.userName}, '%')
+        </if>
+         <if test="Verified.startTime != null and Verified.endTime != null">
+            AND u.gmt_create BETWEEN #{Verified.startTime} and #{Verified.endTime}
+        </if>
+        AND u.auth_status = 1
+        ORDER BY u.passauth_time DESC
+    </select>
 </mapper>