Browse Source

微信移动端支付

guomengjiao 5 months ago
parent
commit
6d06c9f15b

+ 11 - 10
.idea/workspace.xml

@@ -30,6 +30,7 @@
   <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/ResearchBriefReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -91,7 +92,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../university-management-system/laboratory-curriculum-java" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../maintenance-support/maintenance-support-java" />
     <property name="project.structure.last.edited" value="SDKs" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.25287357" />
@@ -457,14 +458,7 @@
       <workItem from="1735970618647" duration="252000" />
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
-      <workItem from="1736127959643" duration="24677000" />
-    </task>
-    <task id="LOCAL-00030" summary="简报分类">
-      <created>1734754137763</created>
-      <option name="number" value="00030" />
-      <option name="presentableId" value="LOCAL-00030" />
-      <option name="project" value="LOCAL" />
-      <updated>1734754137764</updated>
+      <workItem from="1736127959643" duration="30936000" />
     </task>
     <task id="LOCAL-00031" summary="简报">
       <created>1734765445609</created>
@@ -802,7 +796,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736214523167</updated>
     </task>
-    <option name="localTasksCounter" value="79" />
+    <task id="LOCAL-00079" summary="微信移动端支付">
+      <created>1736218026787</created>
+      <option name="number" value="00079" />
+      <option name="presentableId" value="LOCAL-00079" />
+      <option name="project" value="LOCAL" />
+      <updated>1736218026787</updated>
+    </task>
+    <option name="localTasksCounter" value="80" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

+ 1 - 1
modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java

@@ -218,7 +218,7 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 			ResearchBriefReport fileObj = convertFile(r.getId(), Constants.briefReport.BRIEFING_INFO_IMAGE);
 			r.setImageFileName(fileObj.getFileName());
 			r.setFilePath(fileObj.getFilePath());
-			r.setTopLabelName(researchBriefReportLabelRelevancyDao.findNames(r.getId(), 1));
+			convertList(r);
 			return r;
 		}).collect(Collectors.toList());
 	}