fix: 任务审批列表及详情

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

@@ -1509,6 +1509,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             ocrTaskchildPictureApproVo.setProjectName(one.getFromprojectname());//项目名称
             ocrTaskchildPictureApproVo.setCustomerLevel(one.getFromCustomerLevel());//客户级别
             ocrTaskchildPictureApproVo.setReleaseArea(one.getFromCity());//拜访城市
+            ocrTaskchildPictureApproVo.setTaskIndex(one.getTaskIndex()==null?"1":one.getTaskIndex());
 
             listNew.add(ocrTaskchildPictureApproVo);
         }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java

@@ -199,4 +199,7 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable {
 	@ApiModelProperty(value = "是否重复")
 	private Integer isRepeat;
 
+	@ApiModelProperty(value = "当前节点")
+	private String taskIndex;
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java

@@ -83,4 +83,7 @@ public class OcrTaskchildPictureApproVo implements java.io.Serializable {
 	@ApiModelProperty(value ="任务包主键")
 	private String packageid;
 
+	@ApiModelProperty(value = "当前节点")
+	private String taskIndex;
+
 }

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

@@ -627,6 +627,7 @@
                uf.TASKNAME            as TASKNAMEHIS,
                uf.STATSHIS,
                uf.TASKNO,
+               uf.TASKINDEX,
 
                op.field6              as fromCustomerLevel,
                op.releaseArea         as fromCity,
@@ -646,7 +647,7 @@
                 )
         </if>
         UNION
-        select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat, tc.is_repeated_nodules as isRepeatedNodules
+        select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.TASKINDEX,uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat, tc.is_repeated_nodules as isRepeatedNodules
         from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op
         where tc.ID = uf.FORMID
           and tc.PICTUREID = op.ID