体系运行记录修改数据校验

ibps-bpmn-root/modules/bpmn-biz/src/main/java/com/lc/ibps/bpmn/service/impl/BpmFormServiceImpl.java

@@ -214,7 +214,9 @@ public class BpmFormServiceImpl implements BpmFormService {
 
 	@Override
 	public 	Map<String, Object> getFormOpinion(String defId,String instId, String userId){
-		List<IBpmTaskApproval> list = 	bpmApprovalService.findApprovalHisIgnoreFirstSkip(instId, userId);
+		// List<IBpmTaskApproval> list = 	bpmApprovalService.findApprovalHisIgnoreFirstSkip(instId, userId);
+		// 修改 ： 把跳过节点的意见已查询出来
+		List<IBpmTaskApproval> list = 	bpmApprovalService.findApprovalHis(instId, userId);
 		//List<IBpmTaskApproval> opinionList = handleBatchTaskApproval(list);
 		List<ProcFormOpinion> formOpinionList= this.getFormOpinions(defId);
 		// 审批意见

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/service/PatchService.java

@@ -10,6 +10,7 @@ import com.lc.ibps.base.framework.table.ICommonDao;
 import com.lc.ibps.base.web.context.ContextUtil;
 import com.lc.ibps.bpmn.api.cmd.TaskFinishCmd;
 import com.lc.ibps.bpmn.persistence.entity.BpmApprovePo;
+import com.lc.ibps.bpmn.persistence.entity.BpmApproveTbl;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.cloud.file.provider.UploadProvider;
 import com.lc.ibps.common.file.persistence.entity.AttachmentPo;
@@ -26,10 +27,7 @@ import javax.annotation.Resource;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.Future;
 
 @Service
@@ -99,12 +97,14 @@ public class PatchService {
     private void updateBpmApprovePo(List<BpmApprovePo> approvals){
         Date t = null;
         String id = null;
+        approvals.sort(Comparator.comparing(BpmApproveTbl::getId));
         for (BpmApprovePo po :approvals) {
             id = po.getProcInstId();
             if(po.getCompleteTime()==null ||StringUtils.isAnyBlank(po.getId(),po.getTaskKey(),po.getProcInstId())){
                 throw new RuntimeException("必选栏位不能为空");
             }
-            if(po.getDurMs() != null && po.getDurMs() <1000*10){
+            if(po.getTaskName() != null && po.getDurMs() ==0){
+                // 发起节点
                 continue;
             }
             if(t == null) {