重新审核页面添加流程信息图表

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -640,8 +640,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 
             } else {
                 if (!"yes".equals(flag)) {//报告驳回待办提醒
-                    str = "项目【"+ projectRecords.getProjectName()+"】新增报告被驳回";
-                    title = "项目【"+ projectRecords.getProjectName()+"】新增报告被驳回，请选择重新申请或删除报告";
+                    title = "项目【"+ projectRecords.getProjectName()+"】新增报告被驳回";
+                    str = "项目【"+ projectRecords.getProjectName()+"】新增报告被驳回，请选择重新申请或删除报告";
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(projectReportData.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -3342,14 +3342,14 @@ public class WorkProjectNotifyController extends BaseController {
 			if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
 				//修改工作内容中的信息（将工作内容的info_id清空）
 				ruralProjectMessageService.updateProjectcontentinfo(projectcontentinfo1);
-				//删除报告信息
-				ruralProjectMessageService.deleteReport(projectReportData);
 				//删除流程表信息
 				workProjectNotifyService.deleteActivityProcess(projectReportData.getProcessInstanceId());
 				//删除流程人员表信息
 				workProjectNotifyService.deleteActivityProcessUser(projectReportData.getProcessInstanceId());
 				//删除流程待办信息
 				workProjectNotifyService.deleteByNotifyId(workProjectNotify);
+				//删除报告信息
+				ruralProjectMessageService.deleteReport(projectReportData);
 				map.put("code",1);
 				map.put("msg","新增报告删除成功");
 			}else{

src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp

@@ -392,6 +392,13 @@
                     </table>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${oaNotify.act.procInsId}"/>
+                    <act:histoicFlow procInsId="${oaNotify.act.procInsId}"/>
+                </div>
+            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

src/main/webapp/webpage/modules/processProjectReportRecord/projectReportRecordModifyApply.jsp

@@ -268,6 +268,13 @@
 					</table>
 				</div>
 			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
+					<act:histoicFlow procInsId="${projectReportRecord.act.procInsId}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordModifyApply.jsp

@@ -447,7 +447,13 @@
 					</table>
 				</div>
 			</div>
-
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
+					<act:histoicFlow procInsId="${projectReportRecord.act.procInsId}"/>
+				</div>
+			</div>
 			<%--<div class="form-group layui-row">
 				<div class="form-group-label"><h2>附件信息</h2></div>
 				<div class="layui-item nav-btns">

src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp

@@ -808,6 +808,13 @@
                     </table>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${processInstanceId}"/>
+                    <act:histoicFlow procInsId="${processInstanceId}"/>
+                </div>
+            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workFollowModify.jsp

@@ -866,6 +866,13 @@
                     </table>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${processInstanceId}"/>
+                    <act:histoicFlow procInsId="${processInstanceId}"/>
+                </div>
+            </div>
         </form:form>
     </div>
 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -167,6 +167,7 @@
 			<form:hidden path="numberCount"/>
 			<form:hidden id="reportId" path="report.id"/>
 			<form:hidden path="report.name"/>
+			<form:hidden path="report.project.id"/>
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordModify.jsp

@@ -192,6 +192,7 @@
 			<form:hidden path="numberCount"/>
 			<form:hidden id="reportId" path="report.id"/>
 			<form:hidden path="report.name"/>
+			<form:hidden path="report.project.id"/>
 			<input type="hidden" name="saveAuditFlag" value="1">
 
 			<div class="form-group layui-row first lw12">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -1214,6 +1214,13 @@
                     </table>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${processInstanceId}"/>
+                    <act:histoicFlow procInsId="${processInstanceId}"/>
+                </div>
+            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp

@@ -983,6 +983,13 @@
                 </div>
             </div>
 
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
+                    <act:histoicFlow procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
+                </div>
+            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -975,6 +975,13 @@
                     </div>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
+                    <act:histoicFlow procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
+                </div>
+            </div>
 
             <div class="form-group layui-row page-end"></div>
         </form:form>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -957,6 +957,13 @@
 			</div>
 		</div>
 
+		<div class="form-group layui-row">
+			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="layui-item layui-col-xs12 form-table-container" >
+				<act:flowChart procInsId="${workContractInfo.act.procInsId}"/>
+				<act:histoicFlow procInsId="${workContractInfo.act.procInsId}"/>
+			</div>
+		</div>
 	</form:form>
 	</div>
 	<script>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -226,6 +226,13 @@
 					</table>
 				</div>
 			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${workContractRecord.act.procInsId}"/>
+					<act:histoicFlow procInsId="${workContractRecord.act.procInsId}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -576,6 +576,14 @@
                         });
 					</script></div>
 			</div>
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${workInvoice.act.procInsId}"/>
+					<act:histoicFlow procInsId="${workInvoice.act.procInsId}" />
+				</div>
+			</div>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -1070,6 +1070,15 @@
                 </table>
             </div>
         </div>
+
+        <div class="form-group layui-row">
+            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="layui-item layui-col-xs12 form-table-container" >
+                <act:flowChart procInsId="${workReimbursement.act.procInsId}"/>
+                <act:histoicFlow procInsId="${workReimbursement.act.procInsId}"/>
+            </div>
+        </div>
+
         <div class="form-group layui-row page-end"></div>
     </form:form>
     </div>