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

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

diagbotman-service/src/main/java/com/diagbot/dto/ProductServiceDTO.java

@@ -1,8 +1,5 @@
 package com.diagbot.dto;
 
-import com.diagbot.entity.LantoneProduct;
-import com.diagbot.entity.ProductService;
-import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.ServiceToken;
 import lombok.Getter;
 import lombok.Setter;
@@ -43,5 +40,4 @@ public class ProductServiceDTO {
      * 服务说明
      */
     private String serviceDescription;
-
 }

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

@@ -1,9 +1,6 @@
 package com.diagbot.entity.wrapper;
 
-import com.diagbot.entity.LantoneProduct;
-import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
-import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.ServiceToken;
 
 /**
@@ -12,49 +9,78 @@ import com.diagbot.entity.ServiceToken;
  * @time: 2018/9/19 16:06
  */
 public class ProductServiceWrapper extends ProductService {
-    private LantoneProduct lantoneProduct;
+    /*private LantoneProduct lantoneProduct;
     private OpenedProducts openedProducts;
-    private ServiceInfo serviceInfo;
+    private ServiceInfo serviceInfo;*/
     private ServiceToken serviceToken;
     private Long userId;
 
-    public LantoneProduct getLantoneProduct() {
-        return lantoneProduct;
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 产品介绍
+     */
+    private String productDescription;
+
+
+    /**
+     * 服务名称
+     */
+    private String serviceName;
+
+    /**
+     * 服务说明
+     */
+    private String serviceDescription;
+
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setLantoneProduct(LantoneProduct lantoneProduct) {
-        this.lantoneProduct = lantoneProduct;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
-    public OpenedProducts getOpenedProducts() {
-        return openedProducts;
+    public String getProductName() {
+        return productName;
     }
 
-    public void setOpenedProducts(OpenedProducts openedProducts) {
-        this.openedProducts = openedProducts;
+    public void setProductName(String productName) {
+        this.productName = productName;
     }
 
-    public ServiceInfo getServiceInfo() {
-        return serviceInfo;
+    public String getProductDescription() {
+        return productDescription;
     }
 
-    public void setServiceInfo(ServiceInfo serviceInfo) {
-        this.serviceInfo = serviceInfo;
+    public void setProductDescription(String productDescription) {
+        this.productDescription = productDescription;
     }
 
-    public ServiceToken getServiceToken() {
-        return serviceToken;
+    public String getServiceName() {
+        return serviceName;
     }
 
-    public void setServiceToken(ServiceToken serviceToken) {
-        this.serviceToken = serviceToken;
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
     }
 
-    public Long getUserId() {
-        return userId;
+    public String getServiceDescription() {
+        return serviceDescription;
     }
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
+    public void setServiceDescription(String serviceDescription) {
+        this.serviceDescription = serviceDescription;
+    }
+
+    public ServiceToken getServiceToken() {
+        return serviceToken;
+    }
+
+    public void setServiceToken(ServiceToken serviceToken) {
+        this.serviceToken = serviceToken;
     }
 }

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

@@ -43,6 +43,8 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
     private OpenedProductsFacade openedProductsFacade;
     @Autowired
     private UserServiceClient userServiceClient;
+    @Autowired
+    private OrderDetailsFacade orderDetailsFacade;
 
     /**
      * 产品线管理添加产品
@@ -157,7 +159,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         List<ProductLineDTO> productLineDTOList = this.productLines();//所有产品
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         List<Long> opendId = openedProductsFacade.getOpendCountByUserId(userId);
-        List<Long> orderDetailsId = openedProductsFacade.getOpendCountByUserId(userId);
+        List<Long> orderDetailsId = orderDetailsFacade.getOrderDetailsByUser(userId);
         for (ProductLineDTO productLineDTO:productLineDTOList) {
             productLineDTO.setProductAudit(ProductAuditEnum.NotOpend.getKey());
             for (int i =0; i<opendId.size();i++){

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

@@ -107,6 +107,20 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
     @Transactional
     public Boolean addOrders(AddOrderVO addOrderVO) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        List<Long> opendId = openedProductsFacade.getOpendCountByUserId(userId);
+        List<Long> orderDetailsId = orderDetailsFacade.getOrderDetailsByUser(userId);
+        for (int i =0; i<addOrderVO.getProductId().size();i++){
+            for (int j =0; j<opendId.size();j++){
+                if(addOrderVO.getProductId().get(i)==opendId.get(j)){
+                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请勿重复提交已开通产品:");
+                }
+            }
+            for (int k =0; k<orderDetailsId.size();k++){
+                if(addOrderVO.getProductId().get(i)==orderDetailsId.get(k)){
+                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "产品正在审核中请勿重复提交:");
+                }
+            }
+        }
         ProductOrder productOrder = new ProductOrder();
         productOrder.setCreator(UserUtils.getCurrentPrincipleID());
         productOrder.setGmtCreate(DateUtil.now());
@@ -133,9 +147,9 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         if (0 == lantoneProductFacade.listByIds(lantoneProductId).size()) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取产品信息失败:");
         }
-        if(orderDetailsFacade.saveOrderDetails(list)){
+        /*if(orderDetailsFacade.saveOrderDetails(list)){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "添加订单失败");
-        }
+        }*/
         return true;
     }
 
@@ -210,10 +224,9 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 		}
         Page page =new Page();
         page.setRecords(list);
-        productOrderIndex =new ProductOrderIndex();
         page.setCurrent(productOrderVO.getCurrent());
         page.setSize(productOrderVO.getSize());
-        page.setTotal(this.selectAllProductOrder(productOrderIndex).size());
+        page.setTotal(productOrderFacade.selectProductOrderCount(productOrderIndex));
 		return RespDTO.onSuc(page);
 	}
 

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

@@ -25,7 +25,6 @@ import com.diagbot.vo.ProductServiceSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -167,36 +166,36 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
     public IPage<ProductServiceWrapper> selectProductServiceByCurrentUserPage(Page<ProductServiceWrapper> page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         //当前登录用户服务端列表
-        QueryWrapper<ServiceInfo> qwService = new QueryWrapper<>();
+        /*QueryWrapper<ServiceInfo> qwService = new QueryWrapper<>();
         qwService.eq("is_deleted", IsDeleteEnum.N.getKey());
         qwService.eq("user_id", userId);
         List<ServiceInfo> serviceInfoList = serviceInfoFacade.list(qwService);
-        Map<Long, ServiceInfo> serviceData = EntityUtil.makeEntityMap(serviceInfoList, "id");
+        Map<Long, ServiceInfo> serviceData = EntityUtil.makeEntityMap(serviceInfoList, "id");*/
         //服务令牌列表
         QueryWrapper<ServiceToken> qwToken = new QueryWrapper<>();
         qwToken.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<ServiceToken> serviceTokenList = serviceTokenFacade.list(qwToken);
         Map<Long, ServiceToken> tokenData = EntityUtil.makeEntityMap(serviceTokenList, "productServiceId");
         //产品列表
-        QueryWrapper<LantoneProduct> qwProduct = new QueryWrapper<>();
+        /*QueryWrapper<LantoneProduct> qwProduct = new QueryWrapper<>();
         qwProduct.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<LantoneProduct> lantoneProductList = lantoneProductFacade.list(qwProduct);
-        Map<Long, LantoneProduct> lantoneProductData = EntityUtil.makeEntityMap(lantoneProductList, "id");
+        Map<Long, LantoneProduct> lantoneProductData = EntityUtil.makeEntityMap(lantoneProductList, "id");*/
         //当前用户开通的产品列表
-        QueryWrapper<OpenedProducts> qwOpenedProducts = new QueryWrapper<>();
+       /* QueryWrapper<OpenedProducts> qwOpenedProducts = new QueryWrapper<>();
         qwOpenedProducts.eq("is_deleted", IsDeleteEnum.N.getKey());
         qwOpenedProducts.eq("user_id", userId);
         List<OpenedProducts> openedProductsList = openedProductsFacade.list(qwOpenedProducts);
-        Map<Long, OpenedProducts> openedProductData = EntityUtil.makeEntityMap(openedProductsList, "productId");
+        Map<Long, OpenedProducts> openedProductData = EntityUtil.makeEntityMap(openedProductsList, "productId");*/
 
         ProductServiceWrapper productServiceVO = new ProductServiceWrapper();
         productServiceVO.setUserId(userId);
         IPage<ProductServiceWrapper> psPage = this.selectProductServicePage(page, productServiceVO);
         List<ProductServiceWrapper> psList = psPage.getRecords();
         for (ProductServiceWrapper productService : psList) {
-            productService.setLantoneProduct(lantoneProductData.get(productService.getProductId()));
+            /*productService.setLantoneProduct(lantoneProductData.get(productService.getProductId()));
             productService.setOpenedProducts(openedProductData.get(productService.getProductId()));
-            productService.setServiceInfo(serviceData.get(productService.getServiceId()));
+            productService.setServiceInfo(serviceData.get(productService.getServiceId()));*/
             productService.setServiceToken(tokenData.get(productService.getId()));
         }
         psPage.setRecords(psList);

diagbotman-service/src/main/java/com/diagbot/mapper/ProductOrderMapper.java

@@ -55,9 +55,16 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
     int waitExamOrderCou();
 
     /**
-     * @Description: 订单申请查询所有订单信息接口
+     * @Description: 产品申请查询所有订单信息接口
      * @Author: wangyu
      * @Date: 19:39 2018/9/20
      */
     public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderIndex productOrderIndex);
+
+    /**
+     * @Description: 产品申请查询所有订单信息总条数接口
+     * @Author: wangyu
+     * @Date: 19:39 2018/9/20
+     */
+    public int selectProductOrderCount(ProductOrderIndex productOrderIndex);
 }

diagbotman-service/src/main/java/com/diagbot/service/ProductOrderService.java

@@ -30,4 +30,11 @@ public interface ProductOrderService extends IService<ProductOrder> {
      * @Date: 19:39 2018/9/20
      */
     public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderIndex productOrderIndex);
+
+    /**
+     * @Description: 产品申请查询所有订单信息总条数接口
+     * @Author: wangyu
+     * @Date: 19:39 2018/9/20
+     */
+    public int selectProductOrderCount(ProductOrderIndex productOrderIndex);
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/ProductOrderServiceImpl.java

@@ -30,4 +30,9 @@ public class ProductOrderServiceImpl extends ServiceImpl<ProductOrderMapper, Pro
     public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderIndex productOrderIndex) {
         return baseMapper.selectAllProductOrder(productOrderIndex);
     }
+
+    @Override
+    public int selectProductOrderCount(ProductOrderIndex productOrderIndex) {
+        return baseMapper.selectProductOrderCount(productOrderIndex);
+    }
 }

diagbotman-service/src/main/java/com/diagbot/vo/ProductOrderVO.java

@@ -26,7 +26,7 @@ public class ProductOrderVO {
     /**
      * 订单编号
      */
-    private Integer num;
+    private String num;
     /**
      * 机构名称
      */

diagbotman-service/src/main/java/com/diagbot/vo/ProductServiceSaveVO.java

@@ -18,6 +18,5 @@ public class ProductServiceSaveVO {
     private Long productId;
     @NotNull(message = "请输入服务Id!")
     private Long serviceId;
-    @NotNull(message = "请输入令牌类型!")
     private Integer type;
 }

diagbotman-service/src/main/java/com/diagbot/web/ProductServiceController.java

@@ -7,6 +7,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ProductServiceDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.wrapper.ProductServiceWrapper;
+import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.facade.ProductServiceFacade;
 import com.diagbot.vo.ProductServiceSaveVO;
 import io.swagger.annotations.Api;
@@ -42,12 +43,12 @@ public class ProductServiceController {
      */
     @ApiOperation(value = "服务端关联到产品接口[by:zhaops]",
             notes = "productId：产品Id，必填<br>" +
-                    "serviceId：服务Id，必填<br> " +
-                    "type：令牌类型，必填<br> ")
+                    "serviceId：服务Id，必填<br> ")
     @PostMapping("/genProductService")
     @SysLogger("genProductService")
     @Transactional
     public RespDTO<ProductServiceDTO> genProductService(@RequestBody ProductServiceSaveVO productServiceSaveVO) {
+        productServiceSaveVO.setType(TokenTypeEnum.Manual.getKey());
         ProductServiceDTO productServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
         return RespDTO.onSuc(productServiceDTO);
     }
@@ -66,6 +67,7 @@ public class ProductServiceController {
     @SysLogger("deleteProductService")
     @Transactional
     public RespDTO<Boolean> deleteProductService(@RequestBody ProductServiceSaveVO productServiceSaveVO) {
+        productServiceSaveVO.setType(TokenTypeEnum.Manual.getKey());
         Boolean isSuccess = productServiceFacade.deleteProductService(productServiceSaveVO);
         return RespDTO.onSuc(isSuccess);
     }

diagbotman-service/src/main/resources/mapper/ProductOrderMapper.xml

@@ -83,7 +83,7 @@
             parameterType="com.diagbot.entity.ProductOrderIndex">
         SELECT id , `num` , `user_id` , `time` , `audit_status` FROM diag_product_order WHERE is_deleted='N'
         <if test="num != null and num != ''">
-            AND num=#{num}
+            AND num like concat ('%',#{num},'%')
         </if>
         <if test="auditStatus != null and auditStatus != ''">
             AND audit_status=#{auditStatus}
@@ -99,4 +99,19 @@
         </if>
     </select>
 
+    <select id="selectProductOrderCount" parameterType="com.diagbot.entity.ProductOrderIndex" resultType="java.lang.Integer">
+        SELECT COUNT(1) FROM diag_product_order WHERE is_deleted='N'
+        <if test="num != null and num != ''">
+            AND num like concat ('%',#{num},'%')
+        </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            AND audit_status=#{auditStatus}
+        </if>
+        <if test="userId != null and userId.size > 0">
+            AND user_id IN
+            <foreach item="userId" collection="userId" open="(" separator="," close=")">
+                #{userId}
+            </foreach>
+        </if>
+    </select>
 </mapper>

diagbotman-service/src/main/resources/mapper/ProductServiceMapper.xml

@@ -27,11 +27,17 @@
         <result column="product_id" property="productId"/>
         <result column="service_id" property="serviceId"/>
         <result column="remark" property="remark"/>
+        <result column="product_name" property="productName"/>
+        <result column="product_description" property="productDescription"/>
+        <result column="service_name" property="serviceName"/>
+        <result column="service_description" property="serviceDescription"/>
     </resultMap>
 
+
     <!-- 查询产品与服务端的关联列表（分页） -->
     <select id="selectProductServicePage" resultMap="BaseResultWrapperMap">
-        select a.* from diag_product_service a,diag_opened_products b,diag_service_info c ,diag_lantone_product d
+        select a.*,d.name as product_name,d.decription as product_description,c.name as service_name,c.description as service_description
+        from diag_product_service a,diag_opened_products b,diag_service_info c ,diag_lantone_product d
         where a.product_id=b.product_id
         and a.product_id=d.id
         and a.service_id=c.id

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

@@ -0,0 +1,26 @@
+package com.diagbot.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 分页按条件筛选
+ * @date 2018年10月10日 下午2:32:46
+ */
+@Getter
+@Setter
+public class CustomerDTO implements Serializable{
+	
+	 private String userName;// 用户名
+	 private String orgName;//机构名称
+	 private Integer autStatus;//认证状态
+	 private String startTime;//开始时间
+	 private String endTime;//结束时间
+
+}

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

@@ -633,6 +633,9 @@ 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("orgName",userExportVO.getOrgName());
+        userMap.put("userName",userExportVO.getUserName());
         List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
         GsonUtil.toJson(datas);
         List<String> listName = new ArrayList<>();
@@ -903,10 +906,12 @@ public class UserFacade extends UserServiceImpl {
      * @param autStatus
      * @return
      */
-    public RespDTO<IPage<UserAllDTO>> queryUserInformations(Page page, String orgName, Integer autStatus){
-        UserInfoDTO userInfo = new UserInfoDTO();
+    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);
     	return RespDTO.onSuc(queryUserInformation(page, userInfo));
     }
     /**
@@ -915,9 +920,11 @@ public class UserFacade extends UserServiceImpl {
      * @param orgName
      * @return
      */
-    public RespDTO<IPage<OrganizationDTO>> queryMechanismInformations(Page page, String orgName){
-        UserInfoDTO userInfo = new UserInfoDTO();
+    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);
     	return RespDTO.onSuc(queryMechanismInformation(page, userInfo));
     }
     /**
@@ -927,11 +934,13 @@ public class UserFacade extends UserServiceImpl {
      * @param userName
      * @return
      */
-    public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProducts(Page page,String orgName,String userName) {
-    	UserInfoDTO userInfo = new UserInfoDTO();
+    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);
+
         IPage<UserOrgizationProductDTO> user = queryVerifiedUserOrganizationProduct(page, userInfo);
         List<UserOrgizationProductDTO> userData = user.getRecords();
         List<Long> userIds = new ArrayList<>();
@@ -969,10 +978,12 @@ public class UserFacade extends UserServiceImpl {
      * @param userName
      * @return
      */
-    public RespDTO<IPage<AuthenticationDTO>> queryAuthentications(Page page,String orgName,String userName) {
-    	UserInfoDTO userInfo = new UserInfoDTO();
+    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);
 		return RespDTO.onSuc(queryAuthentication(page, userInfo));
 	}
     

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

@@ -1,76 +1,77 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.AuthenticationDTO;
-import com.diagbot.dto.OrganizationDTO;
-import com.diagbot.dto.UserAllDTO;
-import com.diagbot.dto.UserInfoDTO;
-import com.diagbot.dto.UserInfoExportDTO;
-import com.diagbot.dto.UserOrgDTO;
-import com.diagbot.dto.UserOrgizationProductDTO;
-import com.diagbot.entity.User;
-import com.diagbot.vo.UserExportVO;
-import com.diagbot.vo.UserInfoOrganizationsVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface UserMapper extends BaseMapper<User> {
-
-    /**
-     * 根据用户查找信息
-     *
-     * @param username 用户名
-     * @return 用户信息
-     */
-    User findByName(String username);
-
-    /**
-     * 根据用户id获取用户信息(示例)
-     *
-     * @param page 翻页信息
-     * @param user 用户输入信息
-     * @return 翻页用户信息
-     */
-    IPage<User> selectUserListPage(Page page, @Param("user") User user);
-
-    IPage<User> indexPage(Page page, @Param("user") User user);
-
-    IPage<UserInfoDTO> selectUserInfoListPage(Page page, @Param("userInfo") UserInfoDTO userInfo);
-
-    public boolean updateUserInfoAll(@Param("userMap") Map<String, Object> userMap);
-
-    public boolean updateDeleted(@Param("map") Map<String, Object> map);
-
-    public List<User> getByIds(List<Long> ids);
-
-    public List<UserOrgDTO> getUserOrgDTOByIds(List<Long> ids);
-
-    public boolean auditUserInfoAll(@Param("auditMap") Map<String, Object> auditMap);
-
-    public Integer updateById(Map<String, String> map);
-
-    public List<UserInfoDTO> dependentuserInfoByTime(@Param("userExport") Map<String, Object> map);
-
-    public List<User> getUserByOrgName(String orgName);
-    
-    public IPage<UserAllDTO> queryUserInformation(Page page, @Param("userInformation") UserInfoDTO userInfo);
-    
-    public IPage<OrganizationDTO> queryMechanismInformation(Page page, @Param("mechanism")  UserInfoDTO userInfo);
-    
-    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, @Param("userOrg")  UserInfoDTO userInfo);
-    
-    public IPage<AuthenticationDTO> queryAuthentication(Page page, @Param("authen")  UserInfoDTO userInfo);
-
-}
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.AuthenticationDTO;
+import com.diagbot.dto.CustomerDTO;
+import com.diagbot.dto.OrganizationDTO;
+import com.diagbot.dto.UserAllDTO;
+import com.diagbot.dto.UserInfoDTO;
+import com.diagbot.dto.UserInfoExportDTO;
+import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.dto.UserOrgizationProductDTO;
+import com.diagbot.entity.User;
+import com.diagbot.vo.UserExportVO;
+import com.diagbot.vo.UserInfoOrganizationsVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-02
+ */
+public interface UserMapper extends BaseMapper<User> {
+
+    /**
+     * 根据用户查找信息
+     *
+     * @param username 用户名
+     * @return 用户信息
+     */
+    User findByName(String username);
+
+    /**
+     * 根据用户id获取用户信息(示例)
+     *
+     * @param page 翻页信息
+     * @param user 用户输入信息
+     * @return 翻页用户信息
+     */
+    IPage<User> selectUserListPage(Page page, @Param("user") User user);
+
+    IPage<User> indexPage(Page page, @Param("user") User user);
+
+    IPage<UserInfoDTO> selectUserInfoListPage(Page page, @Param("userInfo") UserInfoDTO userInfo);
+
+    public boolean updateUserInfoAll(@Param("userMap") Map<String, Object> userMap);
+
+    public boolean updateDeleted(@Param("map") Map<String, Object> map);
+
+    public List<User> getByIds(List<Long> ids);
+
+    public List<UserOrgDTO> getUserOrgDTOByIds(List<Long> ids);
+
+    public boolean auditUserInfoAll(@Param("auditMap") Map<String, Object> auditMap);
+
+    public Integer updateById(Map<String, String> map);
+
+    public List<UserInfoDTO> dependentuserInfoByTime(@Param("userExport") Map<String, Object> map);
+
+    public List<User> getUserByOrgName(String orgName);
+    
+    public IPage<UserAllDTO> queryUserInformation(Page page, @Param("userInformation") CustomerDTO userInfo);
+    
+    public IPage<OrganizationDTO> queryMechanismInformation(Page page, @Param("mechanism")  CustomerDTO userInfo);
+    
+    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, @Param("userOrg")  CustomerDTO userInfo);
+    
+    public IPage<AuthenticationDTO> queryAuthentication(Page page, @Param("authen")  CustomerDTO userInfo);
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.AuthenticationDTO;
+import com.diagbot.dto.CustomerDTO;
 import com.diagbot.dto.OrganizationDTO;
 import com.diagbot.dto.UserAllDTO;
 import com.diagbot.dto.UserInfoDTO;
@@ -61,12 +62,12 @@ public interface UserService extends IService<User> {
 
     public List<User> getUserByOrgName(String orgName);
     
-    public IPage<UserAllDTO> queryUserInformation(Page page, UserInfoDTO userInfo);
+    public IPage<UserAllDTO> queryUserInformation(Page page, CustomerDTO userInfo);
     
-    public IPage<OrganizationDTO> queryMechanismInformation(Page page,  UserInfoDTO userInfo);
+    public IPage<OrganizationDTO> queryMechanismInformation(Page page,  CustomerDTO userInfo);
     
-    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, UserInfoDTO userInfo);
+    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, CustomerDTO userInfo);
     
-    public IPage<AuthenticationDTO> queryAuthentication(Page page,  UserInfoDTO userInfo);
+    public IPage<AuthenticationDTO> queryAuthentication(Page page,  CustomerDTO userInfo);
 
 }

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

@@ -1,136 +1,137 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.AuthenticationDTO;
-import com.diagbot.dto.OrganizationDTO;
-import com.diagbot.dto.UserAllDTO;
-import com.diagbot.dto.UserInfoDTO;
-import com.diagbot.dto.UserInfoExportDTO;
-import com.diagbot.dto.UserOrgDTO;
-import com.diagbot.dto.UserOrgizationProductDTO;
-import com.diagbot.entity.User;
-import com.diagbot.mapper.UserMapper;
-import com.diagbot.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-@Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
-
-    @Autowired
-    UserMapper userMapper;
-
-    /**
-     * 根据用户查找信息
-     *
-     * @param username 用户名
-     * @return 用户信息
-     */
-    public User findByName(String username) {
-        return baseMapper.findByName(username);
-    }
-
-    /**
-     * 根据用户id获取用户信息(示例)
-     *
-     * @param page 翻页信息
-     * @param user 用户输入信息
-     * @return 翻页用户信息
-     */
-    @Override
-    public IPage<User> selectUserListPage(Page<User> page, User user) {
-        return baseMapper.selectUserListPage(page, user);
-    }
-
-    @Override
-    public IPage<UserInfoDTO> selectUserInfoListPage(Page page, UserInfoDTO userInfo) {
-        return baseMapper.selectUserInfoListPage(page, userInfo);
-
-    }
-
-    @Override
-    public boolean updateUserInfoAll(Map<String, Object> userMap) {
-        return baseMapper.updateUserInfoAll(userMap);
-
-    }
-
-    @Override
-    public boolean updateDeleted(Map<String, Object> map) {
-        return baseMapper.updateDeleted(map);
-
-    }
-
-    @Override
-    public IPage<User> indexPage(Page<User> page, User user) {
-        return baseMapper.indexPage(page, user);
-    }
-
-    @Override
-    public List<User> getByIds(List<Long> ids) {
-        return userMapper.getByIds(ids);
-    }
-
-
-    /**
-     * 获取用户和机构信息
-     *
-     * @param userIds 用户ids
-     * @return 用户和机构信息
-     */
-    @Override
-    public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds) {
-        return userMapper.getUserOrgDTOByIds(userIds);
-    }
-
-    @Override
-    public boolean auditUserInfoAll(Map<String, Object> auditMap) {
-        // TODO Auto-generated method stub
-        return baseMapper.auditUserInfoAll(auditMap);
-    }
-
-    @Override
-    public List<UserInfoDTO> dependentuserInfoByTime(Map<String, Object> map) {
-
-        return baseMapper.dependentuserInfoByTime(map);
-    }
-
-    @Override
-    public List<User> getUserByOrgName(String orgName) {
-        return baseMapper.getUserByOrgName(orgName);
-    }
-    
-    @Override
-    public IPage<UserAllDTO> queryUserInformation(Page page, UserInfoDTO userInfo){
-    	 return baseMapper.queryUserInformation(page, userInfo);
-    }
-    
-    public IPage<OrganizationDTO> queryMechanismInformation(Page page, UserInfoDTO userInfo){
-    	return baseMapper.queryMechanismInformation(page, userInfo);
-    }
-
-	@Override
-	public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, UserInfoDTO userInfo) {
-		
-		return baseMapper.queryVerifiedUserOrganizationProduct(page, userInfo);
-	}
-
-	@Override
-	public IPage<AuthenticationDTO> queryAuthentication(Page page, UserInfoDTO userInfo) {
-		
-		return baseMapper.queryAuthentication(page, userInfo);
-	}
-
-}
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.AuthenticationDTO;
+import com.diagbot.dto.CustomerDTO;
+import com.diagbot.dto.OrganizationDTO;
+import com.diagbot.dto.UserAllDTO;
+import com.diagbot.dto.UserInfoDTO;
+import com.diagbot.dto.UserInfoExportDTO;
+import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.dto.UserOrgizationProductDTO;
+import com.diagbot.entity.User;
+import com.diagbot.mapper.UserMapper;
+import com.diagbot.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-02
+ */
+@Service
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+
+    @Autowired
+    UserMapper userMapper;
+
+    /**
+     * 根据用户查找信息
+     *
+     * @param username 用户名
+     * @return 用户信息
+     */
+    public User findByName(String username) {
+        return baseMapper.findByName(username);
+    }
+
+    /**
+     * 根据用户id获取用户信息(示例)
+     *
+     * @param page 翻页信息
+     * @param user 用户输入信息
+     * @return 翻页用户信息
+     */
+    @Override
+    public IPage<User> selectUserListPage(Page<User> page, User user) {
+        return baseMapper.selectUserListPage(page, user);
+    }
+
+    @Override
+    public IPage<UserInfoDTO> selectUserInfoListPage(Page page, UserInfoDTO userInfo) {
+        return baseMapper.selectUserInfoListPage(page, userInfo);
+
+    }
+
+    @Override
+    public boolean updateUserInfoAll(Map<String, Object> userMap) {
+        return baseMapper.updateUserInfoAll(userMap);
+
+    }
+
+    @Override
+    public boolean updateDeleted(Map<String, Object> map) {
+        return baseMapper.updateDeleted(map);
+
+    }
+
+    @Override
+    public IPage<User> indexPage(Page<User> page, User user) {
+        return baseMapper.indexPage(page, user);
+    }
+
+    @Override
+    public List<User> getByIds(List<Long> ids) {
+        return userMapper.getByIds(ids);
+    }
+
+
+    /**
+     * 获取用户和机构信息
+     *
+     * @param userIds 用户ids
+     * @return 用户和机构信息
+     */
+    @Override
+    public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds) {
+        return userMapper.getUserOrgDTOByIds(userIds);
+    }
+
+    @Override
+    public boolean auditUserInfoAll(Map<String, Object> auditMap) {
+        // TODO Auto-generated method stub
+        return baseMapper.auditUserInfoAll(auditMap);
+    }
+
+    @Override
+    public List<UserInfoDTO> dependentuserInfoByTime(Map<String, Object> map) {
+
+        return baseMapper.dependentuserInfoByTime(map);
+    }
+
+    @Override
+    public List<User> getUserByOrgName(String orgName) {
+        return baseMapper.getUserByOrgName(orgName);
+    }
+    
+    @Override
+    public IPage<UserAllDTO> queryUserInformation(Page page, CustomerDTO userInfo){
+    	 return baseMapper.queryUserInformation(page, userInfo);
+    }
+    
+    public IPage<OrganizationDTO> queryMechanismInformation(Page page, CustomerDTO userInfo){
+    	return baseMapper.queryMechanismInformation(page, userInfo);
+    }
+
+	@Override
+	public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, CustomerDTO userInfo) {
+		
+		return baseMapper.queryVerifiedUserOrganizationProduct(page, userInfo);
+	}
+
+	@Override
+	public IPage<AuthenticationDTO> queryAuthentication(Page page, CustomerDTO userInfo) {
+		
+		return baseMapper.queryAuthentication(page, userInfo);
+	}
+
+}

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

@@ -17,5 +17,8 @@ public class UserAndOrgPageVO extends Page{
 	
 	String userName;
 	String orgName;
+	Integer autStatus;//认证状态
+	String startTime;//开始时间
+	String endTime;//结束时间
 
 }

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

@@ -16,5 +16,8 @@ public class UserExportVO {
     private String endTime;
     private String filePath;//文件路径
     private String fileName;//文件名
+	private String userName;// 用户名
+	private String orgName;//机构名称
+	private Integer autStatus;//认证状态
 
 }

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

@@ -14,4 +14,6 @@ import lombok.Setter;
 public class UserInfoPagVO extends Page {
     String orgName;
     Integer autStatus;
+	String startTime;//开始时间
+	String endTime;//结束时间
 }

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

@@ -143,7 +143,7 @@ public class UserInfoController {
     @SysLogger("queryUserInformation")
     public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO){
     	
-    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getOrgName(), userInfoPagVO.getAutStatus());
+    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getOrgName(), userInfoPagVO.getAutStatus(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
     }
     
     
@@ -152,7 +152,7 @@ public class UserInfoController {
     @SysLogger("queryMechanismInformation")
     public RespDTO<IPage<OrganizationDTO>> queryMechanismInformation(@RequestBody UserInfoPagVO userInfoPagVO){
     	
-    	return userFacade.queryMechanismInformations(userInfoPagVO,userInfoPagVO.getOrgName());
+    	return userFacade.queryMechanismInformations(userInfoPagVO,userInfoPagVO.getOrgName(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
     }
     
     
@@ -161,7 +161,7 @@ public class UserInfoController {
     @SysLogger("queryVerifiedUserOrganizationProduct")
     public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProduct(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
 		
-		return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName());
+		return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
 	}
    
     @ApiOperation(value = "分页查询认证中的用户信息接口[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
@@ -169,7 +169,7 @@ public class UserInfoController {
     @SysLogger("queryAuthentication")
 	public RespDTO<IPage<AuthenticationDTO>> queryAuthentication(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
 		
-		return userFacade.queryAuthentications(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName());
+		return userFacade.queryAuthentications(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
 	} 
     
     

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

@@ -1,33 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.OrganizationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.Organization">
-        <id column="id" property="id"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="name" property="name"/>
-        <result column="type" property="type"/>
-        <result column="principal" property="principal"/>
-        <result column="address" property="address"/>
-        <result column="parent_id" property="parentId"/>
-        <result column="sub_num" property="subNum"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-    <select id="getByUserId" resultMap="BaseResultMap">
-        SELECT a.* FROM `sys_organization` a, sys_user_organization b
-        where a.id = b.organization_id and b.user_id = #{userId} and a.is_deleted = 'N' and b.is_deleted = 'N'
-    </select>
-
-    <select id="findOrganization" parameterType="java.lang.String"
-            resultType="com.diagbot.entity.Organization">
-		SELECT id,NAME FROM sys_organization WHERE is_deleted = "N" AND NAME LIKE
-		CONCAT('%',  #{organizationName}, '%')
-	</select>
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.OrganizationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Organization">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="name" property="name"/>
+        <result column="type" property="type"/>
+        <result column="principal" property="principal"/>
+        <result column="address" property="address"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="sub_num" property="subNum"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+    <select id="getByUserId" resultMap="BaseResultMap">
+        SELECT a.* FROM `sys_organization` a, sys_user_organization b
+        where a.id = b.organization_id and b.user_id = #{userId} and a.is_deleted = 'N' and b.is_deleted = 'N'
+    </select>
+
+    <select id="findOrganization" parameterType="java.lang.String"
+            resultType="com.diagbot.entity.Organization">
+	SELECT a.id,a.NAME FROM sys_organization a LEFT JOIN
+	sys_user_organization b ON a.id = b.organization_id WHERE a.is_deleted
+	= "N" AND b.organization_id IS NULL AND a.NAME LIKE CONCAT('%',
+	#{organizationName}, '%')
+	</select>
+</mapper>

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

@@ -276,6 +276,9 @@
         <if test="userExport.orgName != null">
             AND org.name LIKE CONCAT('%', #{userInfo.orgName}, '%')
         </if>
+        <if test="userExport.userName != null">
+            AND u.username LIKE CONCAT('%', #{userExport.userName}, '%')
+        </if>
         <if test="userExport.autStatus != null">
             AND aut.status = #{userInfo.autStatus}
         </if>
@@ -304,6 +307,9 @@
         </if>
         <if test="userInformation.autStatus != null">
             AND aut.status = #{userInformation.autStatus}
+        </if>
+         <if test="userInformation.startTime != null and userInformation.endTime != null">
+            AND u.gmt_create BETWEEN #{userInformation.startTime} and #{userInformation.endTime}
         </if>
         ORDER BY u.gmt_create DESC  
     </select>
@@ -330,6 +336,9 @@
         </if>
         <if test="mechanism.autStatus != null">
             AND aut.status = #{mechanism.autStatus}
+        </if>
+         <if test="mechanism.startTime != null and mechanism.endTime != null">
+            AND u.gmt_create BETWEEN #{mechanism.startTime} and #{mechanism.endTime}
         </if>
         ORDER BY u.gmt_create DESC 
    </select>
@@ -362,6 +371,9 @@
         </if>
         <if test="userOrg.userName != null">
             AND u.username LIKE CONCAT('%', #{userOrg.userName}, '%')
+        </if>
+         <if test="userOrg.startTime != null and userOrg.endTime != null">
+            AND u.gmt_create BETWEEN #{userOrg.startTime} and #{userOrg.endTime}
         </if>
         AND aut.status = 1
         ORDER BY u.gmt_create DESC
@@ -394,6 +406,9 @@
         <if test="authen.userName != null">
             AND u.username LIKE CONCAT('%', #{authen.userName}, '%')
         </if>
+        <if test="authen.startTime != null and authen.endTime != null">
+            AND u.gmt_create BETWEEN #{authen.startTime} and #{authen.endTime}
+        </if>
         AND aut.status = 2
         ORDER BY u.gmt_create DESC
     </select>