Revert "1.分页查询机构机构信息的sql修改 2.导出机构信息的修改"

This reverts commit aafb1f44652ece281895153d1e58777099b71726.

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

@@ -15,16 +15,15 @@ import lombok.Setter;
 @Setter
 public class OrganizationDTO {
 	
+	 private Long userId;//用户ID
+	 private String linkman;//联系人
 	 private Long orgId;//机构ID
 	 private Date orgGmtCreate;//记录创建时间
 	 private String orgName;//机构名称
-	 private String orgPrincipal;//负责人
 	 private Integer orgType;//机构属性
+	 private String orgPrincipal;//负责人
 	 private String orgAddress;//机构地址
-	 private String autStatus;// 状态
-	 private String linkman;//联系人
 	 private Long orgParentId;//上级机构id
 	 private Integer orgSubNum;//下属机构数量
-	 private Long userId;//用户ID
 
 }

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

@@ -1112,10 +1112,10 @@ 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("autStatus",userExportVO.getAutStatus());*/
+	        userMap.put("autStatus",userExportVO.getAutStatus());
 	        userMap.put("orgName",userExportVO.getOrgName());
-	        /*userMap.put("userName",userExportVO.getUserName());*/
-	        List<UserInfoDTO> datas = exportOrganizations(userMap);
+	        userMap.put("userName",userExportVO.getUserName());
+	        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
 	        GsonUtil.toJson(datas);
 	        List<String> listName = new ArrayList<>();
 
@@ -1152,7 +1152,7 @@ public class UserFacade extends UserServiceImpl {
 	        }
 	        response.setContentType("text/html;charset=UTF-8");
 	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-	        ex.exportExcelNew("机构信息详情", listName, listId, list,response);
+	        ex.exportExcelNew("用户信息详情", listName, listId, list,response);
 		
 	}
 
@@ -1251,9 +1251,14 @@ public class UserFacade extends UserServiceImpl {
 	                    userInfo.getEmail(),
 	                    AuthStatusEnum.getName(userInfo.getAutStatus())));
 	        }
+	        //response.setContentType("text/html;charset=UTF-8");
+	/*        String filePath = userExportVO.getFilePath();//文件路径
+	        String fileName = userExportVO.getFileName();//文件名
+	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+	        RespDTO resul = ex.exportExcel("测试POI导出EXCEL文档", listName, listId, list, filePath, fileName);*/
 	        response.setContentType("text/html;charset=UTF-8");
 	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-	        ex.exportExcelNew("已认证用户信息", listName, listId, list,response);
+	        ex.exportExcelNew("用户信息详情", listName, listId, list,response);
 		
 	}
 

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

@@ -78,6 +78,4 @@ public interface UserMapper extends BaseMapper<User> {
     
     public boolean updateOrganizations (@Param("amendOrg") Map<String, Object> amendOrg);
 
-	public List<UserInfoDTO> exportOrganizations(@Param("exportOrg") Map<String, Object> exportOrg);
-
 }

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

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

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

@@ -140,12 +140,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		// TODO Auto-generated method stub
 		return baseMapper.updateOrganizations(amendOrg);
 	}
-
-	@Override
-	public List<UserInfoDTO> exportOrganizations(Map<String, Object> map) {
-		// TODO Auto-generated method stub
-		return baseMapper.exportOrganizations(map);
-	}
 	
 
 

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

@@ -18,7 +18,7 @@ import lombok.Setter;
 @Setter
 public class AmendOrgVO {
 
-    @NotNull(message = "请输入机构id")
+    @NotNull(message = "请输入机构id!")
 	 private Long orgId;//机构ID
 	 private Integer orgType;//机构属性
 	 private String orgAddress;//机构地址

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

@@ -17,7 +17,7 @@ import lombok.Setter;
 @Setter
 public class AmendUserInfoVO {
 	
-	@NotNull(message = "请输入用户id")
+	@NotNull(message = "请输入用户id!")
 	private Long userId;//用户ID
     private String linKman;//联系人
     private String email;// 邮箱

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

@@ -315,7 +315,7 @@
         ORDER BY u.gmt_create DESC  
     </select>
     
-   <!-- <select id="queryMechanismInformation(jiude)" resultType="com.diagbot.dto.OrganizationDTO">
+   <select id="queryMechanismInformation" resultType="com.diagbot.dto.OrganizationDTO">
     SELECT
         u.id AS userId,
         u.linkman AS linKman,
@@ -342,37 +342,7 @@
             AND u.gmt_create BETWEEN #{mechanism.startTime} and #{mechanism.endTime}
         </if>
         ORDER BY u.gmt_create DESC 
-   </select> -->
-   <select id="queryMechanismInformation" resultType="com.diagbot.dto.OrganizationDTO">
-      SELECT  
-        u.id AS userId,
-        org.id AS orgId,
-        org.gmt_create AS orgGmtCreate,
-        org.name AS orgName,
-        org.principal AS orgPrincipal,
-        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
-        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>
-         <if test="mechanism.startTime != null and mechanism.endTime != null">
-            AND org.gmt_create BETWEEN #{mechanism.startTime} and #{mechanism.endTime}
-        </if>
-        ORDER BY org.gmt_create DESC 
-   </select> 
+   </select>
     
     <select id="queryVerifiedUserOrganizationProduct" resultType="com.diagbot.dto.UserOrgizationProductDTO">
      SELECT
@@ -498,38 +468,4 @@
 		a.is_deleted = "N"
 		AND a.id = #{amendOrg.orgId}
 	</update>
-	<select id="exportOrganization" parameterType="java.util.Map"
-            resultType="com.diagbot.dto.UserInfoDTO">
-	SELECT
-        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.address AS orgAddress,
-        org.parent_id AS orgParent_id,
-        org.sub_num AS orgSub_num,
-        aut.position AS autPosition,
-        aut.is_reject AS autIsReject,
-        aut.status AS autStatus
-        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}, '%')
-        </if>
-        <if test="exportOrg.startTime != null and exportOrg.endTime != null">
-            AND org.gmt_create BETWEEN #{exportOrg.startTime} and #{exportOrg.endTime}
-        </if>
-        ORDER BY org.gmt_create DESC 
-	</select>
 </mapper>