新增报告送审人员撤回可修改

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

@@ -628,7 +628,9 @@ public class RuralCostProjectMessageController extends BaseController {
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
             }
             if(null != reportData){
-                projectcontentinfo.getProjectReportData().setBzshbUserId(reportData.getBzshbUserId());
+                if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId())){
+                    projectcontentinfo.getProjectReportData().setBzshbUserId(reportData.getBzshbUserId());
+                }
                 if(reportData.getStatus().equals("2")){
                     addMessage(redirectAttributes, "报告已送审，请勿重复提交");
                     return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";

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

@@ -654,7 +654,9 @@ public class RuralProjectMessageController extends BaseController {
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
             }
             if(null != reportData){
-                projectcontentinfo.getProjectReportData().setBzshbUserId(reportData.getBzshbUserId());
+                if(StringUtils.isBlank(projectcontentinfo.getProjectReportData().getBzshbUserId())){
+                    projectcontentinfo.getProjectReportData().setBzshbUserId(reportData.getBzshbUserId());
+                }
                 if(reportData.getStatus().equals("2")){
                     addMessage(redirectAttributes, "报告已送审，请勿重复提交");
                     return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";

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

@@ -688,6 +688,9 @@
 		<if test="technicistDate != null and technicistDate != ''">
 			,technicist_date = #{technicistDate}
 		</if>
+		<if test="bzshbUserId != null and bzshbUserId != ''">
+			,bzshb_user_id = #{bzshbUserId}
+		</if>
 		,consultant_id = #{consultant.id},
 		consultant_remarks = #{consultantRemarks},
 		principal_id = #{principal.id},

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp

@@ -843,7 +843,7 @@
 							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
-					<c:choose>
+					<%--<c:choose>
 						<c:when test="${not empty projectcontentinfo.projectReportData.bzshbUserId}">
 							<div class="layui-item layui-col-sm6 lw7">
 								<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
@@ -870,7 +870,18 @@
 								</div>
 							</div>
 						</c:otherwise>
-					</c:choose>
+					</c:choose>--%>
+					<div class="layui-item layui-col-sm6 lw7">
+						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
+						<div class="layui-input-block">
+							<select class="form-control required layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
+								<option value=""/>
+								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
+									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
+								</c:forEach>
+							</select>
+						</div>
+					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减额(元)：</label>
 						<div class="layui-input-block with-icon">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -810,7 +810,7 @@
 							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
-					<c:choose>
+					<%--<c:choose>
 						<c:when test="${not empty projectcontentinfo.projectReportData.bzshbUserId}">
 							<div class="layui-item layui-col-sm6 lw7">
 								<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
@@ -837,7 +837,18 @@
 								</div>
 							</div>
 						</c:otherwise>
-					</c:choose>
+					</c:choose>--%>
+					<div class="layui-item layui-col-sm6 lw7">
+						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
+						<div class="layui-input-block">
+							<select class="form-control required layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
+								<option value=""/>
+								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
+									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
+								</c:forEach>
+							</select>
+						</div>
+					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减额(元)：</label>
 						<div class="layui-input-block with-icon">