样式调整

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

@@ -3319,13 +3319,19 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         //查询总审人员信息（新增报告选择得总审人员）
         List<User> bzshbs = new ArrayList<>();
         //查询总审人员Id
-        String bzshbUserId = userDao.getAuditUserListByBzshbUserId(reportData.getBzshbUserId());
-        User bzshbsUser = UserUtils.get(bzshbUserId);
-        if(null != bzshbsUser){
+        List<User> zjlList = UserUtils.getByRoleActivityEnname("zjl", 3, office.getId(), "25", materialDefectRecord.getCreateBy());
+        /*String bzshbUserId = userDao.getAuditUserListByBzshbUserId(reportData.getBzshbUserId());
+        User bzshbsUser = UserUtils.get(bzshbUserId);*/
+        if(zjlList.size() == 0){
+            return "总经理角色下下无用户,请联系管理员！";
+        }else{
+            bzshbs.addAll(zjlList);
+        }
+        /*if(null != bzshbsUser){
             bzshbs.add(bzshbsUser);
         }else if(null == bzshbsUser){
             return "流程审批总审人员下无用户,请联系管理员！";
-        }
+        }*/
         if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getId())) {
             workProjectNotify.setNotifyRole("");
             workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
@@ -3337,7 +3343,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                     List enusers = UserUtils.getByRoleActivityEnnames(a.getRole().getEnname(),office.getId(),"10",materialDefectRecord.getCreateBy());
                     if (enusers.size()==0){
                         materialDefectRecord.setStatus("1");
-                        return "报告归档流程审批人不能为空,角色"+a.getRole().getName()+"下无用户,请联系管理员！";
+                        return "总经理审批人不能为空,角色"+a.getRole().getName()+"下无用户,请联系管理员！";
                     }
                     variables.put(enlist, enusers);
                     variables.put(encount, enusers.size());
@@ -3363,7 +3369,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             if (bzshbs.size()==0){
                 materialDefectRecord.setStatus("1");
                 this.saveProjectMaterialDefectRecord(materialDefectRecord);
-                return "流程审批人不能为空,报告归档总审下无用户,请联系管理员！";
+                return "流程审批人不能为空,总经理下无用户,请联系管理员！";
             }
             variables.put("bzshbcount",bzshbs.size());
             processType = "materialDefectRecord";

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

@@ -306,7 +306,7 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         projectRecordsService.getPaperArchiveNotify();
         logger.info("-----------项目纸质归档长期未处理通知（结束）------------------");
         logger.info("-----------项目批量归档长期未处理通知（开始）------------------");
-        //projectRecordsService.getBatchArchiveNotify();
+        projectRecordsService.getBatchArchiveNotify();
         logger.info("-----------项目批量归档长期未处理通知（结束）------------------");
         map.put("msg","处理完成");
         return map;

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

@@ -264,7 +264,7 @@ public class WorkattachmentController extends BaseController {
 			HashMap<Object, Object> map = Maps.newHashMap();
 			map.put("str","success");
 
-		if(StringUtils.isNotBlank(workAttachment1.getProjectId())){
+		if(null != workAttachment1 && StringUtils.isNotBlank(workAttachment1.getProjectId())){
 				//cf70486864254239b3533eba5c19c19e 材料确认单id  （强耦合）
 				if("cf70486864254239b3533eba5c19c19e".equals(workAttachment1.getAttachmentId())){
 				RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(workAttachment1.getProjectId());

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

@@ -449,17 +449,21 @@ END) as projectScale*/
 		,ifnull(pmdr.status,0) as "defectRecordStatus"
 		,pmdr.process_instance_id as "pmdrProcessInstanceId"
 		,pmdr.id as pmdrId
-		,ifnull(ppf.status,0) as "paperFilingStatus"
+		/*,ifnull(ppf.status,0) as "paperFilingStatus"*/
+		,(case when a.paper_filing_status = '10' then 10 when a.paper_filing_status = '6' then '6' when a.paper_filing_status = '7' then '7' else ifnull(ppf.status,0) end) as "paperFilingStatus"
 		,ppf.process_instance_id as "ppfProcessInstanceId"
 		,ppf.id as "ppfId"
 		,pfb.process_instance_id AS "filingProcessinstanceId"
-		,ifnull(pfp.status,0) as "filingProjectStatus"
+		/*,ifnull(pfp.status,0) as "filingProjectStatus"*/
+		,(case when a.paper_filing_status = '10' then 10 when a.paper_filing_status = '6' then '6' when a.paper_filing_status = '7' then '7' else ifnull(pfp.status,0) end) as "filingProjectStatus"
 		,prd.audit_pass_date as "prdAuditDate"
 		,prd.ZiXunShouRu as "money"
 		,cb.case_process_id as "caseProcessId"
 		,cb.case_type as "caseType"
 		,cb.case_create_by as "caseCreateBy"
 		,if(case_status > 0 ,case_status,"0") as "caseStatus"
+		,a.paper_filing_status as "apaperFilingStatus"
+		,a.over_paper_filing_status as "overPaperFilingStatus"
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
@@ -482,7 +486,7 @@ END) as projectScale*/
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN sys_office o ON o.id = a.office_id
 		left join project_report_data prd on prd.project_id = a.id
-		left join project_report_data_two prdt on prdt.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id and prdt.del_flag = 0
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
 		left join project_paper_filing ppf on ppf.project_id = a.id
@@ -609,10 +613,24 @@ END) as projectScale*/
 						<choose>
 							<when test="submitMoney !=null and submitMoney !=''">
 								<if test="submitMoney == 1">
-									and pfp.status = #{downProjectReportRecordStatus}
+									<choose>
+										<when test="downProjectReportRecordStatus == 10">
+											and a.paper_filing_status = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and pfp.status = #{downProjectReportRecordStatus}
+										</otherwise>
+									</choose>
 								</if>
 								<if test="submitMoney == 2">
-									and ppf.status = #{downProjectReportRecordStatus}
+									<choose>
+										<when test="downProjectReportRecordStatus == 10 or downProjectReportRecordStatus == 6">
+											and a.paper_filing_status = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and ppf.status = #{downProjectReportRecordStatus}
+										</otherwise>
+									</choose>
 								</if>
 							</when>
 						</choose>
@@ -736,14 +754,35 @@ END) as projectScale*/
 						<choose>
 							<when test="submitMoney !=null and submitMoney !=''">
 								<if test="submitMoney == 1">
-									AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat(#{downProjectReportRecordStatus},'%'))
+									<choose>
+										<when test="downProjectReportRecordStatus == 10">
+											and temporarydb.apaperFilingStatus = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and (temporarydb.downProjectReportRecordPaperFilingStatus like concat(#{downProjectReportRecordStatus},'%'))
+										</otherwise>
+									</choose>
 								</if>
 								<if test="submitMoney == 2">
-									AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus}))
+									<choose>
+										<when test="downProjectReportRecordStatus == 10 or downProjectReportRecordStatus == 6">
+											and temporarydb.apaperFilingStatus = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and ( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus}))
+										</otherwise>
+									</choose>
 								</if>
 							</when>
 							<otherwise>
-								AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus},'%'))
+								<choose>
+									<when test="downProjectReportRecordStatus == 10 or downProjectReportRecordStatus == 6 or downProjectReportRecordStatus == 7">
+										and temporarydb.apaperFilingStatus = #{downProjectReportRecordStatus}
+									</when>
+									<otherwise>
+										AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus},'%'))
+									</otherwise>
+								</choose>
 							</otherwise>
 						</choose>
 
@@ -811,7 +850,7 @@ END) as projectScale*/
 		,pmdr.process_instance_id as "pmdrProcessInstanceId"
 		,pmdr.id as pmdrId
 
-		,(case when a.submit_money = '1' then ifnull(pfp.status,0) when a.submit_money = '2' then ifnull(ppf.status,0) else '' end) as paperFilingStatus
+		,(case when a.submit_money = '1' then ifnull((case when a.paper_filing_status = '10' then 10 when a.paper_filing_status = '6' then '6' when a.paper_filing_status = '7' then '7' else ifnull(pfp.status,0) end),0) when a.submit_money = '2' then ifnull((case when a.paper_filing_status = '10' then 10 when a.paper_filing_status = '6' then '6' when a.paper_filing_status = '7' then '7' else ifnull(ppf.status,0) end),0) else '' end) as paperFilingStatus
 		/*,ifnull(ppf.status,0) as "paperFilingStatus"*/
 		,ppf.process_instance_id as "ppfProcessInstanceId"
 		,ppf.id as "ppfId"
@@ -823,6 +862,8 @@ END) as projectScale*/
 		,cb.case_type as "caseType"
 		,cb.case_create_by as "caseCreateBy"
 		,if(case_status > 0 ,case_status,"0") as "caseStatus"
+		,a.paper_filing_status as "apaperFilingStatus"
+		,a.over_paper_filing_status as "overPaperFilingStatus"
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		LEFT JOIN sys_user sub on a.project_master_id = sub.id
@@ -846,7 +887,7 @@ END) as projectScale*/
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN sys_office o ON o.id = a.office_id
 		left join project_report_data prd on prd.project_id = a.id
-		left join project_report_data_two prdt on prdt.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id and prdt.del_flag = 0
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
 		left join project_paper_filing ppf on ppf.project_id = a.id
@@ -956,10 +997,24 @@ END) as projectScale*/
 						<choose>
 							<when test="submitMoney !=null and submitMoney !=''">
 								<if test="submitMoney == 1">
-									and pfp.status = #{downProjectReportRecordStatus}
+									<choose>
+										<when test="downProjectReportRecordStatus == 10">
+											and a.paper_filing_status = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and pfp.status = #{downProjectReportRecordStatus}
+										</otherwise>
+									</choose>
 								</if>
 								<if test="submitMoney == 2">
-									and ppf.status = #{downProjectReportRecordStatus}
+									<choose>
+										<when test="downProjectReportRecordStatus == 10 or downProjectReportRecordStatus == 6">
+											and a.paper_filing_status = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and ppf.status = #{downProjectReportRecordStatus}
+										</otherwise>
+									</choose>
 								</if>
 							</when>
 						</choose>
@@ -1100,14 +1155,35 @@ END) as projectScale*/
 						<choose>
 							<when test="submitMoney !=null and submitMoney !=''">
 								<if test="submitMoney == 1">
-									AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat(#{downProjectReportRecordStatus},'%'))
+									<choose>
+										<when test="downProjectReportRecordStatus == 10">
+											and temporarydb.apaperFilingStatus = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and (temporarydb.downProjectReportRecordPaperFilingStatus like concat(#{downProjectReportRecordStatus},'%'))
+										</otherwise>
+									</choose>
 								</if>
 								<if test="submitMoney == 2">
-									AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus}))
+									<choose>
+										<when test="downProjectReportRecordStatus == 10 or downProjectReportRecordStatus == 6">
+											and temporarydb.apaperFilingStatus = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and ( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus}))
+										</otherwise>
+									</choose>
 								</if>
 							</when>
 							<otherwise>
-								AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus},'%'))
+								<choose>
+									<when test="downProjectReportRecordStatus == 10 or downProjectReportRecordStatus == 6 or downProjectReportRecordStatus == 7">
+										and temporarydb.apaperFilingStatus = #{downProjectReportRecordStatus}
+									</when>
+									<otherwise>
+										AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus},'%'))
+									</otherwise>
+								</choose>
 							</otherwise>
 						</choose>
 
@@ -1122,6 +1198,20 @@ END) as projectScale*/
 		select count( id) from (
 		SELECT  (a.id) as id
 		,concat(ifnull( pfp.STATUS, 0 ),ifnull( ppf.STATUS, 0 )) as "downProjectReportRecordPaperFilingStatus"
+		/*,ifnull(ppf.status,0) as "paperFilingStatus"*/
+		,(case when a.paper_filing_status = '10' then 10 when a.paper_filing_status = '6' then '6' when a.paper_filing_status = '7' then '7' else ifnull(ppf.status,0) end) as "paperFilingStatus"
+		,ppf.process_instance_id as "ppfProcessInstanceId"
+		,ppf.id as "ppfId"
+		,pfb.process_instance_id AS "filingProcessinstanceId"
+		/*,ifnull(pfp.status,0) as "filingProjectStatus"*/
+		,(case when a.paper_filing_status = '10' then 10 when a.paper_filing_status = '6' then '6' when a.paper_filing_status = '7' then '7' else ifnull(pfp.status,0) end) as "filingProjectStatus"
+		,prd.audit_pass_date as "prdAuditDate"
+		,cb.case_process_id as "caseProcessId"
+		,cb.case_type as "caseType"
+		,cb.case_create_by as "caseCreateBy"
+		,if(case_status > 0 ,case_status,"0") as "caseStatus"
+		,a.paper_filing_status as "apaperFilingStatus"
+		,a.over_paper_filing_status as "overPaperFilingStatus"
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
@@ -1258,10 +1348,24 @@ END) as projectScale*/
 						<choose>
 							<when test="submitMoney !=null and submitMoney !=''">
 								<if test="submitMoney == 1">
-									and pfp.status = #{downProjectReportRecordStatus}
+									<choose>
+										<when test="downProjectReportRecordStatus == 10">
+											and a.paper_filing_status = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and pfp.status = #{downProjectReportRecordStatus}
+										</otherwise>
+									</choose>
 								</if>
 								<if test="submitMoney == 2">
-									and ppf.status = #{downProjectReportRecordStatus}
+									<choose>
+										<when test="downProjectReportRecordStatus == 10 or downProjectReportRecordStatus == 6">
+											and a.paper_filing_status = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and ppf.status = #{downProjectReportRecordStatus}
+										</otherwise>
+									</choose>
 								</if>
 							</when>
 						</choose>
@@ -1388,14 +1492,35 @@ END) as projectScale*/
 						<choose>
 							<when test="submitMoney !=null and submitMoney !=''">
 								<if test="submitMoney == 1">
-									AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat(#{downProjectReportRecordStatus},'%'))
+									<choose>
+										<when test="downProjectReportRecordStatus == 10">
+											and temporarydb.apaperFilingStatus = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and (temporarydb.downProjectReportRecordPaperFilingStatus like concat(#{downProjectReportRecordStatus},'%'))
+										</otherwise>
+									</choose>
 								</if>
 								<if test="submitMoney == 2">
-									AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus}))
+									<choose>
+										<when test="downProjectReportRecordStatus == 10 or downProjectReportRecordStatus == 6">
+											and temporarydb.apaperFilingStatus = #{downProjectReportRecordStatus}
+										</when>
+										<otherwise>
+											and ( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus}))
+										</otherwise>
+									</choose>
 								</if>
 							</when>
 							<otherwise>
-								AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus},'%'))
+								<choose>
+									<when test="downProjectReportRecordStatus == 10 or downProjectReportRecordStatus == 6 or downProjectReportRecordStatus == 7">
+										and temporarydb.apaperFilingStatus = #{downProjectReportRecordStatus}
+									</when>
+									<otherwise>
+										AND( temporarydb.downProjectReportRecordPaperFilingStatus like concat('%',#{downProjectReportRecordStatus},'%'))
+									</otherwise>
+								</choose>
 							</otherwise>
 						</choose>
 

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -651,6 +651,7 @@
 		LEFT JOIN sys_user sua ON sua.id = a.account_checking_user_id
 		left join work_invoice_detail wid on a.id = wid.invoice_id
 		LEFT join sys_office so on so.id = a.office_id
+		left join work_invoice_receipt wir on wir.invoice_id = a.id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="widNumber != null and widNumber != ''">
@@ -695,7 +696,10 @@
 				AND (a.create_by = #{submitterId} or su.name like concat('%',#{submitterName},'%'))
 			</if>
 			<if test="receiptBeginDate != null and receiptBeginDate != ''">
-				AND date_format(a.receipt_money_date,'%Y-%m-%d') &gt;= date_format(#{receiptBeginDate},'%Y-%m-%d')
+				AND (date_format(a.receipt_money_date,'%Y-%m-%d') &gt;= date_format(#{receiptBeginDate},'%Y-%m-%d') or date_format(wir.receipt_date,'%Y-%m-%d') &gt;= date_format(#{receiptBeginDate},'%Y-%m-%d'))
+			</if>
+			<if test="receiptEndDate != null and receiptEndDate != ''">
+				AND (date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{receiptEndDate},'%Y-%m-%d') or date_format(wir.receipt_date,'%Y-%m-%d') &lt;= date_format(#{receiptEndDate},'%Y-%m-%d'))
 			</if>
 			<if test="client != null and client.name != null and client.name != ''">
 				AND w.name LIKE
@@ -750,6 +754,7 @@
 		LEFT JOIN rural_project_records p ON  p.id = a.project_id
 		LEFT JOIN sys_user sua ON sua.id = a.account_checking_user_id
 		left join work_invoice_detail wid on a.id = wid.invoice_id
+		left join work_invoice_receipt wir on wir.invoice_id = a.id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="widNumber != null and widNumber != ''">
@@ -792,7 +797,10 @@
 				AND (a.create_by = #{submitterId} or su.name like concat('%',#{submitterName},'%'))
 			</if>
 			<if test="receiptBeginDate != null and receiptBeginDate != ''">
-				AND date_format(a.receipt_money_date,'%Y-%m-%d') &gt;= date_format(#{receiptBeginDate},'%Y-%m-%d')
+				AND (date_format(a.receipt_money_date,'%Y-%m-%d') &gt;= date_format(#{receiptBeginDate},'%Y-%m-%d') or date_format(wir.receipt_date,'%Y-%m-%d') &gt;= date_format(#{receiptBeginDate},'%Y-%m-%d'))
+			</if>
+			<if test="receiptEndDate != null and receiptEndDate != ''">
+				AND (date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{receiptEndDate},'%Y-%m-%d') or date_format(wir.receipt_date,'%Y-%m-%d') &lt;= date_format(#{receiptEndDate},'%Y-%m-%d'))
 			</if>
 			<if test="client != null and client.name != null and client.name != ''">
 				AND w.name LIKE
@@ -907,7 +915,8 @@
 		LEFT JOIN rural_project_records rpr1 ON wipr1.project_id = rpr1.id
 		LEFT JOIN project_report_data prd1 ON prd1.project_id = wipr1.project_id
 		WHERE wipr1.invoice_id = a.id) as reportNumber,
-		(select wir.receipt_date from work_invoice_receipt wir where wir.invoice_id = a.id order by wir.receipt_date desc limit 1 ) as "receiptMoneyDate",
+		/*(select wir.receipt_date from work_invoice_receipt wir where wir.invoice_id = a.id order by wir.receipt_date desc limit 1 ) as "receiptMoneyDate",*/
+		ifnull(( SELECT wir.receipt_date FROM work_invoice_receipt wir WHERE wir.invoice_id = a.id ORDER BY wir.receipt_date DESC LIMIT 1 ),a.receipt_money_date) AS "receiptMoneyDate",
 		ifnull((select sum(wir.money) from work_invoice_receipt wir where wir.invoice_id = a.id ),0) as "receiptMoneyD"
 		FROM work_invoice a
 		LEFT JOIN sys_user su ON su.id = a.create_by
@@ -919,6 +928,7 @@
 		LEFT JOIN sys_user sua ON sua.id = a.account_checking_user_id
 		left join work_invoice_detail wid on a.id = wid.invoice_id
 		LEFT join sys_office so on so.id = a.office_id
+		left join work_invoice_receipt wir on wir.invoice_id = a.id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="widNumber != null and widNumber != ''">
@@ -963,7 +973,10 @@
 				AND (a.create_by = #{submitterId} or su.name like concat('%',#{submitterName},'%'))
 			</if>
 			<if test="receiptBeginDate != null and receiptBeginDate != ''">
-				AND date_format(a.receipt_money_date,'%Y-%m-%d') &gt;= date_format(#{receiptBeginDate},'%Y-%m-%d')
+				AND (date_format(a.receipt_money_date,'%Y-%m-%d') &gt;= date_format(#{receiptBeginDate},'%Y-%m-%d') or date_format(wir.receipt_date,'%Y-%m-%d') &gt;= date_format(#{receiptBeginDate},'%Y-%m-%d'))
+			</if>
+			<if test="receiptEndDate != null and receiptEndDate != ''">
+				AND (date_format(a.receipt_money_date,'%Y-%m-%d') &lt;= date_format(#{receiptEndDate},'%Y-%m-%d') or date_format(wir.receipt_date,'%Y-%m-%d') &lt;= date_format(#{receiptEndDate},'%Y-%m-%d'))
 			</if>
 			<if test="client != null and client.name != null and client.name != ''">
 				AND w.name LIKE

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

@@ -897,12 +897,11 @@
 							</div>
 						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label double-line">资料缺失说明：</label>
+							<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="0" label="未发起"/>
-									<form:option value="2" label="已发起"/>
+									<form:option value="2" label="进行中"/>
 									<form:option value="5" label="已完成"/>
 								</form:select>
 							</div>

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

@@ -819,6 +819,9 @@
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>
 									<form:option value="5" label="已归档"/>
+									<form:option value="6" label="超期未归档"/>
+									<form:option value="7" label="超期归档"/>
+									<form:option value="10" label="无需归档"/>
 									<%--									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
 								</form:select>
 							</div>
@@ -940,20 +943,20 @@
 				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
 					}}
-                ,{align:'center', title: '质量复核',  width:70,templet:function(d){
+                ,{align:'center', title: '质量复核',  width:110,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
-                            var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '报告签发',  width:90,templet:function(d){
+				,{align:'center', title: '报告签发',  width:110,templet:function(d){
 						var st = getAuditState(""+d.projectReportStatusTwo);
 						if(st.action)
-							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						else
-							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
                 ,{align:'center', title: '电子',  width:120,templet:function(d){
@@ -977,7 +980,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-                ,{align:'center', title: '纸质',  width:70,templet:function(d){
+                ,{align:'center', title: '纸质',  width:110,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -985,16 +988,16 @@
 						}
                         if(st.action){
                         	if (d.submitMoney=="1"){
-								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 							}else if (d.submitMoney=="2"){
-								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 							}
 						}else{
-							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
                         return xml;
                     }}
-                ,{align:'center', title: '上报',  width:90,templet:function(d){
+                ,{align:'center', title: '上报',  width:110,templet:function(d){
                         var st = getReportedState(d.reportedState);
                         if(st.action)
                             var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";