活动 内容 产业供地部分bug修复

src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -424,18 +424,18 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             }
             entity.setFileList(fileList);
         }
-        //汇总附件
-        attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_SUMMARY, entity.getId(), null);
-        if (null != attachments && attachments.size() > 0) {
-            FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), attachments.get(0).getDownload_uri());
-            entity.setConsultation_summary_file(fileDown);
-        }
         //补充附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_COMMERCE_SUPPLEMENT, entity.getId(), null);
         if (null != attachments && attachments.size() > 0) {
             FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), attachments.get(0).getDownload_uri());
             entity.setSupplement_file(fileDown);
         }
+        //汇总附件
+        attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_SUMMARY, entity.getId(), null);
+        if (null != attachments && attachments.size() > 0) {
+            FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), attachments.get(0).getDownload_uri());
+            entity.setConsultation_summary_file(fileDown);
+        }
         //商务局分管领导附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_COMMERCE_LEADER, entity.getId(), null);
         if (null != attachments && attachments.size() > 0) {
@@ -759,6 +759,12 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), attachments.get(0).getDownload_uri());
             entity.setFileDown(fileDown);
         }
+        //补充附件
+        attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_COMMERCE_SUPPLEMENT, entity.getId(), null);
+        if (null != attachments && attachments.size() > 0) {
+            FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), attachments.get(0).getDownload_uri());
+            entity.setSupplement_file(fileDown);
+        }
         if (null != entity.getApprove_status()) {
             String status_name = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.INDUSTRIAL_LAND_SUPPLY_APPROVE_STATUS, entity.getApprove_status());
             entity.setApprove_status_desc(status_name);

src/main/resources/mapper/sys/ActivityFeedbackDao.xml

@@ -34,7 +34,7 @@
          from ac_activity_feedback af
          left join ac_activity_detail ad on ad .id = af.activity_id
          where
-         af.del_flag = false AND af.feedback_type != 0
+         af.del_flag = 0 <!-- AND af.feedback_type != 0 -->
          <if test="query.is_front!= null and query.is_front != ''">
              and af.approval_status = 1
          </if>
@@ -48,7 +48,7 @@
              and af.approval_status = #{query.approval_status}
          </if>
          <if test="query.activity_title != null and query.activity_title != ''">
-             and ad.activity_title = #{query.activity_title}
+             and ad.activity_title LIKE CONCAT('%',#{query.activity_title},'%')
          </if>
          ORDER BY af.create_time DESC
      </select>

src/main/resources/mapper/sys/ActivityRegistrationDao.xml

@@ -157,6 +157,7 @@
             reg.del_flag = 0
             AND reg.activity_id = #{activityId}
             AND reg.review_state != 3
+            AND reg.review_state != 2
     </select>
 
     <select id="findMyActivityPage" parameterType="platform.modules.sys.entity.ActivityRegistration"

src/main/resources/templates/admin/government/activity_feedback/list.html

@@ -279,7 +279,7 @@
         for(var i=0; i<list.length; i++){
             html += '<li class="clearfix" >' +
                     '<div class="comments-info">'+list[i].content+'</div>' +
-                    '<div class="activity-info">'+
+                    '<div class="activity-info" style="float: right;">'+
                         '<p>活动名称：'+list[i].activity_title+'</p>';
 
             if(list[i].feedback_type === 0){

src/main/resources/templates/admin/government/content_check.html

@@ -44,8 +44,8 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span >置顶：</span></label>
             <div class="formControls col-xs-8 col-sm-9">
-                <span  th:if="${content.is_top }" >否</span>
-                <span  th:unless="${content.is_top}"  >是</span>
+                <span  th:unless="${content.is_top }" >否</span>
+                <span  th:if="${content.is_top}"  >是</span>
             </div>
         </div>
         <div class="row cl">