Merge remote-tracking branch 'origin/master'

src/main/java/com/lightinit/hsdataportal/impl/BusinessIncubationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.lightinit.hsdataportal.impl;
 
+import com.lightinit.hsdataportal.dictionary.DicPublishApiState;
 import com.lightinit.hsdataportal.entity.Roadshow;
 import com.lightinit.hsdataportal.entity.RoadshowRequirement;
 import com.lightinit.hsdataportal.entity.RoadshowRequirementWithBLOBs;
@@ -41,6 +42,7 @@ public class BusinessIncubationServiceImpl implements IBusinessIncubationService
         DynamicDataContextHolder.setCustomerType(DynamicDataContextHolder.DEFAULT);
         RoadshowWithBLOBs roadshowWithBLOBs = new RoadshowWithBLOBs();
         BeanUtils.copyProperties(roadshowAddModel,roadshowWithBLOBs);
+        roadshowWithBLOBs.setRoadshowState(DicPublishApiState.PENDING);
         ResultState resultState = new ResultState();
         int result = 0;
         result  = roadshowMapper.insert(roadshowWithBLOBs);

src/main/java/com/lightinit/hsdataportal/model/RoadshowAddModel.java

@@ -20,9 +20,11 @@ public class RoadshowAddModel {
     @NotNull
     @FieldDescriber(descripton = "融资金额")
     private BigDecimal financingAmount;
-
+    @NotEmpty()
+    @FieldDescriber(descripton = "项目阶段")
     private String projectPhase;
-
+    @NotEmpty()
+    @FieldDescriber(descripton = "行业领域")
     private String tradeField;
     @NotEmpty()
     @FieldDescriber(descripton = "标签")

src/main/resources/sqlmaps/OfflineConferenceMapper.xml

@@ -480,7 +480,7 @@
   <select id="queryOpenList" parameterType="com.lightinit.hsdataportal.model.OfflineConferenceSearchModel" resultType="com.lightinit.hsdataportal.model.OfflineConferenceListModel">
    SELECT oc.id,r.resource_name,oc.requirement,oc.usages,oc.contact,oc.phone,oc.order_state
     FROM offline_conference oc
-    JOIN publish_setting ps
+    left JOIN publish_setting ps
     ON ps.id = oc.publish_setting_id
     LEFT JOIN publish_info pi
     ON  pi.id = ps.publish_info_id
@@ -488,9 +488,9 @@
     ON r.id = pi.resource_id
     WHERE oc.user_id = #{userId}
     ORDER BY oc.id DESC
-    <if test="page != null">
-      LIMIT #{page.beginIndex},#{page.pageSize}
-    </if>
+<!--    <if test="page != null">-->
+<!--      LIMIT #{page.beginIndex},#{page.pageSize}-->
+<!--    </if>-->
   </select>
   <select id="queryOpenCount" parameterType="com.lightinit.hsdataportal.model.OfflineConferenceSearchModel" resultType="java.lang.Long">
     SELECT count(*)

src/main/resources/sqlmaps/RoadshowMapper.xml

@@ -579,8 +579,9 @@
 
     SELECT r.id ,r.roadshow_name,r.roadshow_intro,r.thumbnail FROM `roadshow` r
     <where>
+        r.roadshow_state = '审核通过'
       <if test="projectPhase !=null and projectPhase !='' and projectPhase !='不限'">
-        r.project_phase = #{projectPhase}
+        and r.project_phase = #{projectPhase}
       </if>
       <if test="tradeField !=null and tradeField !='' and tradeField !='不限'">
        and r.trade_field = #{tradeField}
@@ -595,8 +596,9 @@
 
     SELECT count(*) FROM `roadshow` r
     <where>
+      r.roadshow_state = '审核通过'
       <if test="projectPhase !=null and projectPhase !='' and projectPhase !='不限'">
-        r.project_phase = #{projectPhase}
+        and r.project_phase = #{projectPhase}
       </if>
       <if test="tradeField !=null and tradeField !='' and tradeField !='不限'">
       and  r.trade_field = #{tradeField}