支付宝移动端支付

.idea/workspace.xml

@@ -29,10 +29,6 @@
   </component>
   <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/dao/ResearchBriefReportLabelRelevancyDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/dao/ResearchBriefReportLabelRelevancyDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabelRelevancy.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabelRelevancy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportLabelRelevancyDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportLabelRelevancyDao.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -458,14 +454,7 @@
       <workItem from="1734579234738" duration="258000" />
       <workItem from="1734579502121" duration="1272000" />
       <workItem from="1734658594781" duration="126472000" />
-      <workItem from="1735184825354" duration="15490000" />
-    </task>
-    <task id="LOCAL-00001" summary="1">
-      <created>1676368709673</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1676368709673</updated>
+      <workItem from="1735184825354" duration="15815000" />
     </task>
     <task id="LOCAL-00002" summary="1">
       <created>1676368733682</created>
@@ -803,7 +792,14 @@
       <option name="project" value="LOCAL" />
       <updated>1735206001200</updated>
     </task>
-    <option name="localTasksCounter" value="50" />
+    <task id="LOCAL-00050" summary="支付宝移动端支付">
+      <created>1735207434638</created>
+      <option name="number" value="00050" />
+      <option name="presentableId" value="LOCAL-00050" />
+      <option name="project" value="LOCAL" />
+      <updated>1735207434639</updated>
+    </task>
+    <option name="localTasksCounter" value="51" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -886,6 +882,15 @@
     <option name="LAST_COMMIT_MESSAGE" value="支付宝移动端支付" />
   </component>
   <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java</url>
+          <line>77</line>
+          <option name="timeStamp" value="44" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
     <watches-manager>
       <configuration name="SpringBootApplicationConfigurationType">
         <watch expression="query" />

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

@@ -64,13 +64,19 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 		Page page = new Page(researchBriefReport.getPageNo(),researchBriefReport.getPageSize());
 		long count = dao.findResearchBriefReportCount(researchBriefReport);
 		List<ResearchBriefReport> list = dao.findResearchBriefReportList(researchBriefReport);
-		list = list.stream().map(r -> convert(r)).collect(Collectors.toList());
+		list = list.stream().map(r -> convertList(r)).collect(Collectors.toList());
 		page.setCount(count);
 		page.setList(list);
 		page.initialize();
 		return page;
 	}
 
+	private ResearchBriefReport convertList(ResearchBriefReport r) {
+		r.setTopLabelName(researchBriefReportLabelRelevancyDao.findNames(r.getId(), 1));
+		r.setSecondLabelName(researchBriefReportLabelRelevancyDao.findNames(r.getId(), 2));
+		return r;
+	}
+
 	private ResearchBriefReport convert(ResearchBriefReport r) {
 		ResearchBriefReportLabelRelevancy where = new ResearchBriefReportLabelRelevancy();
 		where.setResearchBriefReportId(r.getId());
@@ -238,7 +244,7 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 		List<ResearchBriefReport> list = dao.findResearchBriefReportList(researchBriefReport);
 		list = list.stream().map(r -> {
 			r.setImageFileName(convertFile(r.getId(), Constants.briefReport.BRIEFING_INFO_IMAGE));
-			return convert(r);
+			return convertList(r);
 		}).collect(Collectors.toList());
 		page.setList(list);
 		long total = dao.findResearchBriefReportCount(researchBriefReport);

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

@@ -32,7 +32,7 @@
 			resultType="com.jeesite.modules.report.entity.ResearchBriefReportLabelRelevancy">
 		select lr.*, rl.name lableName from research_brief_report_label_relevancy lr
 		left join research_brief_report_label rl on rl.id = lr.lable_id
-		where lr.research_brief_report_id = #{relevancy.id}
+		where lr.research_brief_report_id = #{relevancy.researchBriefReportId}
 	</select>
 
 	<delete id="deleteResearchBriefReportId">