添加作废归档流程

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -671,9 +671,18 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 其中采用数字函证发函数量
      */
-    @Excel(name = "其中采用数字函证发函数量(份)",width = 28,orderNum = "23")
+    @Excel(name = "其中采用数字函证发函数量(份)", width = 28, orderNum = "23")
     private String digitalLetterCount;
 
+
+
+    /**
+     * 归档状态
+     */
+    @TableField(exist = false)
+    private String archiveStatus;
+
+
     private Boolean exportFlag;
 
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -94,6 +94,7 @@
                         c.name AS departmentName,
                         d.name AS userName,
                         COALESCE(cw_pa.audit_money, 0) AS auditFees,
+                        cw_pa.status as archiveStatus,
                         e.name AS projectMasterName,
                         b.real_header AS projectMaster2Id,
                         b.project_classification,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/domain/CwProjectReportArchive.java

@@ -69,6 +69,12 @@ public class CwProjectReportArchive extends BaseEntity {
      */
     private String specialPlace;
 
+
+    /**
+     * 作废原因
+     */
+    private String voidReason;
+
     /**
      * 审核备注
      */
@@ -110,6 +116,16 @@ public class CwProjectReportArchive extends BaseEntity {
     private String processDefinitionId;
 
     /**
+     * 原始归档流程id
+     */
+    private String originProcInsId;
+
+    /**
+     * 原始归档流程信息
+     */
+    private String originProcessDefinitionId;
+
+    /**
      * 状态
      */
     @Query(tableColumn = "cw_pa.status",type = QueryType.EQ)

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -150,6 +150,8 @@
         cw_pa.audit_date,
         cw_pa.proc_ins_id,
         cw_pa.process_definition_id,
+        cw_pa.origin_proc_ins_id,
+        cw_pa.origin_process_definition_id,
         cw_pa.status,
         cw_pa.file_number,
         cw_pa.report_id,
@@ -472,7 +474,8 @@
         cw_pa.approved_including_tax as approvedIncludingTax,
         cw_pa.contract,
         cw_pa.entrust_type as entrustType,
-        cw_pa.approve_remarks as approveRemarks
+        cw_pa.approve_remarks as approveRemarks,
+        cw_pa.void_reason as voidReason
         from cw_project_report_archive cw_pa
         left join cw_project_report_new_line prnl on cw_pa.connect_report_id=prnl.report_id
         left join cw_project_report pr on cw_pa.report_id=pr.id
@@ -608,6 +611,12 @@
         <if test="processDefinitionId != null and processDefinitionId != ''">
             process_definition_id = #{processDefinitionId},
         </if>
+        <if test="procInsId != null and procInsId != ''">
+            origin_proc_ins_id = #{originProcInsId},
+        </if>
+        <if test="processDefinitionId != null and processDefinitionId != ''">
+            origin_process_definition_id = #{originProcessDefinitionId},
+        </if>
         <if test="status != null and status != ''">
             status = #{status},
         </if>
@@ -644,6 +653,9 @@
         <if test="entrustType != null and entrustType != ''">
             entrust_type = #{entrustType},
         </if>
+        <if test="voidReason != null and voidReason != ''">
+            void_reason = #{voidReason},
+        </if>
         update_by_id = #{updateById},
         update_time = #{updateTime}
         where id = #{id} ;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -420,26 +420,39 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
         if(StringUtils.isNotBlank(cwProjectReportArchiveDTO.getEntrustType())){
             cwProjectReportArchive.setEntrustType(cwProjectReportArchiveDTO.getEntrustType());
         }
+        //作废原因
+        if(StringUtils.isNotBlank(cwProjectReportArchiveDTO.getVoidReason())){
+            cwProjectReportArchive.setVoidReason(cwProjectReportArchiveDTO.getVoidReason());
+        }
+        //将流程id和流程信息放入原始字段中
+        if(StringUtils.isNotBlank(cwProjectReportArchiveDTO.getProcInsId()) && StringUtils.isBlank(cwProjectReportArchiveDTO.getOriginProcInsId()) ){
+            cwProjectReportArchive.setOriginProcInsId(cwProjectReportArchiveDTO.getProcInsId());
+        }else{
+            cwProjectReportArchive.setOriginProcInsId(cwProjectReportArchiveDTO.getOriginProcInsId());
+
+        }
+        if(StringUtils.isNotBlank(cwProjectReportArchiveDTO.getProcessDefinitionId()) && StringUtils.isBlank(cwProjectReportArchiveDTO.getOriginProcessDefinitionId()) ){
+            cwProjectReportArchive.setOriginProcessDefinitionId(cwProjectReportArchiveDTO.getProcessDefinitionId());
+        }else{
+            cwProjectReportArchive.setOriginProcessDefinitionId(cwProjectReportArchiveDTO.getOriginProcessDefinitionId());
+        }
+
 
         String signatureAnnotator1 = cwProjectReportArchiveDTO.getSignatureAnnotator1();
         String signatureAnnotator2 = cwProjectReportArchiveDTO.getSignatureAnnotator2();
         //修改签字注师
-        //if(StringUtils.isNotBlank(signatureAnnotator1) && StringUtils.isNotBlank(signatureAnnotator2) && StringUtils.isNotBlank(cwProjectReportArchiveDTO.getReportId())){
             CwProjectReport cwProjectReport = new CwProjectReport();
             cwProjectReport.setSignatureAnnotator1(signatureAnnotator1);
             cwProjectReport.setSignatureAnnotator2(signatureAnnotator2);
             cwProjectReport.setId(cwProjectReportArchiveDTO.getReportId());
             cwProjectReportMapper.updateById(cwProjectReport);
-        //}
         if(StringUtils.isNotBlank(cwProjectReportArchive.getId())){ //修改
             cwProjectReportArchiveMapper.updateInfoById(cwProjectReportArchive);
         }else{  //新增
             cwProjectReportArchiveMapper.insert(cwProjectReportArchive);
         }
-//        this.saveOrUpdate(cwProjectReportArchive);
         if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO)) {
             // 附件
-//            ossServiceMapper.delete(new QueryWrapper<WorkAttachment>().lambda().eq(WorkAttachment::getAttachmentId, cwProjectReportArchive.getId()));
             SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(cwProjectReportArchive.getId());
             AtomicInteger sort = new AtomicInteger(1);
             cwProjectReportArchiveDTO.getWorkAttachmentDtoList().stream().forEach(item->{
@@ -447,7 +460,6 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 workAttachmentDto.setName(item.getName());
                 workAttachmentDto.setSize(item.getSize());
                 workAttachmentDto.setUrl(item.getUrl());
-//                String fileId = ossService.saveFile(workAttachmentDto,userDTO, cwProjectReportArchive.getId(),"cw_project_report_archive",sort.get());
 
                 Map<String,String> map = new HashMap<>();
                 String workAttachmentDtoInfo = JSON.toJSONString(workAttachmentDto);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/dto/CwProjectReportArchiveDTO.java

@@ -98,6 +98,11 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     private String specialPlace;
 
     /**
+     * 作废原因
+     */
+    private String voidReason;
+
+    /**
      * 文档存放位置
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -200,6 +205,16 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
      * 流程信息
      */
     private String processDefinitionId;
+    /**
+     * 原始归档流程id
+     */
+    private String originProcInsId;
+
+    /**
+     * 原始归档流程信息
+     */
+    private String originProcessDefinitionId;
+
 
     /**
      * 状态