产业供地 附件取最新

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

@@ -426,61 +426,71 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         //补充附件
         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());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.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());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.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) {
-            FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), attachments.get(0).getDownload_uri());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
             entity.setCommerce_leader_pre_approve_file(fileDown);
         }
         //管委会分管领导附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_MANAGEMENT_COMMITTEE_LEADER, 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());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
             entity.setCommittee_leader_pre_approve_file(fileDown);
         }
         //分发汇总附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE_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());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
             entity.setDistribution_summary_file(fileDown);
         }
         //专题会审附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_JOINT_TRIAL, 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());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
             entity.setJoint_trial_file(fileDown);
         }
         //供地审批附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_APPROVE, 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());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
             entity.setLand_supply_file(fileDown);
         }
         //最终信息附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_FINAL, 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());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
             entity.setFinal_file(fileDown);
         }
         //行政反馈附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_GS, 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());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
             entity.setGs_feedback_file(fileDown);
         }
         //会签附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_MANAGEMENT_COMMITTEE_LEADER_COUNTERSIGN, 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());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
             entity.setCountersign_file(fileDown);
         }
         //状态详情
@@ -772,7 +782,8 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         //补充附件
         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());
+            Attachment attachment = attachments.get(attachments.size() - 1);
+            FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
             entity.setSupplement_file(fileDown);
         }
         if (null != entity.getApprove_status()) {
@@ -4026,7 +4037,8 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
             for (IndustrialLandSupplyDistribution landSupplyDistribution : industrialLandSupplyDistributionList) {
                 attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE, landSupplyDistribution.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());
+                    Attachment attachment = attachments.get(attachments.size() - 1);
+                    FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
                     fileDownList.add(fileDown);
                 }
             }

src/main/resources/templates/admin/government/industrial_land_supply/index.html

@@ -137,7 +137,7 @@
 
                                 <a title="编辑" href="javascript:;" class="ml-5" style="text-decoration:none"
                                    th:onclick="'javascript:jump_to(\'编辑\',\'/land_supply/edit/'+*{id}+'\');'"
-                                   th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9'  || approve_status=='22'}">编辑</a>
+                                   th:if="*{approve_status=='1' || approve_status=='3' || approve_status=='4' || approve_status=='5' || approve_status=='9' || approve_status=='22'}">编辑</a>
 
                             </th:block>