对新增的归属部门进行修改使其传部门id

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -260,4 +260,20 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
     String getProjectSortCostInfo(@Param("projectIdList") List<String> projectIdList);
+
+
+    /**
+     * 根据部门名称查询部门id
+     * @param belongingDepartmentName
+     * @return
+     */
+    String getBelongingDepartmentByBelongingDepartmentName(String belongingDepartmentName);
+
+
+    /**
+     * 根据部门id查询部门名称
+     * @param belongingDepartment
+     * @return
+     */
+    String getBelongingDepartmentNameByBelongingDepartment(String belongingDepartment);
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -2802,11 +2802,33 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	}
 
 	/**
-	 * 根据项目id查询造假审核项目的项目类别
+	 * 根据项目id查询造价审核项目的项目类别
 	 * @param projectIdList
 	 * @return
 	 */
 	public String getProjectSortCostInfo(List<String> projectIdList){
 		return dao.getProjectSortCostInfo(projectIdList);
 	}
+
+
+	/**
+	 * 根据部门名称查询部门id
+	 * @param
+	 * @return
+	 */
+	public String getBelongingDepartmentByBelongingDepartmentName(String belongingDepartmentName){
+		String belongingDepartment = dao.getBelongingDepartmentByBelongingDepartmentName(belongingDepartmentName);
+		return belongingDepartment;
+	}
+
+	/**
+	 * 根据部门id查询部门名称
+	 * @param
+	 * @return
+	 */
+	public String getBelongingDepartmentNameByBelongingDepartment(String belongingDepartment){
+		String belongingDepartmentName = dao.getBelongingDepartmentNameByBelongingDepartment(belongingDepartment);
+		return belongingDepartmentName;
+	}
+
 }

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

@@ -336,15 +336,20 @@ public class RuralCostProjectRecordsController extends BaseController {
 	 */
 	@RequiresPermissions(value={"ruralProject:ruralCostProjectRecords:add","ruralProject:ruralCostProjectRecords:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
-	public String save(RuralProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes) throws Exception {
+	public String save(RuralProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes
+						,@RequestParam(value = "belongingDepartmentName") String belongingDepartmentName) throws Exception {
 		if (!beanValidator(model, projectRecords)){
 			return form(projectRecords, model);
 		}
 		try {
+			//根据页面传入的归属部门名称查询部门id并放入数据库
+			String belongingDepartment = projectRecordsService.getBelongingDepartmentByBelongingDepartmentName(belongingDepartmentName);
+
 //            projectRecords.setProjectStatus(ProjectStatusEnum.IN_APRL.getValue());
             if (!projectRecords.getIsNewRecord()) {//编辑表单保存
                 RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
 				//if(t.getProjectStatus() == 3 || t.getProjectStatus() == 1) {
+					t.setBelongingDepartment(belongingDepartment);
 					MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
 
 				//判断是否存在项目计划，存在将计划开始时间和计划结束时间进行修改
@@ -381,6 +386,7 @@ public class RuralCostProjectRecordsController extends BaseController {
 				}
 				//添加查询类型(造价审核)
 				projectRecords.setProjectType("2");
+				projectRecords.setBelongingDepartment(belongingDepartment);
                 projectRecordsService.saveProject(projectRecords, ProjectStatusEnum.SIGNED);//保存
             }
 			addMessage(redirectAttributes, "保存项目成功");
@@ -448,6 +454,11 @@ public class RuralCostProjectRecordsController extends BaseController {
 	@RequestMapping(value = "adminModify")
 	public String adminModify(RuralProjectRecords projectRecords, Model model) {
 		projectRecords=projectRecordsService.get(projectRecords.getId());
+
+		//根据归属部门Id查询归属部门名称显示
+		String belongingDepartmentName = projectRecordsService.getBelongingDepartmentNameByBelongingDepartment(projectRecords.getBelongingDepartment());
+		model.addAttribute("belongingDepartmentName",belongingDepartmentName);
+
 		projectRecordsService.queryProjectDetail(projectRecords);
 		ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
 		projectPlanInfo.setProjectId(projectRecords.getId());

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

@@ -128,6 +128,11 @@ public class RuralProjectViewController extends BaseController {
     public String view(RuralProjectRecords projectRecords, Model model) {
         if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
             projectRecords = projectRecordsService.get(projectRecords.getId());
+
+            //根据归属部门Id查询归属部门名称显示
+            String belongingDepartmentName = projectRecordsService.getBelongingDepartmentNameByBelongingDepartment(projectRecords.getBelongingDepartment());
+            model.addAttribute("belongingDepartmentName",belongingDepartmentName);
+
             projectRecordsService.queryProjectDetail(projectRecords);
 
             if(null != projectRecords.getReportSignatureUploadFileUser() && StringUtils.isNotBlank(projectRecords.getReportSignatureUploadFileUser().getId())){

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -1902,4 +1902,12 @@
 			</if>
 		</where>
 	</select>
+	
+	<select id="getBelongingDepartmentByBelongingDepartmentName" parameterType="java.lang.String" resultType="java.lang.String">
+		select id from sys_office where name = #{belongingDepartmentName}
+	</select>
+
+	<select id="getBelongingDepartmentNameByBelongingDepartment" parameterType="java.lang.String" resultType="java.lang.String">
+		select name from sys_office where id = #{belongingDepartment}
+	</select>
 </mapper>

src/main/webapp/WEB-INF/tags/sys/treeselectbelongingDepartment.tag

@@ -25,7 +25,7 @@
 <%@ attribute name="rule" type="java.lang.String" required="false" description="考勤规则模块用"%>
 <input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}" />
 <div class="input-group">
-    <input id="${id}Name" placeholder="请选择${title}" name="${labelName}"  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+    <input id="${id}Name" placeholder="请选择${title}" name="${labelName}"  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}" readonly="true"
            class="${cssClass}" style="${cssStyle}"/>
     <span class="input-group-btn">
 	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

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

@@ -884,7 +884,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">归属部门：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectbelongingDepartment id="belongingDepartment" name="belongingDepartmentName" value="${ruralProjectRecords.belongingDepartment}" labelName="belongingDepartment" labelValue="${ruralProjectRecords.belongingDepartment}"
+                        <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"/>
                     </div>
                 </div>

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

@@ -1065,7 +1065,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">归属部门：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectbelongingDepartment id="belongingDepartment" name="belongingDepartmentName" value="${ruralProjectRecords.belongingDepartment}" labelName="belongingDepartment" labelValue="${ruralProjectRecords.belongingDepartment}"
+                        <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"/>
                     </div>
                 </div>

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

@@ -244,7 +244,7 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">归属部门：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="belongingDepartment" class="form-control layui-input" value="${projectRecords.belongingDepartment}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="belongingDepartmentName" class="form-control layui-input" value="${belongingDepartmentName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">