Merge remote-tracking branch 'origin/master'

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

@@ -678,6 +678,12 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     }
                 }
             }
+            for (DownloadProjectRecords info : recordsListOnType) {
+                if(null != info.getProjectReportRecordStatus() && 1 == info.getProjectReportRecordStatus()){
+                    info.setRecordStartAuditDate(null);
+                }
+
+            }
             recordsList.addAll(recordsListOnType);
         }
         //查询未超期的筛选项项目信息

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

@@ -131,7 +131,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }
         String oldSubmitMoney = "";
         //判断是否选择紧急项目
-        if(StringUtils.isNotBlank(projectRecords.getSubmitMoney())){
+        /*if(StringUtils.isNotBlank(projectRecords.getSubmitMoney())){
             switch (projectRecords.getSubmitMoney()){
                 case "3":
                     oldSubmitMoney = projectRecords.getSubmitMoney();
@@ -142,7 +142,7 @@ public class RuralCostProjectMessageController extends BaseController {
                     projectRecords.setEmergencyProject("0");
                     break;
             }
-        }
+        }*/
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(projectRecords.getToflag())){
             if (projectRecords.getToflag().equals("1")){

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

@@ -91,7 +91,7 @@ public class RuralProjectMessageAllController extends BaseController {
         }
         String oldSubmitMoney = "";
         //判断是否选择紧急项目
-        if(StringUtils.isNotBlank(projectRecords.getSubmitMoney())){
+        /*if(StringUtils.isNotBlank(projectRecords.getSubmitMoney())){
             switch (projectRecords.getSubmitMoney()){
                 case "3":
                     oldSubmitMoney = projectRecords.getSubmitMoney();
@@ -102,7 +102,7 @@ public class RuralProjectMessageAllController extends BaseController {
                     projectRecords.setEmergencyProject("0");
                     break;
             }
-        }
+        }*/
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(projectRecords.getToflag())){
             request.getSession().removeAttribute("searchRuralProjectRecordsAll");

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

@@ -144,7 +144,7 @@ public class RuralProjectMessageController extends BaseController {
         }
         String oldSubmitMoney = "";
         //判断是否选择紧急项目
-        if(StringUtils.isNotBlank(projectRecords.getSubmitMoney())){
+        /*if(StringUtils.isNotBlank(projectRecords.getSubmitMoney())){
             switch (projectRecords.getSubmitMoney()){
                 case "3":
                     oldSubmitMoney = projectRecords.getSubmitMoney();
@@ -155,7 +155,7 @@ public class RuralProjectMessageController extends BaseController {
                     projectRecords.setEmergencyProject("0");
                     break;
             }
-        }
+        }*/
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(projectRecords.getToflag())){
             request.getSession().removeAttribute("searchRuralProjectRecordList");

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

@@ -677,6 +677,7 @@ END) as projectScale
 		SELECT
 		<include refid="recordDownloadSql"/>
 		,ifnull(prr.status,0) as "projectReportRecordStatus"
+		,prr.record_date as  "recordStartAuditDate"
 		FROM rural_project_records a
 		<include refid="recordDownloadLeftSql"/>
 		<where>
@@ -839,6 +840,9 @@ END) as projectScale
 		SELECT
 		<include refid="recordDownloadSql"/>
 		,ifnull(rprr.report_status,0) as "projectReportRecordStatus"
+		,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
+		order by create_date
+		limit 1) as "recordStartAuditDate"
 		FROM rural_project_records a
 		<include refid="recordDownloadLeftSql"/>
 		<where>

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

@@ -595,8 +595,9 @@
 								<form:select path="submitMoney" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:option value="2" label="A级"/>
-									<form:option value="3" label="B级紧急"/>
-									<form:option value="1" label="B级非紧急"/>
+									<form:option value="1" label="B级"/>
+									<%--<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>--%>
 								</form:select>
 							</div>
 						</div>
@@ -879,7 +880,7 @@
 							if(d.projectReportStatusTwo == 0){
 								if(d.projectReportStatus == 5){
 									if(d.emergencyProject == 1){
-										if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
+										if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5 && d.projectReportRecordStatus != 6 && d.projectReportRecordStatus != 7){
 											if (d.defectRecordStatus==0) {
 												xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
 											}
@@ -1101,14 +1102,15 @@
 							"A级"
 						</c:when>
 						<c:otherwise>
-							<c:choose>
+								"B级"
+							<%--<c:choose>
 								<c:when test="${'1'==projectRecords.emergencyProject}">
 									"B级紧急"
 								</c:when>
 								<c:otherwise>
 									"B级非紧急"
 								</c:otherwise>
-							</c:choose>
+							</c:choose>--%>
 						</c:otherwise>
 					</c:choose>
                     <c:choose>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -696,8 +696,9 @@
 								<form:select path="submitMoney" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:option value="2" label="A级"/>
-									<form:option value="3" label="B级紧急"/>
-									<form:option value="1" label="B级非紧急"/>
+									<form:option value="1" label="B级"/>
+									<%--<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>--%>
 								</form:select>
 							</div>
 						</div>
@@ -970,14 +971,15 @@
 							"A级"
 						</c:when>
 						<c:otherwise>
-							<c:choose>
+							"B级"
+							<%--<c:choose>
 								<c:when test="${'1'==projectRecords.emergencyProject}">
 									"B级紧急"
 								</c:when>
 								<c:otherwise>
 									"B级非紧急"
 								</c:otherwise>
-							</c:choose>
+							</c:choose>--%>
 						</c:otherwise>
 					</c:choose>
                 }

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -593,8 +593,9 @@
 								<form:select path="submitMoney" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:option value="2" label="A级"/>
-									<form:option value="3" label="B级紧急"/>
-									<form:option value="1" label="B级非紧急"/>
+									<form:option value="1" label="B级"/>
+									<%--<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>--%>
 								</form:select>
 							</div>
 						</div>
@@ -876,7 +877,7 @@
 							if(d.projectReportStatusTwo == 0){
 								if(d.projectReportStatus == 5){
 									if(d.emergencyProject == 1){
-										if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
+										if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5 && d.projectReportRecordStatus != 6 && d.projectReportRecordStatus != 7){
 											if (d.defectRecordStatus==0) {
 												xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
 											}
@@ -1103,14 +1104,15 @@
 							"A级"
 							</c:when>
 							<c:otherwise>
-								<c:choose>
+								"B级"
+								<%--<c:choose>
 								<c:when test="${'1'==projectRecords.emergencyProject}">
 								"B级紧急"
 								</c:when>
 								<c:otherwise>
 								"B级非紧急"
 								</c:otherwise>
-								</c:choose>
+								</c:choose>--%>
 							</c:otherwise>
 					</c:choose>
                     <c:choose>