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

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

@@ -26,7 +26,7 @@ public class AuthenticationDTO {
 
 	    @TableId(value = "id", type = IdType.AUTO)
 	    private Long userId;//用户ID
-	    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	    private Date autGmtCreate;//记录创建时间
 	    private Date certificationDate;//认证时间
 	    private String userName;// 用户名
@@ -34,7 +34,7 @@ public class AuthenticationDTO {
 	    private String email;// 邮箱
 	    @TableId(value = "id", type = IdType.AUTO)
 	    private Long orgId;//机构ID
-	    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	    private Date orgGmtCreate;//记录创建时间
 	    private String orgName;//机构名称
 	    private Integer orgType;//机构属性

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

@@ -20,7 +20,6 @@ import lombok.Setter;
 public class UserAllDTO {
 	
 	private Long userId;//用户Id
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date userGmtCreate;//记录创建时间
 	private String userName;// 用户名
     private String linkman;//联系人

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

@@ -26,7 +26,7 @@ public class UserInfoDTO implements Serializable {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Long userId;//用户ID
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date userGmtCreate;//记录创建时间
     private Date passauthTime;//认证时间
     private String userName;// 用户名
@@ -34,7 +34,7 @@ public class UserInfoDTO implements Serializable {
     private String email;// 邮箱
     @TableId(value = "id", type = IdType.AUTO)
     private Long orgId;//机构ID
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date orgGmtCreate;//记录创建时间
     private String orgName;//机构名称
     private Integer orgType;//机构属性

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

@@ -24,7 +24,7 @@ public class UserOrgizationProductDTO {
 
 	    @TableId(value = "id", type = IdType.AUTO)
 	    private Long userId;//用户ID
-	    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	    private Date userGmtCreate;//记录创建时间
 	    private Date passauthTime;//认证时间
 	    private String userName;// 用户名
@@ -32,7 +32,7 @@ public class UserOrgizationProductDTO {
 	    private String email;// 邮箱
 	    @TableId(value = "id", type = IdType.AUTO)
 	    private Long orgId;//机构ID
-	    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	    private Date orgGmtCreate;//记录创建时间
 	    private String orgName;//机构名称
 	    private Integer orgType;//机构属性

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

@@ -702,7 +702,7 @@ public class UserFacade extends UserServiceImpl {
 
         listName.add("用户id");
         listName.add("记录创建时间");
-        listName.add("用户名");
+        listName.add("手机号");
         listName.add("联系人");
         listName.add("邮箱");
         listName.add("机构ID");
@@ -714,7 +714,7 @@ public class UserFacade extends UserServiceImpl {
         listName.add("下属机构数量");
         listName.add("岗位信息");
         listName.add("是否通过认证 ");
-        listName.add("认证状态");
+        listName.add("状态");
 
         List<String> listId = new ArrayList<>();
         listId.add("userId");//用户ID
@@ -1124,8 +1124,8 @@ public class UserFacade extends UserServiceImpl {
         listName.add("编号");
         listName.add("注册时间");
         listName.add("联系人");
-        listName.add("认证状态");
-        listName.add("用户名");
+        listName.add("状态");
+        listName.add("手机号");
         listName.add("邮箱");
         listName.add("机构名称");
 
@@ -1228,7 +1228,7 @@ public class UserFacade extends UserServiceImpl {
         listName.add("岗位名称");
         listName.add("手机号");
         listName.add("邮箱");
-        listName.add("认证状态");
+        listName.add("状态");
 
         List<String> listId = new ArrayList<>();
         listId.add("userId");//用户ID

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

@@ -520,29 +520,22 @@
 	</update>
 	<select id="exportOrganizations" parameterType="java.util.Map"
             resultType="com.diagbot.dto.UserInfoDTO">
-	SELECT
+	ELECT  
         u.id AS userId,
-        u.gmt_create AS userGmtCreate,
-        u.gmt_modified AS userGmtModified,
-        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.type AS orgType,
         org.address AS orgAddress,
+        u.linkman AS linkman,
+        u.auth_status AS authStatus,
         org.parent_id AS orgParentId,
-        org.sub_num AS orgSubNum,
-        u.position AS position,
-        aut.is_reject AS autIsReject,
-        u.auth_status AS authStatus
+        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="exportOrg.orgName != null">
             AND org.name LIKE CONCAT('%', #{exportOrg.orgName}, '%')