Просмотр исходного кода

产业供地重复的附件先逻辑删除旧的

ZHIHAO HU 4 лет назад
Родитель
Сommit
9fd063cc25

+ 5 - 0
src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -3869,6 +3869,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         if (Objects.equals(approval.getType(), "1")) {
             //商务领导审核附件
             if (null != approval.getFileDown() && null != approval.getFileDown().getFile_id()) {
+                attachmentService.deleteByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_COMMERCE_LEADER, approval.getApply_id(), null);
                 attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_COMMERCE_LEADER, approval.getApply_id(), approval.getFileDown().getFile_id());
             }
             industrialLandSupplyDetail.setCommerce_leader_pre_approve_comment(approval.getApproval_comment());
@@ -3885,9 +3886,11 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         } else if (Objects.equals(approval.getType(), "2")) {
             //管委会领导审核附件
             if (null != approval.getFileDown() && null != approval.getFileDown().getFile_id()) {
+                attachmentService.deleteByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_MANAGEMENT_COMMITTEE_LEADER, approval.getApply_id(), null);
                 attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_MANAGEMENT_COMMITTEE_LEADER, approval.getApply_id(), approval.getFileDown().getFile_id());
             }
             if (null != approval.getCountersign_file() && null != approval.getCountersign_file().getFile_id()) {
+                attachmentService.deleteByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_MANAGEMENT_COMMITTEE_LEADER_COUNTERSIGN, approval.getApply_id(), null);
                 attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_MANAGEMENT_COMMITTEE_LEADER_COUNTERSIGN, approval.getApply_id(), approval.getCountersign_file().getFile_id());
             }
             industrialLandSupplyDetail.setCommittee_leader_pre_approve_comment(approval.getApproval_comment());
@@ -3905,6 +3908,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         } else if (Objects.equals(approval.getType(), "3")) {
             //管委会领导审核附件
             if (null != approval.getFileDown() && null != approval.getFileDown().getFile_id()) {
+                attachmentService.deleteByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_APPROVE, approval.getApply_id(), null);
                 attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_APPROVE, approval.getApply_id(), approval.getFileDown().getFile_id());
             }
             industrialLandSupplyDetail.setLand_supply_comment(approval.getApproval_comment());
@@ -3921,6 +3925,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
         } else if (Objects.equals(approval.getType(), "4")) {
             //管委会领导审核附件
             if (null != approval.getFileDown() && null != approval.getFileDown().getFile_id()) {
+                attachmentService.deleteByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_FINAL, approval.getApply_id(), null);
                 attachmentService.updateAttachment(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_FINAL, approval.getApply_id(), approval.getFileDown().getFile_id());
             }
             industrialLandSupplyDetail.setFinal_comment(approval.getApproval_comment());