Merge remote-tracking branch 'origin/test' into test

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

@@ -1628,6 +1628,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             ocrTaskchildPictureApproVo.setProjectName(one.getFromprojectname());//项目名称
             ocrTaskchildPictureApproVo.setCustomerLevel(one.getFromCustomerLevel());//客户级别
             ocrTaskchildPictureApproVo.setReleaseArea(one.getFromCity());//拜访城市
+            ocrTaskchildPictureApproVo.setFromplanid(one.getFromplanid());//所属计划
             ocrTaskchildPictureApproVo.setTaskIndex(one.getTaskNodeIndex() == null ? one.getTasknode() : one.getTaskNodeIndex());
 
             listNew.add(ocrTaskchildPictureApproVo);

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

@@ -81,4 +81,7 @@ public class OcrTaskchildPictureApproVo implements java.io.Serializable {
 	@ApiModelProperty(value = "当前节点")
 	private String taskIndex;
 
+	@ApiModelProperty(value =  "所属计划")
+	private String fromplanid;
+
 }

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

@@ -507,6 +507,19 @@
                     </if>
                     ${izupuser.likeend}
                 </if>
+                <if test="izplan != null">
+                    ${izplan.rulesOp} tcp.FROMPLANID ${izplan.dataOp} ${izplan.likestar}
+                    <!--				#{fromuserid.value}-->
+                    <if test="izplan.value instanceof java.util.List">
+                        <foreach item="item" collection="izplan.value" open="" separator="," close="">
+                            #{item}
+                        </foreach>
+                    </if>
+                    <if test="!izplan.value instanceof java.util.List">
+                        #{izplan.value}
+                    </if>
+                    ${izplan.likeend}
+                </if>
                 <if test="iztaskrrom != null">
                     ${iztaskrrom.rulesOp} tcp.FROMSOURCEID ${iztaskrrom.dataOp} ${iztaskrrom.likestar}
                     <!--				#{fromuserid.value}-->