合同登记去除工作流审核

报告审核添加部门主任和总工审核驳回次数

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectReportDataDao.java

@@ -74,4 +74,9 @@ public interface ProjectReportDataDao extends CrudDao<ProjectReportData> {
     List<WorkInvoice> getInvoiceByProjectId(String projectId);
 
     ProjectReportData findByNum(String number);
+
+    //波们经理驳回记录
+    int updateDirectorRejectedNum(String id);
+    //总工驳回记录
+    int updateeventuallyRejectedNum(String id);
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -59,6 +59,24 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private List<WorkReviewAudit> projectReviewList;
 	private String reportId;
 	private String numberPath;
+	private Integer directorRejectedNum;//主任驳回次数
+	private Integer eventuallyRejectedNum;//总工驳回次数
+
+	public Integer getDirectorRejectedNum() {
+		return directorRejectedNum;
+	}
+
+	public void setDirectorRejectedNum(Integer directorRejectedNum) {
+		this.directorRejectedNum = directorRejectedNum;
+	}
+
+	public Integer getEventuallyRejectedNum() {
+		return eventuallyRejectedNum;
+	}
+
+	public void setEventuallyRejectedNum(Integer eventuallyRejectedNum) {
+		this.eventuallyRejectedNum = eventuallyRejectedNum;
+	}
 
 	public String getNumberPath() {
 		return numberPath;

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -890,6 +890,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 						vars.put("bzshbcount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
+						//部门主任驳回审核（没操作一次驳回，在数据库中添加一条记录）
+						dao.updateDirectorRejectedNum(reportData.getId());
 						workActivityProcess.setIsApproval("2");
 					}
 					break;
@@ -906,6 +908,7 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 						vars.put("glydacount",auditUsers.size());
 					} else {
 						notifyRole = "调整报告";
+						dao.updateeventuallyRejectedNum(reportData.getId());
 						workActivityProcess.setIsApproval("2");
 					}
 					break;

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -625,9 +625,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			ossUtil.uploadFile2OSS(byteArrayInputStream, Global.getContractNumPath(), picNamePhoto);
 			workContractInfo.setContractNumPath(Global.getAliyunUrl()+"/"+Global.getContractNumPath()+picNamePhoto);
 		}
-		workContractInfo.setContractState("2");
+		workContractInfo.setContractState("5");
 		this.save(workContractInfo);
-		Office office = officeService.get(workContractInfo.getChargeCompany());
+		/*Office office = officeService.get(workContractInfo.getChargeCompany());
 		String str = "合同申请人：" + UserUtils.get(workContractInfo.getCreateBy().getId()).getName() + ",主委托方：" + workContractInfo.getClient().getName() + ",合同所属部门:"+office.getName();
 		String title = "合同名称:"+workContractInfo.getName();
 		identityService.setAuthenticatedUserId(workContractInfo.getCreateBy().getId());
@@ -760,6 +760,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 		long end = System.currentTimeMillis();
 		logger.info("合同送审任务结束，共耗时：[" + (end-begin) / 1000 + "]秒,流程启动时间："+(s2-s1)+"ms");
+		*/
 		return "";
 	}
 	/**

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

@@ -769,14 +769,14 @@ public class WorkContractInfoController extends BaseController {
                 workContractInfo.setWorkAttachments(list1);
                 WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());//从数据库取出记录的值
 //                status =2,审核中。status=5,审核已通过
-                if (t.getContractState().equals("2")) {
+                /*if (t.getContractState().equals("2")) {
                     addMessage(redirectAttributes, "审核中的合同不能修改");
                     return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
                 }
                 if (t.getContractState().equals("5")) {
                     addMessage(redirectAttributes, "已通过合同不能修改");
                     return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
-                }
+                }*/
                 //将编辑表单中的非NULL值覆盖数据库记录中的值
                 MyBeanUtils.copyBeanNotNull2Bean(workContractInfo, t);
                 t.setContractState("1");
@@ -833,7 +833,7 @@ public class WorkContractInfoController extends BaseController {
                 workContractReview.setContractName(workContractInfo.getName());
                 workContractReviewService.save(workContractReview);*/
 
-                workContractInfo.setContractState("2");
+                workContractInfo.setContractState("5");
                 Map<String, Object> variables = new HashMap<String, Object>();
                String str= workContractInfoService.save(workContractInfo, variables,contextPath,url);//保存
                 if (StringUtils.isNotBlank(str)){

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -499,6 +499,18 @@
 			#{installFee}
 		)
 	</insert>
+
+	<update id="updateDirectorRejectedNum">
+		UPDATE project_report_data SET
+			director_rejected_num = director_rejected_num+1
+		WHERE id = #{id}
+	</update>
+
+	<update id="updateeventuallyRejectedNum">
+		UPDATE project_report_data SET
+			eventually_rejected_num = eventually_rejected_num+1
+		WHERE id = #{id}
+	</update>
 	
 	<update id="update">
 		UPDATE project_report_data SET 	

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

@@ -487,7 +487,7 @@
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
 					<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
-						<button class="nav-btn nav-btn-add" title="合同管理" onclick="openDialogre('合同管理','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>
+						<table:addRow url="${ctx}/workcontractinfo/workContractInfo/form" title="合同管理"></table:addRow><!-- 增加按钮 -->
 					</shiro:hasPermission>
 					<shiro:hasPermission name="workcontractinfo:workContractInfo:import">
 						<table:importExcel url="${ctx}/workcontractinfo/workContractInfo/import"></table:importExcel><!-- 导入按钮 -->
@@ -540,7 +540,7 @@
                         return "<span title='"+ d.createBy +"'>" + d.createBy + "</span>";
                     }}
                 ,{field:'signDate',align:'center', sort:true,title: '签订日期',  width:80}
-                ,{align:'center', title: '状态',  width:70,templet:function(d){
+                /*,{align:'center', title: '状态',  width:70,templet:function(d){
                         <%--var st = getAuditState(d.status);--%>
                         <%--var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workcontractinfo/workContractInfo/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
                         <%--return xml;--%>
@@ -550,7 +550,7 @@
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
-                    }}
+                    }}*/
                 ,{align:'center',title:"操作",minWidth:180,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
@@ -576,7 +576,7 @@
                         <%--}--%>
 						if(d.canedits != undefined && d.canedits =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
 						}
                         if(d.candelete != undefined && d.candelete =="1")
                         {
@@ -599,7 +599,7 @@
                         }
                         <%--if(d.canalterComDel != undefined && d.canalterComDel =="1")--%>
                         <%--{--%>
-                           <%--&lt;%&ndash;/* xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/saveCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要发起合同完成吗？', this.href)\"   class=\"op-btn op-btn-revert\"><i class=\"fa fa-edit\"></i> 完成</a>";*/&ndash;%&gt;--%>
+                           <%--&lt;%&ndash;/!* xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/saveCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要发起合同完成吗？', this.href)\"   class=\"op-btn op-btn-revert\"><i class=\"fa fa-edit\"></i> 完成</a>";*!/&ndash;%&gt;--%>
 							<%--xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/deleteCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该合同完成吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";--%>
                         <%--}--%>
 
@@ -624,7 +624,11 @@
                     ,"signDate":"<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>"
                     ,"createBy":"${workContractInfo.createName}"
                     ,"status":"${workContractInfo.contractState}"
-                    <c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id && workContractInfo.signatureStatus == 1   }">,"signature":"1"</c:if>/*签章*/
+
+                    <c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id && workContractInfo.signatureStatus == 1   }">,"canedits":"1"</c:if>/*签章*/
+                    <c:if test="${(workContractInfo.contractState == 5)&& ( workContractInfo.createBy.id == fns:getUser().id or flag == true )}">,"candelete":"1"</c:if>
+
+                    <%--<c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id && workContractInfo.signatureStatus == 1   }">,"signature":"1"</c:if>/*签章*/
                     <c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id}">,"canalter":"1"</c:if>/*变更*/
 					<c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id}">,"caninvalid":"1"</c:if>/*作废*/
                     <c:if test="${(workContractInfo.contractState == 5 ||workContractInfo.contractState == 7)&& workContractInfo.recordState != 3 && workContractInfo.signatureStatus == 2 && fns:getUser().id == workContractInfo.createBy.id}">,"back":"1"</c:if>
@@ -635,7 +639,7 @@
 					<c:if test="${((workContractInfo.contractState == 7 && workContractInfo.signatureStatus == 1)||((workContractInfo.contractState == 7 || workContractInfo.contractState == 5)&& workContractInfo.recordState==3)) && fns:getUser().office.id eq workContractInfo.chargeCompany}">,"canalterCom":"1"</c:if>
 					<c:if test="${workContractInfo.contractState == 9 && fns:getUser().id eq workContractInfo.createBy.id && workContractInfo.completionStatus == 2 }">,"canalterComRevoke":"1"</c:if>
 					<c:if test="${workContractInfo.contractState == 9 && fns:getUser().id eq workContractInfo.createBy.id && (workContractInfo.completionStatus == 3 ||workContractInfo.completionStatus == 4)  }">,"canalterComDel":"1"</c:if>
-
+--%>
                 }
                 </c:forEach>
                 </c:if>