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

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

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

@@ -15,15 +15,16 @@ 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 Integer orgType;//机构属性
 	 private String orgPrincipal;//负责人
+	 private Integer orgType;//机构属性
 	 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

@@ -123,7 +123,8 @@ public class UserFacade extends UserServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请输入正确的手机号");
         }
 
-        verFacade.verifyImgVerification(imgVerVerVO); //保存时再次校验图形验证码，主要是为了防止跳过前端校验直接调用接口
+        //TODO 测试注释了图形验证和短信验证，后面要开启
+        //        verFacade.verifyImgVerification(imgVerVerVO); //保存时再次校验图形验证码，主要是为了防止跳过前端校验直接调用接口
 
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
@@ -1111,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 = dependentuserInfoByTime(userMap);
+	        /*userMap.put("userName",userExportVO.getUserName());*/
+	        List<UserInfoDTO> datas = exportOrganizations(userMap);
 	        GsonUtil.toJson(datas);
 	        List<String> listName = new ArrayList<>();
 
@@ -1151,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);
 		
 	}
 
@@ -1250,14 +1251,9 @@ 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,4 +78,6 @@ 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,4 +73,6 @@ 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,6 +140,12 @@ 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/resources/mapper/UserMapper.xml

@@ -315,7 +315,7 @@
         ORDER BY u.gmt_create DESC  
     </select>
     
-   <select id="queryMechanismInformation" resultType="com.diagbot.dto.OrganizationDTO">
+   <!-- <select id="queryMechanismInformation(jiude)" resultType="com.diagbot.dto.OrganizationDTO">
     SELECT
         u.id AS userId,
         u.linkman AS linKman,
@@ -342,7 +342,37 @@
             AND u.gmt_create BETWEEN #{mechanism.startTime} and #{mechanism.endTime}
         </if>
         ORDER BY u.gmt_create DESC 
-   </select>
+   </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 id="queryVerifiedUserOrganizationProduct" resultType="com.diagbot.dto.UserOrgizationProductDTO">
      SELECT
@@ -468,4 +498,38 @@
 		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>