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

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/LantoneProductWrapper.java

@@ -1,8 +1,10 @@
 package com.diagbot.entity.wrapper;
 
 import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.ServiceInfo;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description:
@@ -52,14 +54,14 @@ public class LantoneProductWrapper extends LantoneProduct {
     /**
      * 关联的service
      */
-    private Long[] services;
+    private List<ServiceInfo> serviceInfos;
 
-    public Long[] getServices() {
-        return services;
+    public List<ServiceInfo> getServiceInfos() {
+        return serviceInfos;
     }
 
-    public void setServices(Long[] services) {
-        this.services = services;
+    public void setServiceInfos(List<ServiceInfo> serviceInfos) {
+        this.serviceInfos = serviceInfos;
     }
 
     public String getServiceIds() {

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

@@ -10,6 +10,7 @@ import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
+import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.enums.AccessTypeEnum;
@@ -46,6 +47,8 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
     private UserServiceClient userServiceClient;
     @Autowired
     private OrderDetailsFacade orderDetailsFacade;
+    @Autowired
+    private ServiceInfoFacade serviceInfoFacade;
 
     /**
      * 产品线管理添加产品
@@ -142,11 +145,13 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
             product.setChargeTypeArray(chargeTypeArray);
 
             String[] serviceIds = product.getServiceIds().split(",|，");
-            Long[] services = new Long[serviceIds.length];
+            Long[] lserviceIds = new Long[serviceIds.length];
             for (int i = 0; i < serviceIds.length; i++) {
-                services[i] = Long.parseLong(serviceIds[i]);
+                lserviceIds[i] = Long.parseLong(serviceIds[i]);
             }
-            product.setServices(services);
+
+            List<ServiceInfo> services = serviceInfoFacade.getServiceListNoRelation(lserviceIds);
+            product.setServiceInfos(services);
         }
         return list;
     }

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

@@ -92,7 +92,7 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         	i.setServiceStatusMsg(StatusEnum.getName(i.getServiceStatus()));
         	
         	if(StringUtil.isBlank(i.getAppKeyId())){
-        		i.setIsUsed("N");
+        		i.setIsUsed("Y");
         	}else{
         		expirTime = DateUtil.parseDateTime(i.getExpiringDate());
         		if(expirTime.getTime()<now.getTime()

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

@@ -38,6 +38,7 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         QueryWrapper<ServiceInfo> qw = new QueryWrapper<>();
         qw.eq("name", serviceSaveVO.getName()).
+                eq("user_id", userId).
                 eq("is_deleted", IsDeleteEnum.N.getKey());
         ServiceInfo serviceInfo = this.getOne(qw);
         if (serviceInfo != null) {
@@ -117,6 +118,22 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         return list;
     }
 
+    /**
+     * 获取当前登录用户未关联服务列表
+     * @param ids
+     * @return
+     */
+    public List<ServiceInfo> getServiceListNoRelation(Long[] ids) {
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        QueryWrapper<ServiceInfo> qw = new QueryWrapper<>();
+        qw.eq("user_id", userId).
+                eq("type", ServiceTypeEnum.User_Create.getKey()).
+                eq("is_deleted", "N").
+                notIn("id", ids);
+        List<ServiceInfo> list = this.list(qw);
+        return list;
+    }
+
     /**
      * 获取当前登录用户服务分页列表
      *

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

@@ -0,0 +1,42 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年10月11日 下午4:59:18
+ */
+@Setter
+@Getter
+public class ExportKemaDTO {
+	  private static final long serialVersionUID = 1L;
+	    private String userId;//用户ID
+	    private String userGmtCreate;//记录创建时间
+	    private String linKman;//联系人
+	    private String orgName;//机构名称
+	    private String autPosition;//岗位信息
+	    private String userName;// 用户名
+	    private String email;// 邮箱
+	    private String autStatus;//认证状态
+	   
+	    public ExportKemaDTO(String userId, String userGmtCreate,String linKman, String orgName, String autPosition,String userName,  String email, 
+	                             String autStatus) {
+	        this.userId = userId;
+	        this.userGmtCreate = userGmtCreate;
+	        this.linKman = linKman;
+	        this.orgName = orgName;
+	        this.autPosition = autPosition;
+	        this.userName = userName;
+	        this.email = email;
+	        this.autStatus = autStatus;
+	    }
+
+	    public ExportKemaDTO() {
+
+	    }
+
+
+}

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

@@ -0,0 +1,40 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 导出机构信息
+ * 
+ * @date 2018年10月11日 下午4:37:40
+ */
+@Setter
+@Getter
+public class ExportOrganizationDTO {
+	private static final long serialVersionUID = 1L;
+	private String orgId;// 机构ID
+	private String orgGmtCreate;// 记录创建时间
+	private String orgName;// 机构名称
+	private String orgPrincipal;// 负责人
+	private String orgType;// 机构属性
+	private String orgAddress;// 机构地址
+	private String userName;// 用户名
+
+	public ExportOrganizationDTO(String orgId, String orgGmtCreate,String orgName,String orgPrincipal,
+			String orgType,String orgAddress, String userName) {
+	        this.orgId = orgId;
+	        this.orgGmtCreate = orgGmtCreate;
+	        this.orgName = orgName;
+	        this.orgPrincipal = orgPrincipal;
+	        this.orgType = orgType;
+	        this.orgAddress = orgAddress;
+	        this.userName = userName;
+	}
+
+	public ExportOrganizationDTO() {
+
+	}
+
+}

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

@@ -0,0 +1,41 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 导出注册用户信息
+ * @date 2018年10月11日 下午4:24:04
+ */
+
+@Setter
+@Getter
+public class ExportUserInfoDTO {
+	 private static final long serialVersionUID = 1L;
+	    private String userId;//用户ID
+	    private String userGmtCreate;//记录创建时间
+	    private String linKman;//联系人
+	    private String autStatus;//认证状态
+	    private String userName;// 用户名
+	    private String email;// 邮箱
+	    private String orgName;//机构名称
+
+	    
+	    public ExportUserInfoDTO(String userId, String userGmtCreate, String linKman,String autStatus,String userName,  String email, 
+	                             String orgName) {
+	        this.userId = userId;
+	        this.userGmtCreate = userGmtCreate;
+	        this.linKman = linKman;
+	        this.autStatus = autStatus;
+	        this.userName = userName;
+	        this.email = email;
+	        this.orgName = orgName;
+	        
+	    }
+
+	    public ExportUserInfoDTO() {
+
+	    }
+}

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

@@ -0,0 +1,41 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年10月11日 下午4:59:23
+ */
+@Setter
+@Getter
+public class ExportVerifiedDTO {
+	  private static final long serialVersionUID = 1L;
+	    private String userId;//用户ID
+	    private String userGmtCreate;//记录创建时间
+	    private String userGmtModified;
+	    private String linKman;//联系人
+	    private String orgName;//机构名称
+	    private String autPosition;//岗位信息
+	    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) {
+	        this.userId = userId;
+	        this.userGmtCreate = userGmtCreate;
+	        this.userGmtModified = userGmtModified;
+	        this.linKman = linKman;
+	        this.orgName = orgName;
+	        this.autPosition = autPosition;
+	        this.userName = userName;
+	        this.email = email;
+	        this.autStatus = autStatus;
+	    }
+
+	    public ExportVerifiedDTO() {
+
+	    }
+
+}

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

@@ -29,6 +29,7 @@ public class UserInfoDTO implements Serializable {
     private Long userId;//用户ID
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date userGmtCreate;//记录创建时间
+    private Date userGmtModified;//认证时间
     private String userName;// 用户名
     private String linKman;//联系人
     private String email;// 邮箱

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

@@ -7,6 +7,10 @@ import com.diagbot.client.AuthServiceClient;
 import com.diagbot.client.DiagbotmanClient;
 import com.diagbot.dto.AuthenticationDTO;
 import com.diagbot.dto.CustomerDTO;
+import com.diagbot.dto.ExportKemaDTO;
+import com.diagbot.dto.ExportOrganizationDTO;
+import com.diagbot.dto.ExportUserInfoDTO;
+import com.diagbot.dto.ExportVerifiedDTO;
 import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.JwtDTO;
 import com.diagbot.dto.LoginDTO;
@@ -911,10 +915,19 @@ public class UserFacade extends UserServiceImpl {
      */
     public RespDTO<IPage<UserAllDTO>> queryUserInformations(Page page, String orgName, Integer autStatus,String startTime,String endTime){
     	CustomerDTO userInfo = new CustomerDTO();
-        userInfo.setOrgName(orgName);
-        userInfo.setAutStatus(autStatus);
-        userInfo.setStartTime(startTime);
-        userInfo.setEndTime(endTime);
+    	if(orgName != null && orgName.length() != 0){
+    		userInfo.setOrgName(orgName);
+    	}
+        if(!autStatus.equals("")){
+            userInfo.setAutStatus(autStatus);
+        }
+        if(startTime != null && startTime.length() != 0){
+    	   userInfo.setStartTime(startTime);
+        }
+        if(endTime != null && endTime.length() != 0){
+        	userInfo.setEndTime(endTime);
+        }
+        
     	return RespDTO.onSuc(queryUserInformation(page, userInfo));
     }
     /**
@@ -925,9 +938,15 @@ public class UserFacade extends UserServiceImpl {
      */
     public RespDTO<IPage<OrganizationDTO>> queryMechanismInformations(Page page, String orgName,String startTime,String endTime){
     	CustomerDTO userInfo = new CustomerDTO();
-        userInfo.setOrgName(orgName);
-        userInfo.setStartTime(startTime);
-        userInfo.setEndTime(endTime);
+    	if(orgName != null && orgName.length() != 0){
+    		userInfo.setOrgName(orgName);
+    	}
+        if(startTime != null && startTime.length() != 0){
+    	   userInfo.setStartTime(startTime);
+        }
+        if(endTime != null && endTime.length() != 0){
+        	userInfo.setEndTime(endTime);
+        }
     	return RespDTO.onSuc(queryMechanismInformation(page, userInfo));
     }
     /**
@@ -939,10 +958,18 @@ public class UserFacade extends UserServiceImpl {
      */
     public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProducts(Page page,String orgName,String userName,String startTime,String endTime) {
     	CustomerDTO userInfo = new CustomerDTO();
-        userInfo.setOrgName(orgName);
-        userInfo.setUserName(userName);
-        userInfo.setStartTime(startTime);
-        userInfo.setEndTime(endTime);
+    	if(userName != null && userName.length() != 0){
+    		userInfo.setUserName(userName);
+    	}
+        if(orgName != null && orgName.length() != 0){
+    		userInfo.setOrgName(orgName);
+    	}
+        if(startTime != null && startTime.length() != 0){
+    	   userInfo.setStartTime(startTime);
+        }
+        if(endTime != null && endTime.length() != 0){
+        	userInfo.setEndTime(endTime);
+        }
 
         IPage<UserOrgizationProductDTO> user = queryVerifiedUserOrganizationProduct(page, userInfo);
         List<UserOrgizationProductDTO> userData = user.getRecords();
@@ -951,6 +978,9 @@ public class UserFacade extends UserServiceImpl {
             Long userInfoId = userInfoDTO.getUserId();
             userIds.add(userInfoId);
         }
+        if(userIds.size()>0){
+        	
+        
         RespDTO<List<UserAndProdutUDTO>> InformationData = diagbotmanService.getInformationAvailableAll(userIds);
 
         if (InformationData == null || !"0".equals(InformationData.code)) {
@@ -969,7 +999,7 @@ public class UserFacade extends UserServiceImpl {
                 }
             }
         }
-
+        }
         System.out.println("====================" + GsonUtil.toJson(userData));
         user.setRecords(userData);
         return RespDTO.onSuc(user);
@@ -983,12 +1013,228 @@ public class UserFacade extends UserServiceImpl {
      */
     public RespDTO<IPage<AuthenticationDTO>> queryAuthentications(Page page,String orgName,String userName,String startTime,String endTime) {
     	CustomerDTO userInfo = new CustomerDTO();
-        userInfo.setOrgName(orgName);
-        userInfo.setUserName(userName);
-        userInfo.setStartTime(startTime);
-        userInfo.setEndTime(endTime);
+    	if(userName != null && userName.length() != 0){
+    		userInfo.setUserName(userName);
+    	}
+        if(orgName != null && orgName.length() != 0){
+    		userInfo.setOrgName(orgName);
+    	}
+        if(startTime != null && startTime.length() != 0){
+    	   userInfo.setStartTime(startTime);
+        }
+        if(endTime != null && endTime.length() != 0){
+        	userInfo.setEndTime(endTime);
+        }
 		return RespDTO.onSuc(queryAuthentication(page, userInfo));
 	}
+
+/**
+ * 用户信息
+ * @param userExportVO
+ * @param response
+ */
+	public void exportUserInfo(UserExportVO userExportVO, HttpServletResponse response) {
+		  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("orgName",userExportVO.getOrgName());
+	        userMap.put("userName",userExportVO.getUserName());
+	        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
+	        GsonUtil.toJson(datas);
+	        List<String> listName = new ArrayList<>();
+
+	        listName.add("用户id");
+	        listName.add("创建时间");
+	        listName.add("联系人");
+	        listName.add("认证状态");
+	        listName.add("用户名");
+	        listName.add("邮箱");
+	        listName.add("机构名称");
+
+
+	        List<String> listId = new ArrayList<>();
+	        listId.add("userId");//用户ID
+	        listId.add("userGmtCreate");//记录创建时间
+	        listId.add("linKman");//联系人
+	        listId.add("autStatus");//认证状态
+	        listId.add("userName");// 用户名
+	        listId.add("email");// 邮箱
+	        listId.add("orgName");//机构名称
+
+
+	        List<ExportUserInfoDTO> list = new ArrayList<>();
+	        for (int i = 0; i < datas.size(); i++) {
+	            UserInfoDTO userInfo = datas.get(i);
+	            list.add(new ExportUserInfoDTO(String.valueOf(userInfo.getUserId()),
+	                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
+	                    userInfo.getLinKman(),
+	                    AuthStatusEnum.getName(userInfo.getAutStatus()),
+	                    userInfo.getUserName(),
+	                    userInfo.getEmail(),
+	                    userInfo.getOrgName()));
+
+	        }
+	        response.setContentType("text/html;charset=UTF-8");
+	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+	        ex.exportExcelNew("注册用户信息", listName, listId, list,response);
+		
+	}
+
+    //导出机构信息数据
+	public void exportOrganization(UserExportVO userExportVO, HttpServletResponse response) {
+		  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("orgName",userExportVO.getOrgName());
+	        userMap.put("userName",userExportVO.getUserName());
+	        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
+	        GsonUtil.toJson(datas);
+	        List<String> listName = new ArrayList<>();
+
+
+	        listName.add("机构ID");
+	        listName.add("注册时间");
+	        listName.add("注册机构");
+	        listName.add("机构负责人");
+	        listName.add("机构属性");
+	        listName.add("机构地址");
+	        listName.add("超管名称");
+
+	        List<String> listId = new ArrayList<>();
+	        
+	        listId.add("orgId");//机构ID
+	        listId.add("orgGmtCreate");//记录创建时间
+	        listId.add("orgName");//机构名称
+	        listId.add("orgPrincipal");//负责人
+	        listId.add("orgType");//机构属性
+	        listId.add("orgAddress");//机构地址
+	        listId.add("userName");// 用户名
+
+	        List<ExportOrganizationDTO> list = new ArrayList<>();
+	        for (int i = 0; i < datas.size(); i++) {
+	            UserInfoDTO userInfo = datas.get(i);
+	            list.add(new ExportOrganizationDTO(
+	                    String.valueOf(userInfo.getOrgId()),
+	                    DateUtil.formatDate(userInfo.getOrgGmtCreate()),
+	                    userInfo.getOrgName(),
+	                    userInfo.getOrgPrincipal(),
+	                    OrganizationTypeEnum.getName(userInfo.getOrgType()),
+	                    userInfo.getOrgAddress(),
+	                    userInfo.getUserName()));
+	        }
+	        response.setContentType("text/html;charset=UTF-8");
+	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+	        ex.exportExcelNew("用户信息详情", listName, listId, list,response);
+		
+	}
+
+    //导出认证中数据
+	public void exportKema(UserExportVO userExportVO, HttpServletResponse response) {
+		  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("orgName",userExportVO.getOrgName());
+	        userMap.put("userName",userExportVO.getUserName());
+	        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
+	        GsonUtil.toJson(datas);
+	        List<String> listName = new ArrayList<>();
+
+	        listName.add("编号");
+	        listName.add("创建时间");
+	        listName.add("超管理名称");
+	        listName.add("所在机构");
+	        listName.add("岗位名称");
+	        listName.add("手机号");
+	        listName.add("邮箱");
+	        listName.add("认证状态");
+
+	        List<String> listId = new ArrayList<>();
+	        listId.add("userId");//用户ID
+	        listId.add("userGmtCreate");//记录创建时间
+	        listId.add("linKman");//联系人
+	        listId.add("orgName");//机构名称 
+	        listId.add("autPosition");//岗位信息
+	        listId.add("userName");// 用户名
+	        listId.add("email");// 邮箱
+	        listId.add("autStatus");//认证状态
+
+	        List<ExportKemaDTO> list = new ArrayList<>();
+	        for (int i = 0; i < datas.size(); i++) {
+	            UserInfoDTO userInfo = datas.get(i);
+	            list.add(new ExportKemaDTO(String.valueOf(userInfo.getUserId()),
+	                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
+	                    userInfo.getLinKman(),
+	                    userInfo.getOrgName(),
+	                    userInfo.getAutPosition(),
+	                    userInfo.getUserName(),
+	                    userInfo.getEmail(),
+	                    AuthStatusEnum.getName(userInfo.getAutStatus())));
+	        }
+
+	        response.setContentType("text/html;charset=UTF-8");
+	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+	        ex.exportExcelNew("认证用户信息详情", listName, listId, list,response);
+	}
+
+    //导出已认证数据
+	public void exportVerified(UserExportVO userExportVO, HttpServletResponse response) {
+		  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("orgName",userExportVO.getOrgName());
+	        userMap.put("userName",userExportVO.getUserName());
+	        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
+	        GsonUtil.toJson(datas);
+	        List<String> listName = new ArrayList<>();
+
+	        listName.add("编号");
+	        listName.add("注册时间");
+	        listName.add("审核通过时间");
+	        listName.add("超管理名称");
+	        listName.add("所在机构");
+	        listName.add("岗位名称");
+	        listName.add("手机号");
+	        listName.add("邮箱");
+	        listName.add("状态");
+
+	        List<String> listId = new ArrayList<>();
+	        listId.add("userId");//用户ID
+	        listId.add("userGmtCreate");//记录创建时间
+	        listId.add("userGmtModified");
+	        listId.add("linKman");//联系人
+	        listId.add("orgName");//机构名称
+	        listId.add("autPosition");//岗位信息
+	        listId.add("userName");// 用户名
+	        listId.add("email");// 邮箱
+	        listId.add("autStatus");//认证状态
+
+	        List<ExportVerifiedDTO> list = new ArrayList<>();
+	        for (int i = 0; i < datas.size(); i++) {
+	            UserInfoDTO userInfo = datas.get(i);
+	            list.add(new ExportVerifiedDTO(String.valueOf(userInfo.getUserId()),
+	                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
+	                    DateUtil.formatDate(userInfo.getUserGmtModified()),
+	                    userInfo.getLinKman(),
+	                    userInfo.getOrgName(),
+	                    userInfo.getOrgPrincipal(),
+	                    userInfo.getUserName(),
+	                    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);
+		
+	}
     
     
 }

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

@@ -133,5 +133,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		
 		return baseMapper.queryAuthentication(page, userInfo);
 	}
+	
+
 
 }

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

@@ -5,6 +5,8 @@ import com.diagbot.facade.UserFacade;
 import com.diagbot.vo.UserExportVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import springfox.documentation.annotations.ApiIgnore;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,12 +32,45 @@ public class ReportFormController {
     private UserFacade userFacade;
 
     @ApiOperation(value = "导出用户信息和机构信息:[by:wangfeng]", notes = "根据时间 导出用户信息和机构信息")
-    @PostMapping("/exportUserInfo")
-    @SysLoggerExport("exportUserInfo")
+    @PostMapping("/exportUserInfoAll")
+    @SysLoggerExport("exportUserInfoAll")
     @ResponseBody
+    @ApiIgnore
     public  void export(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
             throws Exception {
          userFacade.export(userExportVO, response);
         
     }
+    @ApiOperation(value = "导出用户信息:[by:wangfeng]", notes = "根据时间 导出用户信息")
+    @PostMapping("/exportUserInfo")
+    @ResponseBody
+    public  void exportUserInfo(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+            throws Exception {
+         userFacade.exportUserInfo(userExportVO, response);
+        
+    }
+    @ApiOperation(value = "导出机构信息:[by:wangfeng]", notes = "根据时间 导出用户信息和机构信息")
+    @PostMapping("/exportOrganization")
+    @ResponseBody
+    public  void exportOrganization(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+            throws Exception {
+         userFacade.exportOrganization(userExportVO, response);
+        
+    }
+    @ApiOperation(value = "导出认证中用户的信息:[by:wangfeng]", notes = "导出认证中用户的信息")
+    @PostMapping("/exportKema")
+    @ResponseBody
+    public  void exportKema(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+            throws Exception {
+         userFacade.exportKema(userExportVO, response);
+        
+    }
+    @ApiOperation(value = "导出已认证用户的信息:[by:wangfeng]", notes = "根据时间 导出已认证用户的信息")
+    @PostMapping("/exportVerified")
+    @ResponseBody
+    public  void exportVerified (@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+            throws Exception {
+         userFacade.exportVerified(userExportVO, response);
+        
+    }
 }

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

@@ -252,6 +252,7 @@
         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,