合同管理页面添加新的流程创建信息

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoAllController.java

@@ -107,6 +107,10 @@ public class WorkContractInfoAllController extends BaseController {
         workProjectNotify.setType("93");
         //查询所有需要当前登录人进行处理的项目信息
         List<WorkProjectNotify> borrowNotifyList = workProjectNotifyService.findList(recordNotify);
+        //添加新合同信息
+        workProjectNotify.setType("143");
+        //查询所有需要当前登录人进行处理的项目信息
+        List<WorkProjectNotify> newContractNotifyList = workProjectNotifyService.findList(workProjectNotify);
 
         //查询合同借用信息状态
         if(list.size()>0){
@@ -160,6 +164,18 @@ public class WorkContractInfoAllController extends BaseController {
                         break;
                     }
                 }
+                for (WorkProjectNotify notify: newContractNotifyList) {
+                    if(notify.getNotifyId().equals(info.getId())){
+                        info.setNotifyId(notify.getId());
+                        if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                            info.setNewContractNotifyFlag(1);
+                        }
+                        if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
+                            info.setNewContractNotifyFlagAudit(1);
+                        }
+                        break;
+                    }
+                }
             }
         }
         model.addAttribute("page", page);

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

@@ -620,7 +620,7 @@
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 					<div class="layui-btn-group">
 						<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
-							<button class="layui-btn layui-btn-sm layui-bg-blue" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')">&nbsp;添加</button>
+							<button class="layui-btn layui-btn-sm layui-bg-blue" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/newForm','95%','95%')">&nbsp;添加</button>
 						</shiro:hasPermission>
 						<shiro:hasPermission name="workcontractinfo:workContractInfo:import">
 							<table:importExcel url="${ctx}/workcontractinfo/workContractInfo/import"></table:importExcel><!-- 导入按钮 -->
@@ -732,6 +732,10 @@
 						{
 							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同登记审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
+						if(d.newContractNotifyFlagAudit != undefined && d.newContractNotifyFlagAudit !=null && "" != d.newContractNotifyFlagAudit && d.newContractNotifyFlagAudit == 1)
+						{
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同登记审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
+						}
 						if(d.recordNotifyFlag != undefined && d.recordNotifyFlag !=null && "" != d.recordNotifyFlag && d.recordNotifyFlag == 1)
 						{
 							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
@@ -763,7 +767,15 @@
 							}
 							if(d.canedits != undefined && d.canedits =="1")
 							{
-								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "&contractState="+d.status+"','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改合同</a>";
+								if(d.contractState == 4){
+									if(null != d.newContractNotifyFlag && undefined != d.newContractNotifyFlag && '' != d.newContractNotifyFlag && 1 == d.newContractNotifyFlag){
+										xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/newForm?id=" + d.id + "&contractState="+d.status+"','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改合同</a>";
+									}else{
+										xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "&contractState="+d.status+"','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改合同</a>";
+									}
+								}else{
+									xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/newForm?id=" + d.id + "&contractState="+d.status+"','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改合同</a>";
+								}
 							}
 							if(d.candelete != undefined && d.candelete =="1")
 							{
@@ -856,6 +868,8 @@
                     ,"borrowId":"${workContractInfo.borrowId}"
                     ,"flagAdmin":"${workContractInfo.flagAdmin}"
 					,"notifyFlag":"${workContractInfo.notifyFlag}"
+					,"newContractNotifyFlagAudit":"${workContractInfo.newContractNotifyFlagAudit}"
+					,"newContractNotifyFlag":"${workContractInfo.newContractNotifyFlag}"
 					,"notifyId":"${workContractInfo.notifyId}"
 					,"recordNotifyFlag":"${workContractInfo.recordNotifyFlag}"
 					,"recordNotifyId":"${workContractInfo.recordNotifyId}"