ソースを参照

资料关联台账,同步到task附件表

qianxb 1 年間 前
コミット
1a83048bd5

+ 6 - 0
blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/AttachmentFormTask.java

@@ -53,6 +53,12 @@ public class AttachmentFormTask extends BaseEntity {
      */
     @ApiModelProperty(value = "中间计量申请专用字段 1中间计量附件,2变更令附件")
     private Integer fileType;
+    /**
+     * 中间计量申请专用字段 质检文件的Id(query)
+     */
+    @ApiModelProperty(value = "中间计量申请专用字段 质检文件的Id(query)")
+    private Long selectId;
+
 
 
 }

+ 1 - 1
blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.xml

@@ -372,7 +372,7 @@
         </foreach>
     </select>
     <select id="getTaskInfo" resultType="org.springblade.business.entity.Task">
-        select * from u_task WHERE contract_id = #{contractId} and  form_data_id = id and is_deleted = 0
+        select * from u_task WHERE contract_id = #{contractId} and  form_data_id = #{id} and status = 2  and is_deleted = 0
     </select>
     <select id="getWbsLinkFileTotal" resultType="java.lang.Integer">
         select count(1) from s_attachment_form where contract_id = #{contractId} and master_id = #{id} and select_id is not null and is_deleted = 0

+ 12 - 0
blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MiddleMeterApplyServiceImpl.java

@@ -81,6 +81,8 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
 
     private final MeterContractInfoService meterContractInfoService;
 
+    private final IAttachmentFormServiceTask attachmentFormServiceTask;
+
 
 
     /**
@@ -1013,6 +1015,7 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
         List<AttachmentForm> files = new ArrayList<>();
         for (InformationQuery query : list) {
             AttachmentForm form = new AttachmentForm();
+            form.setId(SnowFlakeUtil.getId());
             form.setFileType(1);
             form.setProjectId(apply.getProjectId());
             form.setContractId(apply.getContractId());
@@ -1033,11 +1036,20 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
         }
         //保存附件
         attachmentFormService.saveBatch(files);
+        //为task附件表同步附件
+        List<AttachmentFormTask> taskList = files.stream().map(l -> {
+            AttachmentFormTask formTask = new AttachmentFormTask();
+            BeanUtils.copyProperties(l, formTask);
+            formTask.setTaskId(task.getId());
+            return formTask;
+        }).collect(Collectors.toList());
+        attachmentFormServiceTask.saveBatch(taskList);
         //修改中间计量申请的关联状态
         this.update(new LambdaUpdateWrapper<MiddleMeterApply>()
                 .eq(MiddleMeterApply::getId,id)
                 .set(MiddleMeterApply::getIsLinkData,1));
 
+
     }
 
     /**