微信移动端支付

.idea/workspace.xml

@@ -30,7 +30,10 @@
   <component name="ChangeListManager">
     <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="微信移动端支付">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/ResearchBriefReportControllerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/ResearchBriefReportControllerApi.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelRelevancyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelRelevancyService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportDao.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -458,14 +461,7 @@
       <workItem from="1735970618647" duration="252000" />
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
-      <workItem from="1736127959643" duration="38741000" />
-    </task>
-    <task id="LOCAL-00034" summary="忘记密码">
-      <created>1734923535021</created>
-      <option name="number" value="00034" />
-      <option name="presentableId" value="LOCAL-00034" />
-      <option name="project" value="LOCAL" />
-      <updated>1734923535021</updated>
+      <workItem from="1736127959643" duration="41215000" />
     </task>
     <task id="LOCAL-00035" summary="简报">
       <created>1734938692187</created>
@@ -803,7 +799,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736302676129</updated>
     </task>
-    <option name="localTasksCounter" value="83" />
+    <task id="LOCAL-00083" summary="微信移动端支付">
+      <created>1736307147621</created>
+      <option name="number" value="00083" />
+      <option name="presentableId" value="LOCAL-00083" />
+      <option name="project" value="LOCAL" />
+      <updated>1736307147621</updated>
+    </task>
+    <option name="localTasksCounter" value="84" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/ResearchBriefReportControllerApi.java

@@ -5,6 +5,7 @@ import com.jeesite.common.collect.MapUtils;
 import com.jeesite.common.entity.Page;
 import com.jeesite.modules.report.entity.ResearchBriefReport;
 import com.jeesite.modules.report.entity.ResearchBriefReportLabel;
+import com.jeesite.modules.report.service.ResearchBriefReportLabelRelevancyService;
 import com.jeesite.modules.report.service.ResearchBriefReportService;
 import com.jeesite.modules.sys.utils.R;
 import io.swagger.annotations.Api;
@@ -25,6 +26,8 @@ import java.util.Map;
 public class ResearchBriefReportControllerApi {
     @Resource
     private ResearchBriefReportService researchBriefReportService;
+    @Resource
+    private ResearchBriefReportLabelRelevancyService relevancyService;
 
     /**
      * 简报智库分页列表
@@ -78,7 +81,7 @@ public class ResearchBriefReportControllerApi {
             ResearchBriefReport query = new ResearchBriefReport();
             query.setNotId(vo.getId());
             query.setMarketType(vo.getMarketType());
-            query.setTopLabelId(vo.getTopLabelId());
+            query.setSecondLabelIds(relevancyService.findByReport(vo.getId()));
             query.setPublishDateEnd(vo.getPublishDate());
             list = researchBriefReportService.moreReportList(query);
         }

modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReport.java

@@ -67,6 +67,8 @@ public class ResearchBriefReport extends DataEntity<ResearchBriefReport> {
 
 	private String orderByStr = "create_date desc";
 
+	private List<String> secondLabelIds;		// 二级标签ids
+
 	private List<ResearchBriefReportLabelRelevancy> relevancies;
 
 	public ResearchBriefReport() {
@@ -290,4 +292,12 @@ public class ResearchBriefReport extends DataEntity<ResearchBriefReport> {
 	public void setFilePath(String filePath) {
 		this.filePath = filePath;
 	}
+
+	public List<String> getSecondLabelIds() {
+		return secondLabelIds;
+	}
+
+	public void setSecondLabelIds(List<String> secondLabelIds) {
+		this.secondLabelIds = secondLabelIds;
+	}
 }

modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelRelevancyService.java

@@ -1,6 +1,8 @@
 package com.jeesite.modules.report.service;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -70,4 +72,11 @@ public class ResearchBriefReportLabelRelevancyService extends CrudService<Resear
 	public long findAnyLableId(String id) {
 		return dao.findAnyLableId(id);
 	}
+
+	public List<String> findByReport(String reportId) {
+		ResearchBriefReportLabelRelevancy relevancy = new ResearchBriefReportLabelRelevancy();
+		relevancy.setResearchBriefReportId(reportId);
+		List<ResearchBriefReportLabelRelevancy> list = dao.findList(relevancy);
+		return list.stream().map(r -> r.getLableId()).collect(Collectors.toList());
+	}
 }

modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportDao.xml

@@ -37,6 +37,16 @@
             FROM research_brief_report_label_relevancy lr
             WHERE lr.research_brief_report_id = br.id AND lr.lable_id = #{rr.secondLabelId}))
         </if>
+        <if test="rr.secondLabelIds != null">
+            AND (EXISTS (
+            SELECT 1
+            FROM research_brief_report_label_relevancy lr
+            WHERE lr.research_brief_report_id = br.id AND lr.lable_id in
+            <foreach item="str" collection="rr.secondLabelIds" open="(" separator="," close=")">
+                #{str}
+            </foreach>
+            ))
+        </if>
         <if test="rr.useDownPay != null and rr.useDownPay != ''">and use_down_pay = #{rr.useDownPay}</if>
         <if test="rr.notId != null and rr.notId != ''">and id != #{rr.notId}</if>
         <if test="rr.useChoiceness != null and rr.useChoiceness != ''">and use_choiceness = #{rr.useChoiceness}</if>