朗通后台产品线管理——详情（根据机构名称模糊查询补充）

diagbotman-service/src/main/java/com/diagbot/entity/OpenedProductsIndex.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -40,4 +41,9 @@ public class OpenedProductsIndex implements Serializable {
      */
     private Integer orderId;
 
+    /**
+     * 用户id
+     */
+    private List<Long> userId;
+
 }

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

@@ -221,6 +221,10 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         BeanUtil.copyProperties(oppendedProductVO,page);
         OpenedProductsIndex openedProductsIndex = new OpenedProductsIndex();
         BeanUtil.copyProperties(oppendedProductVO, openedProductsIndex);
+        if(oppendedProductVO.getOrgName()!=null&&oppendedProductVO.getOrgName()!=""){
+            RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(oppendedProductVO.getOrgName());
+            openedProductsIndex.setUserId(rlist.data);
+        }
         List<OpendProductWrapper> list = openedProductsFacade.getByProductId(page,openedProductsIndex).getRecords();
         List<Long> list1 = new ArrayList<>();
         for (OpendProductWrapper opendProducts : list) {

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

@@ -16,4 +16,8 @@ import javax.validation.constraints.NotBlank;
 public class OppendedProductVO extends Page{
     @NotBlank(message = "请输入产品Id!")
     private Long productId;
+    /**
+     * 机构名称
+     */
+    private String orgName;
 }

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

@@ -97,7 +97,8 @@ public class DiagLantoneProductController {
     @ApiOperation(value = "产品线管理——详情[by:wangyu]",
             notes = "productId：根据产品id查询所有已开通本产品用户，必填<br>" +
                     "current:页数<br>" +
-                    "size:每页显示条数"
+                    "size:每页显示条数<br>" +
+                    "orgName:机构名称"
     )
     @PostMapping("/opendedProduct")
     @SysLogger("opendedProduct")

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

@@ -24,11 +24,6 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultWrapper" type="com.diagbot.entity.wrapper.OpendProductWrapper">
         <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="product_id" property="productId"/>
         <result column="user_id" property="userId"/>
         <result column="start_time" property="startTime"/>
@@ -202,13 +197,14 @@
         AND a.product_id = #{productId}
     </update>
 
-    <select id="getByProductId" parameterType="com.diagbot.entity.OpenedProductsIndex"
-            resultMap="BaseResultWrapper">
+    <select id="getByProductId" resultType="com.diagbot.entity.wrapper.OpendProductWrapper">
         SELECT a.*,b.time order_time from diag_opened_products a
         LEFT JOIN diag_product_order b ON a.order_id =b.id
         WHERE product_id =#{opend.productId} AND a.is_deleted='N'
-        <if test="opend.serviceStatus != null and opend.serviceStatus != ''">
-            and t.service_status=#{opend.serviceStatus}
+        <if test="opend.userId != null and opend.userId.size > 0">
+            <foreach item="opend.userId" collection="opend.userId" open="and(" separator="or" close=")">
+                 a.user_id = #{opend.userId}
+            </foreach>
         </if>
         ORDER BY b.time desc
     </select>

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

@@ -88,7 +88,7 @@
             AND audit_status=#{product.auditStatus}
         </if>
         <if test="product.userId != null and product.userId.size > 0">
-            <foreach item="product.userId" collection="product.userId" open="and" separator="or" >
+            <foreach item="product.userId" collection="product.userId" open="and(" separator="or" close=")" >
                  user_id = #{product.userId}
             </foreach>
         </if>

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

@@ -29,7 +29,7 @@
             AND apply_time = #{renewalsInfosVO.applyTime}
         </if>
         <if test="renewalsInfosVO.userId != null and renewalsInfosVO.userId.size > 0">
-            <foreach collection="renewalsInfosVO.userId" item="renewalsInfosVO.userId" open="and" separator="or">
+            <foreach collection="renewalsInfosVO.userId" item="renewalsInfosVO.userId" open="and(" separator="or" close=")">
                 user_id = #{renewalsInfosVO.userId}
             </foreach>
         </if>