样式调整

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportRecordService.java

@@ -148,6 +148,11 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		return projectReportRecord;
 	}
 
+	/**
+	 * 根据报告id查询资料确实说明信息
+	 * @param id
+	 * @return
+	 */
 	public ProjectMaterialDefectRecord getByReportId(String id){
 		return dao.getByReportId(id);
 	}

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

@@ -91,7 +91,7 @@ public class ProjectReportDefectRecordController extends BaseController {
 	public List<ZuZhi> getZuzhi(HttpServletRequest request,ProjectMaterialDefectRecord materialDefectRecord,String biaoJi) {
 		//查询“配农网”工程类型id
 		String engineeringId = engineeringService.getEngineeringId("202");
-		if (StringUtils.isNotEmpty(materialDefectRecord.getId())){
+		if (StringUtils.isNotBlank(materialDefectRecord.getId())){
 			materialDefectRecord = projectReportRecordService.getMaterialDefectRecord(materialDefectRecord.getId());
 		}
 		//获取项目信息

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

@@ -298,6 +298,9 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         logger.info("------------项目超期未质量符合定时任务开始--------------------");
         projectRecordsService.getJudgeAdvanceWeekNotice();
         logger.info("------------项目超期未质量符合定时任务结束--------------------");*/
+        logger.info("------------项目超期未质量符合定时任务开始--------------------");
+        projectRecordsService.getJudgeAdvanceWeekNotice();
+        logger.info("------------项目超期未质量符合定时任务结束--------------------");
 
         logger.info("-----------项目超期未归档定时任务开始（A类纸质归档）------------------");
         //projectRecordsService.saveProjectRecordListByPaperFiling();

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

@@ -579,14 +579,7 @@ END) as projectScale*/
 						and pmdr.status is null
 					</when>
 					<otherwise>
-						<choose>
-							<when test="defectRecordStatus == 2">
-								and pmdr.status in (1,2,3,4,6,7)
-							</when>
-							<otherwise>
-								and pmdr.status = 5
-							</otherwise>
-						</choose>
+						and pmdr.status = #{defectRecordStatus}
 					</otherwise>
 				</choose>
 			</if>
@@ -1029,14 +1022,7 @@ END) as projectScale*/
 						and pmdr.status is null
 					</when>
 					<otherwise>
-						<choose>
-							<when test="defectRecordStatus == 2">
-								and pmdr.status in (1,2,3,4,6,7)
-							</when>
-							<otherwise>
-								and pmdr.status = 5
-							</otherwise>
-						</choose>
+						and pmdr.status = #{defectRecordStatus}
 					</otherwise>
 				</choose>
 			</if>
@@ -1381,14 +1367,7 @@ END) as projectScale*/
 						and pmdr.status is null
 					</when>
 					<otherwise>
-						<choose>
-							<when test="defectRecordStatus == 2">
-								and pmdr.status in (1,2,3,4,6,7)
-							</when>
-							<otherwise>
-								and pmdr.status = 5
-							</otherwise>
-						</choose>
+						and pmdr.status = #{defectRecordStatus}
 					</otherwise>
 				</choose>
 			</if>

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

@@ -546,6 +546,16 @@
 			<if test="attachmentProjectSort !=null and attachmentProjectSort != ''">
 				AND a.attachment_project_sort = #{attachmentProjectSort}
 			</if>
+			<if test="null != defectRecordStatus">
+				<choose>
+					<when test="defectRecordStatus == 0">
+						and pmdr.status is null
+					</when>
+					<otherwise>
+						and pmdr.status = #{defectRecordStatus}
+					</otherwise>
+				</choose>
+			</if>
             <if test="emergencyProject !=null and emergencyProject != ''">
 				<choose>
 					<when test="emergencyProject == 0">
@@ -862,6 +872,16 @@
 			<if test="attachmentProjectSort !=null and attachmentProjectSort != ''">
 				AND a.attachment_project_sort = #{attachmentProjectSort}
 			</if>
+			<if test="null != defectRecordStatus">
+				<choose>
+					<when test="defectRecordStatus == 0">
+						and pmdr.status is null
+					</when>
+					<otherwise>
+						and pmdr.status = #{defectRecordStatus}
+					</otherwise>
+				</choose>
+			</if>
 			<if test="emergencyProject !=null and emergencyProject != ''">
 				<choose>
 					<when test="emergencyProject == 0">

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

@@ -738,7 +738,7 @@
 			////对操作进行初始化
 			var xml = '<div class=\"layui-btn-group\">';
 			if(d.falg=="1"){
-				if(d.projectReportStatus == 0 || d.projectReportStatus == 0){
+				if(d.projectReportStatus == 0 || d.projectReportStatus == 6){
 					xml+="<a href=\"#\" onclick=\"openDialogre('新增报告质量复核', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 新增质量复核</a>";
 				}
 				if(d.projectReportStatus == 1){
@@ -1236,6 +1236,18 @@
 								</form:select>
 							</div>
 						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label double-line">缺失说明：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<form:select path="defectRecordStatus" class="form-control simple-select">
+									<form:option value="" label=""/>
+									<form:option value="2" label="进行中"/>
+									<form:option value="3" label="撤回"/>
+									<form:option value="4" label="驳回"/>
+									<form:option value="5" label="已完成"/>
+								</form:select>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>

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

@@ -902,6 +902,8 @@
 								<form:select path="defectRecordStatus" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:option value="2" label="进行中"/>
+									<form:option value="3" label="撤回"/>
+									<form:option value="4" label="驳回"/>
 									<form:option value="5" label="已完成"/>
 								</form:select>
 							</div>
@@ -1049,7 +1051,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if(noArchivedDays != null && noArchivedDays != undefined && '' != noArchivedDays){
-							xml+="<span style='margin-left: 5px;'>" + noArchivedDays + "天" + "</span>";
+							xml+="<span style='margin-left: 5px;' title='未归档天数'>" + noArchivedDays + "天" + "</span>";
 						}else{
 						}
 						var de = getdefectRecordState(""+d.defectRecordStatus);

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

@@ -847,6 +847,18 @@
 								</form:select>
 							</div>
 						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label double-line">缺失说明：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<form:select path="defectRecordStatus" class="form-control simple-select">
+									<form:option value="" label=""/>
+									<form:option value="2" label="进行中"/>
+									<form:option value="3" label="撤回"/>
+									<form:option value="4" label="驳回"/>
+									<form:option value="5" label="已完成"/>
+								</form:select>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -970,7 +982,7 @@
 						}
 						if(noArchivedDays != null && noArchivedDays != undefined && '' != noArchivedDays){
 							// return "<font style = 'margin-left: 5px;' class='layui-badge layui-bg-orange'>"+noArchivedDays + '天'+"</font>";
-							xml+="<span style='margin-left: 5px;' >" + noArchivedDays + "天" + "</span>";
+							xml+="<span style='margin-left: 5px;' title='未归档天数' >" + noArchivedDays + "天" + "</span>";
 						}else{
 							// return "<font style = 'margin-left: 5px;'class='layui-badge layui-bg-orange'></font>";
 						}
@@ -1049,7 +1061,7 @@
 							////对操作进行初始化
 						var xml = '<div class=\"layui-btn-group\">';
 						if(d.falg=="1"){
-							if(d.projectReportStatus == 0){
+							if(d.projectReportStatus == 0 || d.projectReportStatus == 6){
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增报告质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 新增质量复核</a>";
 							}
 							if(d.projectReportStatus == 1){
@@ -1089,7 +1101,7 @@
 								}
 							}
 							//报告签发操作
-							if(d.projectReportStatus == 5 && d.emergencyProject != 1){
+							if(d.projectReportStatus == 5 || d.projectReportStatus == 7 && d.emergencyProject != 1){
 
 								if(d.projectReportStatusTwo == 0){
 									xml+="<a href=\"#\" onclick=\"openDialogre('报告签发', '${ctx}/ruralProject/ruralProjectMessageNewTwo/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 报告签发</a>";
@@ -1115,7 +1127,7 @@
 
 							//线上归档操作
 							if(d.projectReportStatusTwo == 0){
-								if(d.projectReportStatus == 5){
+								if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
 									if(d.emergencyProject == 1){
 										/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 										if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
@@ -1176,7 +1188,7 @@
 							}
 							//归档资料缺失说明
 							if(d.projectReportStatusTwo == 0){
-								if(d.projectReportStatus == 5){
+								if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
 									if(d.emergencyProject == 1){
 										if( d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
 											if (d.defectRecordStatus==0) {
@@ -1222,7 +1234,7 @@
 							}
 							/*上报相关按钮*/
 							if(d.projectReportStatusTwo == 0){
-								if(d.projectReportStatus == 5){
+								if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
 									if(d.emergencyProject == 1){
 										if(d.syncStatus == 0){
 											if(d.reportStatus == 0){
@@ -1311,7 +1323,7 @@
 
 
 
-							if('1' == d.flagAdmin && d.projectReportStatus == 5)
+							if('1' == d.flagAdmin && (d.projectReportStatus == 5 || d.projectReportStatus == 7))
 							{
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
 								xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 历史报告</a>";
@@ -1334,7 +1346,7 @@
 								xml+="<a href=\"#\" onclick=\"projectUpgrade('"+d.id+"','"+d.projectReportRecordStatus+"','"+d.filingProjectStatus+"','"+d.projectReportStatus+"','"+d.projectReportStatusTwo+"')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 项目升级</a>";
 							}
 						}
-						if(d.projectReportStatus == 5){
+						if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
 							if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";
 							}

src/main/webapp/webpage/modules/workreimbursement/workReimbursementInformationTrack.jsp

@@ -15,12 +15,9 @@
 	<script type="text/javascript">
 
 		layui.use(['tree', 'util'], function() {
-			console.log('进来了')
 			var reportId = "${projectMaterialDefectRecord.reportId}"
 			var id = "${projectMaterialDefectRecord.id}"
 			var test = 'test'
-			// console.log('reportId', reportId)
-			// console.log('id', id)
 			let re = [];
 			$.ajax({
 				//几个参数需要注意一下
@@ -29,7 +26,6 @@
 				url: '${ctx}/projectReportDefectRecord/projectReportDefectRecord/getZuzhi',
 				data: {"reportId": reportId,"id": id, "biaoJi": test},
 				success: function (result) {
-					console.log('result', result)
 					re=result;
 					// var tree = layui.tree;
 					// var util = layui.util
@@ -41,7 +37,6 @@
 					// id: 1,
 					// title: '成果文件'
 					// , children: re}]
-					console.log('tree', tree)
 					tree.render({
 						elem: '#test2'
 						,data: data