Merge pull request 'fix: 修改任务审批历史记录排序' (#123) from fix/updateFlow20240417 into test

Reviewed-on: #123

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

@@ -298,13 +298,14 @@ public class OcrTaskchildPictureController extends BaseController {
             @ApiImplicitParam(paramType = "path", name = "id", value = "当前选中的任务主键", required = true),
             @ApiImplicitParam(paramType = "path", name = "packageid", value = "任务包主键，注意不是当前任务关联的packageid，而是当前选中的任务包主键")
     })
-    @GetMapping("/getdata/{id}/{packageid}")
+    @GetMapping("/getdata/{id}/{packageid}/{taskNode}")
     @ResponseBody
     public ResultVo getdateOcrTaskchildPicture(HttpServletResponse response, HttpServletRequest request,
                                                @PathVariable("packageid") Long packageid,
+                                               @PathVariable("taskNode") String taskNode,
                                                @PathVariable("id") Long id) throws IOException {
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-        OcrTaskchildPicture dto = this.ocrTaskchildPictureService.listPicturePackageId(id.toString(), packageid, userToken);
+        OcrTaskchildPicture dto = this.ocrTaskchildPictureService.listPicturePackageId(id.toString(), packageid, userToken,taskNode);
         if (null != dto) {
             return ResultVoUtil.success(dto);
         } else {

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

@@ -69,7 +69,7 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
      * @param fromid 任务主键
      * @return
      */
-    public OcrTaskchildPicture listPicturePackageId(String fromid,Long packageid,UserToken userToken);
+    public OcrTaskchildPicture listPicturePackageId(String fromid,Long packageid,UserToken userToken,String taskNode);
     /**
      * 根据任务包主键，查询对应的任务信息
      * @param taskchildpictureid 当前显示的任务主键

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

@@ -110,7 +110,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
 
         StringBuffer taskType = new StringBuffer();
         for (String childpictureid : cps) {
-            OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid), null);
+            OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid), null,"");
 
             //如果是历史图片，不允许进行设置
 //			if(old.isIzHistory()){
@@ -380,13 +380,13 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
      * @param fromid 任务主键
      * @return
      */
-    public OcrTaskchildPicture listPicturePackageId(String fromid, Long packageid, UserToken userToken) {
+    public OcrTaskchildPicture listPicturePackageId(String fromid, Long packageid, UserToken userToken,String taskNode) {
         OcrTaskchildPicture ocrTaskchildPicture = this.getById(fromid);
         if (ocrTaskchildPicture == null) {
             return new OcrTaskchildPicture();
         }
         List<Userapprove> list = userapproveService.list(new LambdaQueryWrapper<Userapprove>().eq(Userapprove::getFormid, fromid));
-        Map<String, List<Userapprove>> collect = list.stream().collect(Collectors.groupingBy(Userapprove::getTaskname));
+        Map<String, List<Userapprove>> collect = list.stream().sorted(Comparator.comparing(Userapprove::getCreatedate)).collect(Collectors.groupingBy(Userapprove::getTaskname));
         List<UserapproveDto> userapproveDtos = new ArrayList<>();
         for (Map.Entry<String, List<Userapprove>> entry : collect.entrySet()) {
             UserapproveDto dto = new UserapproveDto();
@@ -396,7 +396,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         }
         ocrTaskchildPicture.setUserapproveList(userapproveDtos);
         if (null != userToken) {
-            Optional<Userapprove> first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid())).findFirst();
+            Optional<Userapprove> first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid()) && userapprove.getTaskindex().equals(taskNode)).findFirst();
             Userapprove userapprove = new Userapprove();
             userapprove.setStatshis(ocrTaskchildPicture.getStates()==3?2:ocrTaskchildPicture.getStates()==5?3:1);
             ocrTaskchildPicture.setUserapprove(first.orElse(userapprove));

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

@@ -795,7 +795,7 @@
                         t1.server_thumbnail_url     serverThumbnailUrl,
                         IF(EXISTS (SELECT STATSHIS
                                    FROM oa_userapprove_t
-                                   WHERE FORMID = t2.ID and STATSHIS = 3 and TASKINDEX = #{taskNode}), 3,
+                                   WHERE FORMID = t2.ID and STATSHIS = 3 and 'finale_judgment' = #{taskNode}), 3,
                            IFNULL((SELECT t3.STATSHIS
                                    FROM oa_userapprove_t t3
                                    WHERE t3.FORMID = t2.ID