广药子流程update 撤销提交记录过滤

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TFFlowLog.java

@@ -62,6 +62,7 @@ public class TFFlowLog extends BaseEntity implements Serializable {
     private String pendApproveId;
 
     @ApiModelProperty(value = "试卷附件")
+    @TableField(value = "paper_attachment_id", updateStrategy = FieldStrategy.IGNORED)
     private String paperAttachmentId;
 
     public TFFlowLog() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -1135,17 +1135,23 @@ public class ActivitiServiceImpl implements ActivitiService {
         FlowApproveVariableEnum approve = approvePass == FlowApprovePassEnum.PASS ? FlowApproveVariableEnum.PRIMARY_APPROVE : FlowApproveVariableEnum.PRIMARY_REJECT;
 
         tfFlowLog.setApproveSetup(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup());
-        if (Objects.nonNull(flowApprovePassEnum) && flowApprovePassEnum == FlowApprovePassEnum.CANCEL) {
-            tfFlowApproveLog.setPrimaryApproveId(approveCancelUserId);
-        } else {
-            tfFlowApproveLog.setPrimaryApproveId(sysUser.getId());
-        }
+        tfFlowApproveLog.setPrimaryApproveId(sysUser.getId());
         tfFlowApproveLog.setPrimaryApproveRemark(remark);
         if (approve == FlowApproveVariableEnum.PRIMARY_REJECT) {//驳回命题
             if (Objects.nonNull(flowApprovePassEnum) && flowApprovePassEnum == FlowApprovePassEnum.CANCEL) {
                 tfFlowLog.setApproveOperation(FlowApproveOperationEnum.CANCEL);
                 tfFlowApproveLog.setPrimaryApproveOperation(FlowApproveOperationEnum.CANCEL);
                 tfFlowApprove.setStatus(FlowStatusEnum.CANCEL);
+                tfFlowLog.setEnable(false);
+
+//                List<TFFlowLog> tfFlowLogList = tfFlowLogService.findByFlowId(Long.parseLong(task.getProcessInstanceId()), sysUser.getSchoolId());
+                UpdateWrapper<TFFlowLog> tfFlowLogUpdateWrapper = new UpdateWrapper<>();
+                tfFlowLogUpdateWrapper.lambda().eq(TFFlowLog::getApproveOperation, FlowApproveOperationEnum.SUBMIT)
+                        .eq(TFFlowLog::getFlowId, Long.parseLong(task.getProcessInstanceId()))
+//                        .set(TFFlowLog::getPaperAttachmentId, null);
+                        .set(TFFlowLog::getEnable, false);
+                tfFlowLogService.update(tfFlowLogUpdateWrapper);
+//                tfFlowLogService.removeByIds(tfFlowLogList.stream().map(s -> s.getId()).collect(Collectors.toList()));
             } else {
                 tfFlowLog.setApproveOperation(FlowApproveOperationEnum.REJECT);
                 tfFlowApproveLog.setPrimaryApproveOperation(FlowApproveOperationEnum.REJECT);

distributed-print-business/src/main/resources/mapper/TFFlowLogMapper.xml

@@ -37,6 +37,7 @@
             so.id = su.org_id
         where
             tffl.task_id = #{taskId}
+            and tffl.enable = 1
         order by
             tffl.create_time desc
     </select>