月报数据重新处理

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

@@ -35,6 +35,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Date remindTime;	//提醒时间
 	private Date paperFilingAuditPassDate;	//A类纸质归档审核时间
 	private Date filingBatchAuditPassDate;	//B类纸质归档审核时间
+	private Date accomplishDate;	//上报审核时间
 	private Date firstAuditDate;	//质量复核首次审核通过时间
 	private String hiatus;	//短期/永久（0:短期，1:永久）
 	private String pmdrCompanyId;
@@ -165,6 +166,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String officeName;
 	private String flagAdmin;
 	private String reportedState;   //上报状态
+	private String reportedStateNoDays; //超期未上报天数
 	private String syncStatus;   //同步状态
 	private String reportStatus;   //上报状态
 	private String view;
@@ -1080,6 +1082,14 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.reportedState = reportedState;
 	}
 
+	public String getReportedStateNoDays() {
+		return reportedStateNoDays;
+	}
+
+	public void setReportedStateNoDays(String reportedStateNoDays) {
+		this.reportedStateNoDays = reportedStateNoDays;
+	}
+
 	public List<ProjectPlanInfo> getProjectPlanList() {
 		return projectPlanList;
 	}
@@ -2682,4 +2692,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setFirstAuditDate(Date firstAuditDate) {
 		this.firstAuditDate = firstAuditDate;
 	}
+
+	public Date getAccomplishDate() {
+		return accomplishDate;
+	}
+
+	public void setAccomplishDate(Date accomplishDate) {
+		this.accomplishDate = accomplishDate;
+	}
 }

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

@@ -101,6 +101,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 	private String officeName;
 	private String flagAdmin;
 	private String reportedState;   //上报状态
+	private String reportedStateNoDays; //超期未上报天数
 	private String syncStatus;   //同步状态
 	private String reportStatus;   //上报状态
 	private String view;
@@ -958,6 +959,14 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.reportedState = reportedState;
 	}
 
+	public String getReportedStateNoDays() {
+		return reportedStateNoDays;
+	}
+
+	public void setReportedStateNoDays(String reportedStateNoDays) {
+		this.reportedStateNoDays = reportedStateNoDays;
+	}
+
 	public List<ProjectPlanInfo> getProjectPlanList() {
 		return projectPlanList;
 	}

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

@@ -435,7 +435,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			//查询报告文件、依据性文件、其他文件必填列表以及数据
 			List<MainDictDetail> projectSortList = projectSortList();
 
-			//查询超期时间天数
+			//查询超期上报时间天数
 			List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_count");
 			//查询超期时间天数(电子归档)
 			List<MainDictDetail> adventRecordCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_count");
@@ -444,6 +444,11 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			//查询超期时间天数(B类纸质归档)
 			List<MainDictDetail> adventRecordBCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_B_count");
 
+			Integer endingAdventCount = 0;
+			if(adventCount.size()>0){
+				//获取超期时间天数(上报)转int
+				endingAdventCount = Integer.parseInt(adventCount.get(0).getLabel());
+			}
 			Integer endingAdventRecordCount = 0;
 			if(adventRecordCount.size()>0){
 				//获取超期时间天数(电子归档)转int
@@ -488,9 +493,6 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 
 				//判断是A类还是B类 2是A类1是B类
 				if ("1".equals(info.getSubmitMoney())){
-					if(info.getProjectReportNumber().equals("苏兴造字【2023】5231")){
-						System.out.println();
-					}
 					//设置电子未归档天数
 					if (null != info.getFirstAuditDate() && 5 != info.getProjectReportRecordStatus()
 							&& 7!= info.getProjectReportRecordStatus()){
@@ -553,6 +555,39 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 						}
 
 					}
+
+					//设置上报未归档天数
+					if (null != info.getFirstAuditDate()
+							&& !"5".equals(info.getReportedState())
+							&& !"7".equals(info.getReportedState()) && !"10".equals(info.getReportedState())){
+						try {
+							Date date2 = info.getFirstAuditDate();
+							Long dateTimeLong = date.getTime();
+							Long date2TimeLong = date2.getTime();
+							//计算未归档天数
+							Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+							endTime = endTime - endingAdventCount;
+							info.setReportedStateNoDays(endTime.toString());
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+					}else if(null != info.getFirstAuditDate()
+							&& ("5".equals(info.getReportedState())
+							|| "10".equals(info.getReportedState())) && null != info.getFilingBatchAuditPassDate()) {
+						try {
+							Date date2 = info.getFirstAuditDate();
+							//获取电子归档审核通过时间
+							Long dateTimeLong = info.getFilingBatchAuditPassDate().getTime();
+							Long date2TimeLong = date2.getTime();
+							//计算未归档天数
+							Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+							endTime = endTime - endingAdventCount;
+							info.setReportedStateNoDays(endTime.toString());
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+
+					}
 				} else if ("2".equals(info.getSubmitMoney())){
 					//设置电子未归档天数
 					if (null != info.getTwoAuditPassDate() && 5 != info.getProjectReportRecordStatus()
@@ -2112,7 +2147,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		List<RuralProjectRecords> projectRecordsList = dao.getProjectReportedListByAdvent(projectRecords);
 		List<RuralProjectRecords> projectRecordsListNoUrgency = dao.getProjectReportedListByAdventNoUrgency(projectRecords);
 		projectRecordsList.addAll(projectRecordsListNoUrgency);
-		for (RuralProjectRecords info: projectRecordsList) {
+		/*for (RuralProjectRecords info: projectRecordsList) {
 			String notifyStr = null;
 			String titleStr = null;
 			//如果当前时间大于过期时间
@@ -2157,7 +2192,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 
 			}
 
-		}
+		}*/
 		//获取项目数据（获取已经超期的项目数据，进行修改超期状态）
 		List<RuralProjectRecords> projectNotReportList = dao.getProjectNotReportList(projectRecords);
 		List<RuralProjectRecords> projectNotReportListNoUrgency = dao.getProjectNotReportListNoUrgency(projectRecords);

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

@@ -2261,7 +2261,7 @@
 			and a.emergency_project = 1
 			and (a.reported_state!=5 or a.reported_state is null)
 			and (prd.status = 5 or prd.status = 7)
-			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
+			and now() > date_add(prd.first_audit_date,interval #{endingCount} day)
 			and prd.audit_pass_date is not null
 			and a.reported_state is null
 		</where>
@@ -3343,6 +3343,7 @@
 		,prsi.id as "prsiId"
 		,a.attachment_project_sort as "attachmentProjectSort"
 		,rprr.ZiXunBDE as "ziXunBDE"
+		,rprr.accomplish_date as "accomplishDate"
 		FROM statement_data_info sdi
 
 		<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">