盖章授权功能修改

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -141,6 +141,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private String planAttachmentId;   //项目计划附件id
 	private String overallProjectTypeId;   //全过程项目类型
 	private List<String> idList;
+	private String belongingDepartment;	//归属部门
 
 	public ProjectRecords() {
 		super();
@@ -831,4 +832,12 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setIdList(List<String> idList) {
 		this.idList = idList;
 	}
+
+	public String getBelongingDepartment() {
+		return belongingDepartment;
+	}
+
+	public void setBelongingDepartment(String belongingDepartment) {
+		this.belongingDepartment = belongingDepartment;
+	}
 }

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

@@ -815,8 +815,24 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         List<User> users = new ArrayList<>();
 
         //部门主任
-        List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,projectReportData.getOfficeId(),"4",projectRecords.getCreateBy());
+        List<User> bmzrs = Lists.newArrayList();
 
+        if("其他".equals(projectRecords.getBelongingDepartment())){
+            User userName = UserUtils.getByUserName("王年生");
+            bmzrs.add(userName);
+        }else{
+            Office offcie = officeService.get(projectRecords.getBelongingDepartment());
+
+            if("盐城团队".equals(offcie.getName())){
+                User userName = UserUtils.getByUserName("郑炎基");
+                bmzrs.add(userName);
+            }else if("河北团队".equals(offcie.getName())){
+                User userName = UserUtils.getByUserName("王年生");
+                bmzrs.add(userName);
+            }else {
+                bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,projectRecords.getBelongingDepartment(),"4",projectRecords.getCreateBy());
+            }
+        }
 
         if (insert) {
             projectReportDataService.insert(projectReportData);

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

@@ -449,7 +449,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				}
 				break;
 			case "2":
-				if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort())){
+				if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort()) || "8".equals(projectRecords.getAttachmentProjectSort())){
 					projectRecords.setReportedState("10");
 				}else{
 					projectRecords.setReportedState(null);

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

@@ -361,7 +361,11 @@ public class RuralCostProjectRecordsController extends BaseController {
             if (!projectRecords.getIsNewRecord()) {//编辑表单保存
                 RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
 				//if(t.getProjectStatus() == 3 || t.getProjectStatus() == 1) {
+				if("其他".equals(belongingDepartmentName)){
+					t.setBelongingDepartment(belongingDepartmentName);
+				}else{
 					t.setBelongingDepartment(belongingDepartment);
+				}
 					MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
 
 				//判断是否存在项目计划，存在将计划开始时间和计划结束时间进行修改

src/main/java/com/jeeplus/modules/sys/web/OfficeController.java

@@ -629,6 +629,15 @@ public class OfficeController extends BaseController {
                 mapList.add(map);
             }
         }
+        if(mapList.size()>0){
+            Map<String, Object> map = Maps.newHashMap();
+            map.put("id", "其他");
+            map.put("pId", "ffe5af5b557e46f28b000c94716e228a");
+            map.put("pIds", "0,ffe5af5b557e46f28b000c94716e228a,");
+            map.put("name", "其他");
+            map.put("selectName", selectName);
+            mapList.add(map);
+        }
 
 
         return mapList;

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

@@ -42,7 +42,7 @@
                 }
                 var belongingDepartment = $("#belongingDepartmentName").val();
                 if(belongingDepartment == '' ){
-                    parent.layer.msg("归属部门未填写!", {icon: 5});
+                    parent.layer.msg("项目归属部门未填写!", {icon: 5});
                     return false;
                 }
                 $("#inputForm").submit();
@@ -887,10 +887,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">归属部门：</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"/>
+                                                           cssStyle="background-color:#fff" title="项目归属部门" url="/sys/office/treeDataAllByBelongingDepartment?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -79,7 +79,7 @@
                 }
                 var belongingDepartment = $("#belongingDepartmentName").val();
                 if(belongingDepartment == '' ){
-                    parent.layer.msg("归属部门未填写!", {icon: 5});
+                    parent.layer.msg("项目归属部门未填写!", {icon: 5});
                     return false;
                 }
                 if(i==2){
@@ -97,7 +97,7 @@
                     }
                     var belongingDepartment = $("#belongingDepartmentName").val();
                     if(belongingDepartment == '' ){
-                        parent.layer.msg("归属部门未填写!", {icon: 5});
+                        parent.layer.msg("项目归属部门未填写!", {icon: 5});
                         return false;
                     }
                     var submitMoney=$('input:radio[name="submitMoney"]:checked').val();
@@ -1073,10 +1073,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>项目归属部门：</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"/>
+                                                    cssStyle="background-color:#fff" title="项目归属部门" url="/sys/office/treeDataAllByBelongingDepartment?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

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