Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -116,15 +116,15 @@ public class RuralCostProjectRecordsController extends BaseController {
 		List<RuralProjectRecords> list = page.getList();
 		for (int i = 0; i < list.size(); i++) {
 			RuralProjectRecords records1 = list.get(i);
-			if (records1.getWorkContractInfo() == null) {
-				projectRecordsService.queryLinkmanInfos(records1);
-				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
-					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-					WorkContractInfo contractInfo = new WorkContractInfo();
-					contractInfo.setClient(linkman.getClientId());
-					records1.setWorkContractInfo(contractInfo);
-				}
-			}
+//			if (records1.getWorkContractInfo() == null) {
+//				projectRecordsService.queryLinkmanInfos(records1);
+//				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+//					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+//					WorkContractInfo contractInfo = new WorkContractInfo();
+//					contractInfo.setClient(linkman.getClientId());
+//					records1.setWorkContractInfo(contractInfo);
+//				}
+//			}
 			//判断是否为admin
 			if (UserUtils.isManager()){
 				records1.setFlagAdmin("1");

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -119,15 +119,15 @@ public class RuralProjectRecordsController extends BaseController {
 		List<RuralProjectRecords> list = page.getList();
 		for (int i = 0; i < list.size(); i++) {
 			RuralProjectRecords records1 = list.get(i);
-			if (records1.getWorkContractInfo() == null) {
-				projectRecordsService.queryLinkmanInfos(records1);
-				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
-					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-					WorkContractInfo contractInfo = new WorkContractInfo();
-					contractInfo.setClient(linkman.getClientId());
-					records1.setWorkContractInfo(contractInfo);
-				}
-			}
+//			if (records1.getWorkContractInfo() == null) {
+//				projectRecordsService.queryLinkmanInfos(records1);
+//				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+//					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+//					WorkContractInfo contractInfo = new WorkContractInfo();
+//					contractInfo.setClient(linkman.getClientId());
+//					records1.setWorkContractInfo(contractInfo);
+//				}
+//			}
 			//判断是否为admin
 			if (UserUtils.isManager()){
 				records1.setFlagAdmin("1");

src/main/resources/jeeplus.properties

@@ -7,10 +7,12 @@ jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
 #jdbc.url=jdbc:mysql://192.168.2.4:3306/simple_xg_total_process?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://127.0.0.1:3306/simple_xg_total_process?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://127.0.0.1:3306/simple_xg_total_process?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://192.168.2.6:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://192.168.2.4:3306/new_ccpm_clear?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
-#jdbc.password=123456
-jdbc.password=root
+jdbc.password=123456
+#jdbc.password=root
 
 #pool settings
 jdbc.pool.init=20

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp

@@ -21,15 +21,17 @@
 					}
                 }
                 var flag=true;
-				$("#workClientLinkmanList tr").each(function(){
-					var clientType=$(this).find("td").eq(5).find(".clientType").val();
-					var reboxNum=$(this).find("td").eq(4).find(".reboxNum").val();
-					var boxNum=$(this).find("td").eq(3).find(".boxNum").val();
-					if (boxNum =="" && reboxNum=="" && clientType==""){
-						layer.msg("请输入项目信息", { icon: 2, offset: "error", time:2000 });
-						flag=false;
-					}
-				})
+                if($("#flag").val()!="no1"){
+					$("#workClientLinkmanList tr").each(function(){
+						var clientType=$(this).find("td").eq(5).find(".clientType").val();
+						var reboxNum=$(this).find("td").eq(4).find(".reboxNum").val();
+						var boxNum=$(this).find("td").eq(3).find(".boxNum").val();
+						if (boxNum =="" || reboxNum=="" || clientType==""){
+							layer.msg("请输入项目信息", { icon: 2, offset: "error", time:2000 });
+							flag=false;
+						}
+					})
+				}
                 if (flag==true){
 					$("#inputForm").submit();
 					return true;
@@ -175,13 +177,13 @@
 											<input name="projectName" type="text" readonly value="${project.projectName}" class="form-control"/>
 										</td>
 										<td>
-											<input name="projectReportNumber" type="text" readonly value="${project.projectReportNumber}" class="form-control required"/>
+											<input name="projectReportNumber" type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
 										</td>
-										<td><input name="boxNum" id="boxNum" type="text" value="${projectFilingBatch.boxNum}" class="form-control required boxNum"/></td>
-										<td><input name="reboxNum" id="reboxNum" onchange="upcase(this)" value="${projectFilingBatch.reBoxNum}" type="text" class="form-control required reboxNum"/></td>
+										<td><input name="boxNum" id="boxNum" type="text" value="${projectFilingBatch.boxNum}" class="form-control boxNum"/></td>
+										<td><input name="reboxNum" id="reboxNum" onchange="upcase(this)" value="${projectFilingBatch.reBoxNum}" type="text" class="form-control reboxNum"/></td>
 										<td style="overflow: visible;">
 											<input type="hidden" id="getProId" value="${project.id}"/>
-											<select name="clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select required clientType">
+											<select name="clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select clientType">
 												<option value="" >--是否通过--</option>
 												<option value="5" itemLabel="label">通过</option>
 												<option value="4" itemLabel="label">驳回</option>
@@ -237,8 +239,9 @@
 						// layer.msg("项目状态修改成功", { icon: 1, offset: "auto", time:2000 });
 					},
 				});
-			}else{
+			}else if (status=="5"){
 				layer.msg("请输入前面信息", { icon: 2, offset: "error", time:2000 });
+				$("#flag").val("no1")
 			}
 
 		});

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp

@@ -594,18 +594,18 @@
 								return '';
 							}
 						}},
-					/*{align:'center', title: '线下归档状态',  width:70,templet:function(d){
-							var st = getRuralProjectArchiveState(""+d.downProjectReportRecordStatus);
-							if(d.pid ==0){
-								if(st.action)
-									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-								else
-									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-								return xml;
-							}else{
-								return '';
-							}
-						}},*/
+					{align:'center', title: '线下归档状态',  width:70,templet:function(d){
+						var st = getRuralProjectArchiveState(""+d.filingProjectStatus);
+						if(d.pid ==0){
+							if(st.action)
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcess?filingProcessinstanceId=" + d.filingProcessinstanceId +"&id"+d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							else
+								var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							return xml;
+						}else{
+							return '';
+						}
+					}},
 					{align:'center', title: '上报状态',  width:90,templet:function(d){
 							var st = getReportedState(""+d.reportedState);
 							if(d.pid ==0){

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -802,14 +802,15 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+<%--                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"--%>
+<%--                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">所属部门：</label>
                     <div class="layui-input-block">
-                        <form:input path="officeName" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
+                        <form:input path="createBy.office.name" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -336,7 +336,7 @@
                             xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
                         }
 						//项目在没有归档完成之前可对文档进行操作
-						if(d.recordStatus != undefined && d.recordStatus =="1")
+						if(d.recordStatus != undefined &&(d.recordStatus =="1"||d.recordStatus =="0") && d.projectReportRecordStatus!=2)
 						{
 							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralCostProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
 						}

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsView.jsp

@@ -118,9 +118,9 @@
 				</div>
 				<div id="divv3">
 					<div class="layui-item layui-col-sm6 lw6">
-						<label class="layui-form-label">工程分类：</label>
+						<label class="layui-form-label">合同类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(ruralProjectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
 						</div>
 					</div>
 				</div>

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

@@ -823,14 +823,15 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+<%--                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"--%>
+<%--                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">所属部门：</label>
                     <div class="layui-input-block">
-                        <form:input path="officeName" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
+                        <form:input path="createBy.office.name" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -364,15 +364,15 @@
                             xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
                         }
                         //项目在没有归档完成之前可对文档进行操作
-                        if(d.recordStatus != undefined && d.recordStatus =="1")
+                        if(d.recordStatus != undefined && (d.recordStatus =="1"||d.recordStatus =="0") && d.projectReportRecordStatus==0)
                         {
 							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
                         }
-						//项目在没有归档完成之前可对文档进行操作
-						if(d.adminAccessory != undefined && d.adminAccessory =="1")
-						{
-							xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
-						}
+						<%--//项目在没有归档完成之前可对文档进行操作--%>
+						<%--if(d.adminAccessory != undefined && d.adminAccessory =="1")--%>
+						<%--{--%>
+						<%--	xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";--%>
+						<%--}--%>
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
                             //xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/ruralProject/ruralProjectRecordsAlter/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";

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

@@ -118,9 +118,9 @@
 				</div>
 				<div id="divv3">
 					<div class="layui-item layui-col-sm6 lw6">
-						<label class="layui-form-label">工程分类：</label>
+						<label class="layui-form-label">合同类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(ruralProjectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
 						</div>
 					</div>
 				</div>