Merge remote-tracking branch 'origin/master'

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java

@@ -572,8 +572,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 List<String> executionIds = new ArrayList<>();
                 executions.forEach(execution -> executionIds.add(execution.getId()));
                 runtimeService.createChangeActivityStateBuilder().moveExecutionsToSingleActivityId(executionIds, endId).processVariables(variables).changeState();
-                model.setFinishtime(System.currentTimeMillis());
-                ocrTaskchildPictureService.updateById(model);
+                OcrTaskchildPicture taskchildPicture = ocrTaskchildPictureService.getById(Long.parseLong(taskVO.getFormid()));
+                taskchildPicture.setFinishtime(System.currentTimeMillis());
+                ocrTaskchildPictureService.updateById(taskchildPicture);
             }
 
 

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java

@@ -230,7 +230,7 @@ public class OcrPictureController extends BaseController {
         queryWrapper.eq("tenant_id", tenantId);
         List<OcrPicture> pageList = ocrPictureService.listPage(queryWrapper);
         if (null != pageList && !pageList.isEmpty()) {
-                return ocrPictureService.createPackageTask(pageList, tenantId, userToken, search_month, req, buessinessno, paraMap);
+                return ocrPictureService.createTaskChild(pageList, tenantId, userToken, search_month, req, buessinessno);
         } else {
             return ResultVoUtil.error("没有查重数据。");
         }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java

@@ -501,21 +501,21 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         ocrTaskchildPicture.setFromprojectname(ocrPicture.getProjectidname());
         ocrTaskchildPicture.setFromusername(ocrPicture.getUpname());
 
-//		StringBuffer pcid = new StringBuffer();
-//		StringBuffer result = new StringBuffer();
-//		for(OcrPicture comp:ocrPicture.getListCom()){
-//			if(null == pcid || pcid.toString().length() < 1){
-//				pcid.append(comp.getId());
-//				result.append(comp.getResult());
-//			}else{
-//				pcid.append("," + comp.getId());
-//				result.append("," + comp.getResult());
-//			}
-//		}
-//
-//		ocrTaskchildPicture.setOcpictureid(pcid.toString());
-//		ocrTaskchildPicture.setPictureresult(result.toString());
-//		ocrTaskchildPicture.setPicturecompare(String.join(",",ocrPicture.getPicturecompareList()));
+		StringBuffer pcid = new StringBuffer();
+		StringBuffer result = new StringBuffer();
+		for(OcrPicture comp:ocrPicture.getListCom()){
+			if(null == pcid || pcid.toString().length() < 1){
+				pcid.append(comp.getId());
+				result.append(comp.getResult());
+			}else{
+				pcid.append("," + comp.getId());
+				result.append("," + comp.getResult());
+			}
+		}
+
+		ocrTaskchildPicture.setOcpictureid(pcid.toString());
+		ocrTaskchildPicture.setPictureresult(result.toString());
+		ocrTaskchildPicture.setPicturecompare(String.join(",",ocrPicture.getPicturecompareList()));
 
         return this.save(ocrTaskchildPicture) ? ocrTaskchildPicture : null;
     }