Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportDefectRecordController.java

@@ -521,7 +521,7 @@ public class ProjectReportDefectRecordController extends BaseController {
 			if (StringUtils.isNotBlank(materialDefectRecord.getView()) && materialDefectRecord.getView().equals("zixunModify")){
 				return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
 			}
-			return "redirect:"+Global.getAdminPath()+"/project/projectEarlyPigeonhole/?repage";
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
 		}
 	}
 

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

@@ -170,7 +170,7 @@ public class RuralCostProjectMessageController extends BaseController {
         model.addAttribute("beginDate", projectRecords.getBeginDate());
         model.addAttribute("endDate", projectRecords.getEndDate());
         model.addAttribute("reportSwitch", BaseController.REPORTSWITCH);
-        return "modules/ruralprojectrecords/cost/ruralCostProjectMessageLists";
+        return "modules/ruralprojectrecords/cost/ruralCostProjectMessageList";
     }
 
     /**

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

@@ -166,7 +166,7 @@ public class RuralProjectMessageController extends BaseController {
         model.addAttribute("beginDate", projectRecords.getBeginDate());
         model.addAttribute("endDate", projectRecords.getEndDate());
         model.addAttribute("reportSwitch", BaseController.REPORTSWITCH);
-        return "modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists";
+        return "modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList";
     }
 
     /**

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

@@ -476,7 +476,9 @@
 			<if test="projectReportStatus != null and projectReportStatus != ''">
 				AND prd.status = #{projectReportStatus}
 			</if>
-
+			<if test="submitMoney != null and submitMoney != ''">
+				AND a.submit_money = #{submitMoney}
+			</if>
 			<choose>
 				<when test="projectReportRecordStatus != null and projectReportRecordStatus != '' and projectReportRecordStatus != 0">
 					AND prr.status = #{projectReportRecordStatus}
@@ -643,7 +645,9 @@
 					</otherwise>
 				</choose>
 			</if>
-
+			<if test="submitMoney != null and submitMoney != ''">
+				AND a.submit_money = #{submitMoney}
+			</if>
 			<choose>
 				<when test="projectReportRecordStatus != null and projectReportRecordStatus != '' and projectReportRecordStatus != 0">
 					AND prr.status = #{projectReportRecordStatus}