数据调整

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -365,6 +365,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Date qualitySignatureUploadDate;		//质量复核签章文件上传时间
 
 	private String belongingDepartment;    //归属部门
+	private String belongingDepartmentName;    //归属部门
 	private String projectFilingBatchesId;
 
 
@@ -2700,4 +2701,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setAccomplishDate(Date accomplishDate) {
 		this.accomplishDate = accomplishDate;
 	}
+
+	public String getBelongingDepartmentName() {
+		return belongingDepartmentName;
+	}
+
+	public void setBelongingDepartmentName(String belongingDepartmentName) {
+		this.belongingDepartmentName = belongingDepartmentName;
+	}
 }

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

@@ -837,15 +837,18 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             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(null == offcie) {
+                return "项目归属部门未填写，请修改项目登记中的项目归属部门！";
+            }else{
+                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());
+                }
             }
         }
 

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

@@ -240,6 +240,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		RuralProjectRecords ruralProjectRecords = super.get(id);
 		if (null !=ruralProjectRecords){
 			ruralProjectRecords.setUploadMode(uploadMode);
+			if(StringUtils.isNotBlank(ruralProjectRecords.getBelongingDepartment()) && "其他".equals(ruralProjectRecords.getBelongingDepartment())){
+				ruralProjectRecords.setBelongingDepartmentName("其他");
+			}
 		}
 		return ruralProjectRecords;
 	}
@@ -864,6 +867,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				}
 				break;
 		}
+		if("其他".equals(projectRecords.getBelongingDepartmentName())){
+			projectRecords.setBelongingDepartment(projectRecords.getBelongingDepartmentName());
+		}
         if(projectRecords.getProjectStatus()== ProjectStatusEnum.INVALID.getValue()){
             projectRecords.setId(IdGen.uuid());
             dao.insert(projectRecords);

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/yanChengSignature/RuralProjectMessageElectronicSealYCService.java

@@ -261,7 +261,7 @@ public class RuralProjectMessageElectronicSealYCService extends CrudService<Rura
             //List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"4",projectApprovalSignature.getCreateBy());
             List<User> bmzrs = Lists.newArrayList();
 
-            User user = UserUtils.getByUserName("郑炎基");
+            User user = UserUtils.getByUserName("刘建春");
             if(null != user ){
                 bmzrs.add(user);
             }
@@ -787,7 +787,7 @@ public class RuralProjectMessageElectronicSealYCService extends CrudService<Rura
             //List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"4",projectApprovalSignature.getCreateBy());
             List<User> bmzrs = Lists.newArrayList();
 
-            User user = UserUtils.getByUserName("郑炎基");
+            User user = UserUtils.getByUserName("刘建春");
             if(null != user ){
                 bmzrs.add(user);
             }

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

@@ -762,7 +762,11 @@ public class RuralCostProjectMessageNewController extends BaseController {
             }
 
             String str = ruralProjectMessageService.saveData(projectcontentinfo,2);
-            addMessage(redirectAttributes, "发起质量复核"+(str.equals("true")?"成功":"失败"));
+            if("true".equals(str)){
+                addMessage(redirectAttributes, "发起质量复核成功");
+            }else{
+                addMessage(redirectAttributes, "发起质量复核失败。失败原因："+str);
+            }
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/yanChengSignature/RuralProjectMessageElectronicSealYCController.java

@@ -377,7 +377,7 @@ public class RuralProjectMessageElectronicSealYCController extends BaseControlle
             //List<User> users = UserUtils.getByProssType(projectRecords.getProcessInstanceId(),1);
             List<User> users = Lists.newArrayList();
 
-            User user = UserUtils.getByUserName("郑炎基");
+            User user = UserUtils.getByUserName("刘建春");
             if(null != user ){
                 users.add(user);
             }
@@ -616,7 +616,7 @@ public class RuralProjectMessageElectronicSealYCController extends BaseControlle
             //List<User> users = UserUtils.getByProssType(projectRecords.getProcessInstanceId(),1);
             List<User> users = Lists.newArrayList();
             if ("szzk".equals(taskDefKey)){
-                User user = UserUtils.getByUserName("郑炎基");
+                User user = UserUtils.getByUserName("刘建春");
                 if(null != user ){
                     users.add(user);
                 }
@@ -624,7 +624,7 @@ public class RuralProjectMessageElectronicSealYCController extends BaseControlle
                 if (users==null )
                     users = UserUtils.getByRoleActivityEnname("bmzr",2,projectRecords.getOffice().getId(),"2",projectRecords.getCreateBy());*/
             }else  if ("bmzr".equals(taskDefKey)){
-                User user = UserUtils.getByUserName("郑炎基");
+                User user = UserUtils.getByUserName("刘建春");
                 if(null != user ){
                     users.add(user);
                 }

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

@@ -223,6 +223,7 @@
 		,a.engineering_type as "engineeringType"
 		,supmi.name as "projectMasterName"
 		,ifnull(pmdr.status,0) as "defectRecordStatus"
+		,sob.name as "belongingDepartmentName"
         FROM rural_project_records a
         <include refid="projectRecordsJoins"/>
         LEFT JOIN sys_user su ON su.id = a.create_by
@@ -231,6 +232,7 @@
 		LEFT JOIN rural_project_report_record prr on prd.id = prr.report_id
 		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
 		LEFT JOIN sys_office o ON o.id = a.office_id
+		LEFT JOIN sys_office sob ON sob.id = a.belonging_department
 		WHERE a.id = #{id}
 	</select>
 

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

@@ -96,10 +96,22 @@
                         return false;
                     }
                     var belongingDepartment = $("#belongingDepartmentName").val();
+                    console.log(belongingDepartment);
                     if(belongingDepartment == '' ){
                         parent.layer.msg("项目归属部门未填写!", {icon: 5});
                         return false;
                     }
+
+                    var attachmentProjectSort=$("#attachmentProjectSort").val();
+
+                    //选中审定（内）时必须同时选中B级项目
+                    if(belongingDepartment == "其他"){
+                        if(attachmentProjectSort == 8){
+                            parent.layer.msg("项目类别为审定(内)时，项目归属部门不可为其他！", {icon: 5});
+                            return false;
+                        }
+                    }
+
                     var submitMoney=$('input:radio[name="submitMoney"]:checked').val();
                     if (null == submitMoney){
                         parent.layer.msg("项目等级未填写!", {icon: 5});
@@ -126,7 +138,6 @@
                     }
 
 
-                    var attachmentProjectSort=$("#attachmentProjectSort").val();
                     if(attachmentProjectSort==''){
                         parent.layer.msg("请选择项目类别!", {icon: 5});
                         return false;
@@ -1081,7 +1092,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <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}"
+                        <sys:treeselectbelongingDepartment id="belongingDepartment" name="belongingDepartment" value="${ruralProjectRecords.belongingDepartment}" labelName="belongingDepartmentName" labelValue="${ruralProjectRecords.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

@@ -249,7 +249,7 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<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}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="belongingDepartmentName" class="form-control layui-input" value="${projectRecords.belongingDepartmentName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">