代码提交

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

@@ -5114,7 +5114,7 @@ public class WorkProjectNotifyController extends BaseController {
 						List<SubProjectInfo> subProjectInfos=this.queryReportDetails(ruralProjectRecords.getId());
 						//获取合同信息
 						WorkContractInfo workContractInfo=this.queryWorkContract(ruralProjectRecords.getId());
-						if(null != workContractInfo){
+						/*if(null != workContractInfo){
 							WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
 							model.addAttribute("workClientInfo", clientInfo);
 							if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
@@ -5126,7 +5126,7 @@ public class WorkProjectNotifyController extends BaseController {
 								}
 								materialDefectRecord.setChargeCriterionList(chargeCriterionList);
 							}
-						}
+						}*/
 
 						Act act = getByAct(materialDefectRecord.getProcessInstanceId());
 						materialDefectRecord.setAct(act);
@@ -6349,31 +6349,32 @@ public class WorkProjectNotifyController extends BaseController {
 									consultant.setRole("咨询员");
 									consultant.setZixunyuanName(user.getName());
 									if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-										User chenHongXing=UserUtils.getByLoginName("陈红星");
+										User chenHongXing=UserUtils.get(projectReportData.getBzshbUserId());
 										List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
-										//获取陈红星的造价师信息
-										WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
-
-										//根据用户查询技能信息
-										List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
-										for (WorkStaffCertificate certificateInfo: certificateBList) {
-											for (MainDictDetail type1 : certificateMajor) {
-												if(certificateInfo.getMajor().equals(type1.getValue())){
-													bzshbConsultant.setMajor(type1.getLabel());
+										if(chenHongXingCertificateList.size()>0){
+											//获取陈红星的造价师信息
+											WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+											//根据用户查询技能信息
+											List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+											for (WorkStaffCertificate certificateInfo: certificateBList) {
+												for (MainDictDetail type1 : certificateMajor) {
+													if(certificateInfo.getMajor().equals(type1.getValue())){
+														consultant.setMajor(type1.getLabel());
+													}
 												}
 											}
-										}
 
-										bzshbConsultant = consultant;
-										bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-										bzshbConsultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
-										bzshbConsultant.setRole("技术负责人");
-										it.remove();
+											consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+										}
+										consultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
+										consultant.setRole("技术负责人");
+										//it.remove();
 									}
 								}
 							}
 
-							if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+							/*if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
 								consultants.add(bzshbConsultant);
 							}else{
 								//查询总审人员信息
@@ -6452,7 +6453,7 @@ public class WorkProjectNotifyController extends BaseController {
 										consultants.add(bzshbConsultant);
 									}
 								}
-							}
+							}*/
 
 							consultants.addAll(consultantList);
 

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

@@ -48,11 +48,11 @@
                     parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                     return false;
                 }
-                var belongingDepartment = $("#belongingDepartmentName").val();
+                /*var belongingDepartment = $("#belongingDepartmentName").val();
                 if(belongingDepartment == '' ){
                     parent.layer.msg("项目归属部门未填写!", {icon: 5});
                     return false;
-                }
+                }*/
                 var contractsNum = $("#contractsNum").val();
                 if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
                     parent.layer.msg("合同数量不能为空!", {icon: 5});

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

@@ -68,11 +68,11 @@
                         parent.layer.msg("送审规模未填写!", {icon: 5});
                         return false;
                     }
-                    var belongingDepartment = $("#belongingDepartmentName").val();
+                    /*var belongingDepartment = $("#belongingDepartmentName").val();
                     if(belongingDepartment == '' ){
                         parent.layer.msg("项目归属部门未填写!", {icon: 5});
                         return false;
-                    }
+                    }*/
                     var submitMoney=$('input:radio[name="submitMoney"]:checked').val();
                     if (null == submitMoney){
                         parent.layer.msg("项目等级未填写!", {icon: 5});
@@ -149,11 +149,11 @@
                             return false;
                         }
                     }
-                    var belongingDepartment = $("#belongingDepartmentName").val();
+                    /*var belongingDepartment = $("#belongingDepartmentName").val();
                     if(belongingDepartment == '' ){
                         parent.layer.msg("项目归属部门未填写!", {icon: 5});
                         return false;
-                    }
+                    }*/
                     var engineeringType = $("#engineeringType").val();
                     if(engineeringType == '' ){
                         parent.layer.msg("请选择工程类型!", {icon: 5});
@@ -1061,7 +1061,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>项目归属部门：</label>
+                    <label class="layui-form-label double-line">项目归属部门：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselectbelongingDepartment id="belongingDepartment" name="belongingDepartment" value="${ruralProjectRecords.belongingDepartment}" labelName="belongingDepartmentName" labelValue="${belongingDepartmentName}"
                                                     cssStyle="background-color:#fff" title="项目归属部门" url="/sys/office/treeDataAllByBelongingDepartment?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectRepordDescriptionAudit.jsp

@@ -107,9 +107,9 @@
 					<div class="list-form-tab contentShadow list-form-tab" id="tabDiv">
 						<ul class="list-tabs" >
 							<li class="active"><a>基本信息</a><span class="hide">projectInfo</span></li>
-							<li><a>子项目列表</a><span class="hide">subProjectInfo</span></li>
+							<%--<li><a>子项目列表</a><span class="hide">subProjectInfo</span></li>--%>
 							<li><a>合同信息</a><span class="hide">workContractInfo</span></li>
-							<li><a>客户信息</a><span class="hide">workClientInfo</span></li>
+							<%--<li><a>客户信息</a><span class="hide">workClientInfo</span></li>--%>
 						</ul>
 					</div>
 				</div>
@@ -1193,7 +1193,72 @@
 							无合同信息
 						</c:when>
 						<c:otherwise>
+							<div id="tab-12" class="tab-pane active">
+								<div class="form-group-label"><h2>客户基础信息</h2>
+
+
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">客户名称：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.clientName}"/>
+										</div>
+									</div>
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">公司电话：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.telephone}"/>
+										</div>
+									</div>
+										<%--<div class="layui-item layui-col-sm6 lw7">
+                                            <br>
+                                            <label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+                                            <div class="layui-input-block">
+                                        <span class="radio-box">&nbsp;&nbsp;
+                                            <input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workContractRecord.workContractInfo.hasUscc eq 1}">checked="true"</c:if> />是
+                                            &nbsp;&nbsp;
+                                            <input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workContractRecord.workContractInfo.hasUscc eq 2}">checked="true"</c:if> />否
+                                        </span>
+                                            </div>
+                                        </div>--%>
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label double-line">统一社会信用代码：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.uscCode}"/>
+										</div>
+									</div>
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">公司地址：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.address}"/>
+										</div>
+									</div>
+
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">开户银行：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.ourBank}"/>
+										</div>
+									</div>
+
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">银行账号：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.bankNumber}"/>
+										</div>
+									</div>
+
+								</div>
+
+							</div>
+
 							<div class="form-group layui-row first lw9">
+								<div class="form-group-label"><h2>合同信息</h2></div>
 								<div class="layui-item layui-col-sm6">
 									<label class="layui-form-label ">合同名称：</label>
 									<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectRepordDescriptionView.jsp

@@ -75,9 +75,9 @@
 					<div class="list-form-tab contentShadow list-form-tab" id="tabDiv">
 						<ul class="list-tabs" >
 							<li class="active"><a>基本信息</a><span class="hide">projectInfo</span></li>
-							<li><a>子项目列表</a><span class="hide">subProjectInfo</span></li>
+							<%--<li><a>子项目列表</a><span class="hide">subProjectInfo</span></li>--%>
 							<li><a>合同信息</a><span class="hide">workContractInfo</span></li>
-							<li><a>客户信息</a><span class="hide">workClientInfo</span></li>
+							<%--<li><a>客户信息</a><span class="hide">workClientInfo</span></li>--%>
 						</ul>
 					</div>
 				</div>
@@ -1154,7 +1154,71 @@
 							无合同信息
 						</c:when>
 						<c:otherwise>
+							<div id="tab-12" class="tab-pane active">
+								<div class="form-group-label"><h2>客户基础信息</h2>
+
+
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">客户名称：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.clientName}"/>
+										</div>
+									</div>
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">公司电话：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.telephone}"/>
+										</div>
+									</div>
+										<%--<div class="layui-item layui-col-sm6 lw7">
+                                            <br>
+                                            <label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+                                            <div class="layui-input-block">
+                                        <span class="radio-box">&nbsp;&nbsp;
+                                            <input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workContractRecord.workContractInfo.hasUscc eq 1}">checked="true"</c:if> />是
+                                            &nbsp;&nbsp;
+                                            <input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workContractRecord.workContractInfo.hasUscc eq 2}">checked="true"</c:if> />否
+                                        </span>
+                                            </div>
+                                        </div>--%>
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label double-line">统一社会信用代码：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.uscCode}"/>
+										</div>
+									</div>
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">公司地址：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.address}"/>
+										</div>
+									</div>
+
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">开户银行：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.ourBank}"/>
+										</div>
+									</div>
+
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">银行账号：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.bankNumber}"/>
+										</div>
+									</div>
+
+								</div>
+
+							</div>
 							<div class="form-group layui-row first lw9">
+								<div class="form-group-label"><h2>合同信息</h2></div>
 								<div class="layui-item layui-col-sm6">
 									<label class="layui-form-label ">合同名称：</label>
 									<div class="layui-input-block">

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

@@ -1107,7 +1107,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>项目归属部门：</label>
+                    <label class="layui-form-label double-line">项目归属部门：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselectbelongingDepartment id="belongingDepartment" name="belongingDepartment" value="${ruralProjectRecords.belongingDepartment}" labelName="belongingDepartmentName" labelValue="${belongingDepartmentName}"
                                                            cssStyle="background-color:#fff" title="项目归属部门" url="/sys/office/treeDataAllByBelongingDepartment?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>