微信移动端支付

.idea/workspace.xml

@@ -30,6 +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/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/ResearchBriefReportLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReportLabel.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/ResearchBriefReportLabelDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/resources/mappings/modules/report/ResearchBriefReportLabelDao.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -457,14 +461,7 @@
       <workItem from="1735970618647" duration="252000" />
       <workItem from="1735970895886" duration="8433000" />
       <workItem from="1736126123480" duration="510000" />
-      <workItem from="1736127959643" duration="16341000" />
-    </task>
-    <task id="LOCAL-00028" summary="修改密码">
-      <created>1734689905955</created>
-      <option name="number" value="00028" />
-      <option name="presentableId" value="LOCAL-00028" />
-      <option name="project" value="LOCAL" />
-      <updated>1734689905955</updated>
+      <workItem from="1736127959643" duration="21605000" />
     </task>
     <task id="LOCAL-00029" summary="新增市场概括">
       <created>1734748258157</created>
@@ -802,7 +799,14 @@
       <option name="project" value="LOCAL" />
       <updated>1736154267302</updated>
     </task>
-    <option name="localTasksCounter" value="77" />
+    <task id="LOCAL-00077" summary="微信移动端支付">
+      <created>1736155064589</created>
+      <option name="number" value="00077" />
+      <option name="presentableId" value="LOCAL-00077" />
+      <option name="project" value="LOCAL" />
+      <updated>1736155064589</updated>
+    </task>
+    <option name="localTasksCounter" value="78" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -894,7 +898,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserControllerApi.java</url>
-          <line>204</line>
+          <line>207</line>
           <option name="timeStamp" value="8" />
         </line-breakpoint>
       </breakpoints>

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

@@ -49,6 +49,18 @@ public class ResearchBriefReportControllerApi {
         return R.ok(researchBriefReportService.marketTypeList(label.getParentId()));
     }
 
+    /**
+     * 简报智库分类
+     *
+     * @return
+     */
+    @PostMapping(value = "/categoryPage")
+    @ApiOperation(value = "简报智库", notes = "简报智库类别")
+    public R<List<ResearchBriefReportLabel>> categoryPage() {
+        // 分类
+        return R.ok(researchBriefReportService.categoryPage());
+    }
+
     /**
      * 简报智库表单
      *

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

@@ -32,6 +32,8 @@ public class ResearchBriefReportLabel extends DataEntity<ResearchBriefReportLabe
 	private String parentName;
 	private List<ResearchBriefReportLabel> childList;
 
+	private String notParentId;
+
 	public ResearchBriefReportLabel() {
 		this(null);
 	}
@@ -89,4 +91,12 @@ public class ResearchBriefReportLabel extends DataEntity<ResearchBriefReportLabe
 	public void setChildList(List<ResearchBriefReportLabel> childList) {
 		this.childList = childList;
 	}
+
+	public String getNotParentId() {
+		return notParentId;
+	}
+
+	public void setNotParentId(String notParentId) {
+		this.notParentId = notParentId;
+	}
 }

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

@@ -271,4 +271,12 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 		List<ResearchBriefReport> list = dao.findList(where);
 		return convertImage(list);
 	}
+
+	public List<ResearchBriefReportLabel> categoryPage() {
+		ResearchBriefReportLabel label = new ResearchBriefReportLabel();
+		label.setPageNo(1);
+		label.setPageSize(20);
+		label.setNotParentId("0");
+		return researchBriefReportLabelDao.findPage(label);
+	}
 }

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

@@ -47,6 +47,9 @@
         <if test="info.parentId != null and info.parentId != ''">
             and a.parent_id = #{info.parentId}
         </if>
+        <if test="info.notParentId != null and info.notParentId != ''">
+            and a.parent_id != #{info.notParentId}
+        </if>
     </sql>
 
     <select id="findPageCount" resultType="java.lang.Long">
@@ -58,5 +61,6 @@
     <select id="findChildList" resultType="com.jeesite.modules.report.entity.ResearchBriefReportLabel">
         select * from research_brief_report_label a
         where a.status = '0' and a.parent_id != '0'
+        order by a.sort_num
     </select>
 </mapper>