月报调整以及超期天数展示调整

src/main/java/com/jeeplus/common/utils/excel/ExportExcel.java

@@ -140,7 +140,7 @@ public class ExportExcel {
 			};
 		});
 		// Initialize
-        if(type==2){
+        if(type==2 || type==1){
             initializeTemplate(title, annotationList);
             return;
         }
@@ -183,10 +183,10 @@ public class ExportExcel {
         for (Object[] os : annotationList){
             String t = ((ExcelField)os[0]).title();
             // 如果是导出，则去掉注释
-            String[] ss = StringUtils.split(t, "**", 2);
+            /*String[] ss = StringUtils.split(t, "**", 2);
             if (ss.length==2){
                 t = ss[0];
-            }
+            }*/
             headerList.add(t);
         }
 
@@ -198,14 +198,20 @@ public class ExportExcel {
             String[] ss = StringUtils.split(headerList.get(i), "**", 2);
             if (ss.length==2){
                 cell.setCellValue(ss[0]);
-                Comment comment = this.sheet.createDrawingPatriarch().createCellComment(
-                        new XSSFClientAnchor(0, 0, 0, 0, (short) 3, 3, (short) 5, 6));
+				/**
+				 * XSSFClientAnchor 方法 前四个参数固定值
+				 * 第五个参数值代表所在列数
+				 * 第六个参数值代表所在行数
+				 * 第七、八个参数值代表批注框的大小
+				 */
+				Comment comment = this.sheet.createDrawingPatriarch().createCellComment(
+                        new XSSFClientAnchor(0, 0, 0, 0, (short) i, 1, (short) 5, 6));
                 comment.setString(new XSSFRichTextString(ss[1]));
                 cell.setCellComment(comment);
             }else{
                 cell.setCellValue(headerList.get(i));
             }
-            sheet.autoSizeColumn(i);
+            //sheet.autoSizeColumn(i);
             Object[] objects = annotationList.get(i);
             String dictType = ((ExcelField) objects[0]).dictType();
             if(StringUtils.isNotBlank(dictType)){

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -355,7 +355,7 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
     //部门级 查询项目超期信息（4种）
     List<RuralProjectRecords> selectDepartmentReportPageOverdue(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords, @Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,@Param("beginDate")String beginDate,@Param("endDate") String endDate);
     //部门级 查询项目超期信息的总条数
-    Integer selectDepartmentReportPageOverdueCount(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords,@Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo);
+    Integer selectDepartmentReportPageOverdueCount(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords,@Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,@Param("beginDate")String beginDate,@Param("endDate") String endDate);
 
     //案例项目根据项目id更新流程实例id
     int updateProcessInstanceId(RuralProjectRecords records);

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

@@ -33,6 +33,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Integer reminderCount; //提醒次数
 	private Date approvalTime;	//审核通过时间
 	private Date remindTime;	//提醒时间
+	private Date paperFilingAuditPassDate;	//A类纸质归档审核时间
+	private Date filingBatchAuditPassDate;	//B类纸质归档审核时间
 	private String hiatus;	//短期/永久（0:短期，1:永久）
 	private String pmdrCompanyId;
 	private String pmdrCreateBy;
@@ -2417,4 +2419,20 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setOverBatchArchiveStatus(String overBatchArchiveStatus) {
 		this.overBatchArchiveStatus = overBatchArchiveStatus;
 	}
+
+	public Date getPaperFilingAuditPassDate() {
+		return paperFilingAuditPassDate;
+	}
+
+	public void setPaperFilingAuditPassDate(Date paperFilingAuditPassDate) {
+		this.paperFilingAuditPassDate = paperFilingAuditPassDate;
+	}
+
+	public Date getFilingBatchAuditPassDate() {
+		return filingBatchAuditPassDate;
+	}
+
+	public void setFilingBatchAuditPassDate(Date filingBatchAuditPassDate) {
+		this.filingBatchAuditPassDate = filingBatchAuditPassDate;
+	}
 }

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

@@ -111,6 +111,13 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 	private String flagArchive;  //归档员判定
 	private String projectProperties;//投资性质
 	private List<String> permissionOfficeIdList;	//查询部门权限列表
+	private String pmdrReportId; //资料缺失说明所需
+	private String noArchivedDays; //电子未归档天数
+	private String paperNoArchivedDays; //纸质未归档天数
+	private String twoAuditPassDate; //签发审批通过日期
+	private Date paperFilingAuditPassDate;	//A类纸质归档审核时间
+	private Date filingBatchAuditPassDate;	//B类纸质归档审核时间
+	private Date projectReportRecordAuditDate;	//B类纸质归档审核时间
 
 
 
@@ -940,7 +947,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.constructionLinkman = constructionLinkman;
 	}
 
-	@ExcelField(title="上报状态", align=2, sort=23,dictType = "reported_state")
+	@ExcelField(title="上报状态", align=2, sort=25,dictType = "reported_state")
 	public String getReportedState() {
 		return reportedState;
 	}
@@ -1698,7 +1705,7 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 		this.ppfProcessInstanceId = ppfProcessInstanceId;
 	}
 
-	@ExcelField(title="纸质归档", align=2, sort=22, dictType = "archive_state" )
+	@ExcelField(title="纸质归档", align=2, sort=23, dictType = "archive_state" )
 	public String getPaperFilingStatus() {
 		return paperFilingStatus;
 	}
@@ -2258,4 +2265,62 @@ public class RuralProjectRecordsExport extends ActEntity<RuralProjectRecordsExpo
 	public void setPermissionOfficeIdList(List<String> permissionOfficeIdList) {
 		this.permissionOfficeIdList = permissionOfficeIdList;
 	}
+
+	public String getPmdrReportId() {
+		return pmdrReportId;
+	}
+
+	public void setPmdrReportId(String pmdrReportId) {
+		this.pmdrReportId = pmdrReportId;
+	}
+
+	@ExcelField(title="电子归档超期天数**电子归档超期规则：A类报告签发通过40天后归档为超期归档；B类质量复核通过40天后归档为超期归档", align=2, sort=22)
+	public String getNoArchivedDays() {
+		return noArchivedDays;
+	}
+
+	public void setNoArchivedDays(String noArchivedDays) {
+		this.noArchivedDays = noArchivedDays;
+	}
+
+	@ExcelField(title="纸质归档超期天数**纸质归档超期规则：A类报告签发通过40天后归档为超期归档；B类质量复核通过90天后归档为超期归档", align=2, sort=24)
+	public String getPaperNoArchivedDays() {
+		return paperNoArchivedDays;
+	}
+
+	public void setPaperNoArchivedDays(String paperNoArchivedDays) {
+		this.paperNoArchivedDays = paperNoArchivedDays;
+	}
+
+	public String getTwoAuditPassDate() {
+		return twoAuditPassDate;
+	}
+
+	public void setTwoAuditPassDate(String twoAuditPassDate) {
+		this.twoAuditPassDate = twoAuditPassDate;
+	}
+
+	public Date getPaperFilingAuditPassDate() {
+		return paperFilingAuditPassDate;
+	}
+
+	public void setPaperFilingAuditPassDate(Date paperFilingAuditPassDate) {
+		this.paperFilingAuditPassDate = paperFilingAuditPassDate;
+	}
+
+	public Date getFilingBatchAuditPassDate() {
+		return filingBatchAuditPassDate;
+	}
+
+	public void setFilingBatchAuditPassDate(Date filingBatchAuditPassDate) {
+		this.filingBatchAuditPassDate = filingBatchAuditPassDate;
+	}
+
+	public Date getProjectReportRecordAuditDate() {
+		return projectReportRecordAuditDate;
+	}
+
+	public void setProjectReportRecordAuditDate(Date projectReportRecordAuditDate) {
+		this.projectReportRecordAuditDate = projectReportRecordAuditDate;
+	}
 }

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

@@ -150,6 +150,12 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
     public Page<RuralProjectRecords> findPage(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords) {
         //查询超期时间天数
         List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_count");
+        //查询超期时间天数(电子归档)
+        List<MainDictDetail> adventRecordCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_count");
+        //查询超期时间天数(A类纸质归档)
+        List<MainDictDetail> adventRecordACount = DictUtils.getMainDictListOnProjectAdvent("advent_record_A_count");
+        //查询超期时间天数(B类纸质归档)
+        List<MainDictDetail> adventRecordBCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_B_count");
         if(adventCount.size()>0){
             //获取超期时间天数转int
             Integer endingCount = Integer.parseInt(adventCount.get(0).getLabel());
@@ -237,6 +243,22 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
         List<WorkProjectNotify> paperProjectNotifyList = workProjectNotifyService.findList(workProjectNotify);*/
 
 
+        Integer endingAdventRecordCount = 0;
+        if(adventRecordCount.size()>0){
+            //获取超期时间天数(电子归档)转int
+            endingAdventRecordCount = Integer.parseInt(adventRecordCount.get(0).getLabel());
+        }
+        Integer endingAdventRecordACount = 0;
+        if(adventRecordACount.size()>0){
+            //获取超期时间天数(A类纸质归档)转int
+            endingAdventRecordACount = Integer.parseInt(adventRecordACount.get(0).getLabel());
+        }
+        Integer endingAdventRecordBCount = 0;
+        if(adventRecordBCount.size()>0){
+            //获取超期时间天数(A类纸质归档)转int
+            endingAdventRecordBCount = Integer.parseInt(adventRecordBCount.get(0).getLabel());
+        }
+
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date();
         //查询负责人信息
@@ -253,6 +275,21 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                         Long date2TimeLong = date2.getTime();
                         //计算未归档天数
                         Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                        endTime = endTime - endingAdventRecordCount;
+                        records.setNoArchivedDays(endTime.toString());
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                }else if (null != records.getPrdAuditDate() && (5 == records.getProjectReportRecordStatus()
+                        || 7 == records.getProjectReportRecordStatus()) && null != records.getProjectReportRecordAuditDate()) {
+                    try {
+                        Date date2 = format.parse(records.getPrdAuditDate());
+                        //获取电子归档审核通过时间
+                        Long dateTimeLong = records.getProjectReportRecordAuditDate().getTime();
+                        Long date2TimeLong = date2.getTime();
+                        //计算未归档天数
+                        Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                        endTime = endTime - endingAdventRecordCount;
                         records.setNoArchivedDays(endTime.toString());
                     } catch (ParseException e) {
                         e.printStackTrace();
@@ -269,10 +306,27 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                         Long date2TimeLong = date2.getTime();
                         //计算未归档天数
                         Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                        endTime = endTime - endingAdventRecordBCount;
+                        records.setPaperNoArchivedDays(endTime.toString());
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                }else if(null != records.getPrdAuditDate()
+                        && (5 == records.getFilingProjectStatus()
+                        || 7 == records.getFilingProjectStatus()) && null != records.getFilingBatchAuditPassDate()) {
+                    try {
+                        Date date2 = format.parse(records.getPrdAuditDate());
+                        //获取电子归档审核通过时间
+                        Long dateTimeLong = records.getFilingBatchAuditPassDate().getTime();
+                        Long date2TimeLong = date2.getTime();
+                        //计算未归档天数
+                        Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                        endTime = endTime - endingAdventRecordBCount;
                         records.setPaperNoArchivedDays(endTime.toString());
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
+
                 }
             } else if ("2".equals(records.getSubmitMoney())){
                 //设置电子未归档天数
@@ -284,6 +338,21 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                         Long date2TimeLong = date2.getTime();
                         //计算未归档天数
                         Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                        endTime = endTime - endingAdventRecordCount;
+                        records.setNoArchivedDays(endTime.toString());
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                }else if (null != records.getTwoAuditPassDate() && (5 == records.getProjectReportRecordStatus()
+                        || 7 == records.getProjectReportRecordStatus()) && null != records.getProjectReportRecordAuditDate()) {
+                    try {
+                        Date date2 = format.parse(records.getTwoAuditPassDate());
+                        //获取电子归档审核通过时间
+                        Long dateTimeLong = records.getProjectReportRecordAuditDate().getTime();
+                        Long date2TimeLong = date2.getTime();
+                        //计算未归档天数
+                        Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                        endTime = endTime - endingAdventRecordCount;
                         records.setNoArchivedDays(endTime.toString());
                     } catch (ParseException e) {
                         e.printStackTrace();
@@ -300,6 +369,21 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                         Long date2TimeLong = date2.getTime();
                         //计算未归档天数
                         Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                        endTime = endTime - endingAdventRecordACount;
+                        records.setPaperNoArchivedDays(endTime.toString());
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                }else if (null != records.getTwoAuditPassDate() && (5 == records.getProjectReportRecordStatus()
+                        || 7 == records.getProjectReportRecordStatus()) && null != records.getPaperFilingAuditPassDate()) {
+                    try {
+                        Date date2 = format.parse(records.getTwoAuditPassDate());
+                        //获取电子归档审核通过时间
+                        Long dateTimeLong = records.getPaperFilingAuditPassDate().getTime();
+                        Long date2TimeLong = date2.getTime();
+                        //计算未归档天数
+                        Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                        endTime = endTime - endingAdventRecordACount;
                         records.setPaperNoArchivedDays(endTime.toString());
                     } catch (ParseException e) {
                         e.printStackTrace();
@@ -1225,6 +1309,12 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
     public List<RuralProjectRecordsExport> findExportList(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords) {
         //查询超期时间天数
         List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_count");
+        //查询超期时间天数(电子归档)
+        List<MainDictDetail> adventRecordCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_count");
+        //查询超期时间天数(A类纸质归档)
+        List<MainDictDetail> adventRecordACount = DictUtils.getMainDictListOnProjectAdvent("advent_record_A_count");
+        //查询超期时间天数(B类纸质归档)
+        List<MainDictDetail> adventRecordBCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_B_count");
         if(adventCount.size()>0){
             //获取超期时间天数转int
             Integer endingCount = Integer.parseInt(adventCount.get(0).getLabel());
@@ -1239,6 +1329,26 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
         page.setCountFlag(false);
         projectRecords.setPage(page);
         List<RuralProjectRecordsExport> recordsList = dao.findExportList(projectRecords);
+
+        Integer endingAdventRecordCount = 0;
+        if(adventRecordCount.size()>0){
+            //获取超期时间天数(电子归档)转int
+            endingAdventRecordCount = Integer.parseInt(adventRecordCount.get(0).getLabel());
+        }
+        Integer endingAdventRecordACount = 0;
+        if(adventRecordACount.size()>0){
+            //获取超期时间天数(A类纸质归档)转int
+            endingAdventRecordACount = Integer.parseInt(adventRecordACount.get(0).getLabel());
+        }
+        Integer endingAdventRecordBCount = 0;
+        if(adventRecordBCount.size()>0){
+            //获取超期时间天数(A类纸质归档)转int
+            endingAdventRecordBCount = Integer.parseInt(adventRecordBCount.get(0).getLabel());
+        }
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date();
+
+
        if(null != recordsList && recordsList.size()>0){
 
             //查询报告文件、依据性文件、其他文件必填列表以及数据
@@ -1266,6 +1376,134 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                         }
                     }
                 }
+
+                //判断是A类还是B类 2是A类1是B类
+                if ("1".equals(info.getSubmitMoney())){
+                    //设置电子未归档天数
+                    if (null != info.getPrdAuditDate() && 5 != info.getProjectReportRecordStatus()
+                            && 7!= info.getProjectReportRecordStatus()){
+                        try {
+                            Date date2 = format.parse(info.getPrdAuditDate());
+                            Long dateTimeLong = date.getTime();
+                            Long date2TimeLong = date2.getTime();
+                            //计算未归档天数
+                            Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                            endTime = endTime - endingAdventRecordCount;
+                            info.setNoArchivedDays(endTime.toString());
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }else if (null != info.getPrdAuditDate() && (5 == info.getProjectReportRecordStatus()
+                            || 7 == info.getProjectReportRecordStatus()) && null != info.getProjectReportRecordAuditDate()) {
+                        try {
+                            Date date2 = format.parse(info.getPrdAuditDate());
+                            //获取电子归档审核通过时间
+                            Long dateTimeLong = info.getProjectReportRecordAuditDate().getTime();
+                            Long date2TimeLong = date2.getTime();
+                            //计算未归档天数
+                            Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                            endTime = endTime - endingAdventRecordCount;
+                            info.setNoArchivedDays(endTime.toString());
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    //设置纸质未归档天数
+                    if (null != info.getPrdAuditDate()
+                            && !"5".equals(info.getPaperFilingStatus())
+                            && !"7".equals(info.getPaperFilingStatus()) && !"10".equals(info.getPaperFilingStatus())){
+                        try {
+                            Date date2 = format.parse(info.getPrdAuditDate());
+                            Long dateTimeLong = date.getTime();
+                            Long date2TimeLong = date2.getTime();
+                            //计算未归档天数
+                            Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                            endTime = endTime - endingAdventRecordBCount;
+                            info.setPaperNoArchivedDays(endTime.toString());
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }else if(null != info.getPrdAuditDate()
+                            && ("5".equals(info.getPaperFilingStatus())
+                            || "10".equals(info.getPaperFilingStatus())) && null != info.getFilingBatchAuditPassDate()) {
+                        try {
+                            Date date2 = format.parse(info.getPrdAuditDate());
+                            //获取电子归档审核通过时间
+                            Long dateTimeLong = info.getFilingBatchAuditPassDate().getTime();
+                            Long date2TimeLong = date2.getTime();
+                            //计算未归档天数
+                            Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                            endTime = endTime - endingAdventRecordBCount;
+                            info.setPaperNoArchivedDays(endTime.toString());
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+
+                    }
+                } else if ("2".equals(info.getSubmitMoney())){
+                    //设置电子未归档天数
+                    if (null != info.getTwoAuditPassDate() && 5 != info.getProjectReportRecordStatus()
+                            && 7!= info.getProjectReportRecordStatus()){
+                        try {
+                            Date date2 = format.parse(info.getTwoAuditPassDate());
+                            Long dateTimeLong = date.getTime();
+                            Long date2TimeLong = date2.getTime();
+                            //计算未归档天数
+                            Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                            endTime = endTime - endingAdventRecordCount;
+                            info.setNoArchivedDays(endTime.toString());
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }else if (null != info.getTwoAuditPassDate() && (5 == info.getProjectReportRecordStatus()
+                            || 7 == info.getProjectReportRecordStatus()) && null != info.getProjectReportRecordAuditDate()) {
+                        try {
+                            Date date2 = format.parse(info.getTwoAuditPassDate());
+                            //获取电子归档审核通过时间
+                            Long dateTimeLong = info.getProjectReportRecordAuditDate().getTime();
+                            Long date2TimeLong = date2.getTime();
+                            //计算未归档天数
+                            Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                            endTime = endTime - endingAdventRecordCount;
+                            info.setNoArchivedDays(endTime.toString());
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    //设置纸质未归档天数
+                    if (null != info.getTwoAuditPassDate()
+                            && !"5".equals(info.getPaperFilingStatus()) &&
+                            !"7".equals(info.getPaperFilingStatus()) && !"10".equals(info.getPaperFilingStatus())){
+                        try {
+                            Date date2 = format.parse(info.getTwoAuditPassDate());
+                            Long dateTimeLong = date.getTime();
+                            Long date2TimeLong = date2.getTime();
+                            //计算未归档天数
+                            Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                            endTime = endTime - endingAdventRecordACount;
+                            info.setPaperNoArchivedDays(endTime.toString());
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }else if (null != info.getTwoAuditPassDate() && (5 == info.getProjectReportRecordStatus()
+                            || 7 == info.getProjectReportRecordStatus()) && null != info.getPaperFilingAuditPassDate()) {
+                        try {
+                            Date date2 = format.parse(info.getTwoAuditPassDate());
+                            //获取电子归档审核通过时间
+                            Long dateTimeLong = info.getPaperFilingAuditPassDate().getTime();
+                            Long date2TimeLong = date2.getTime();
+                            //计算未归档天数
+                            Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                            endTime = endTime - endingAdventRecordACount;
+                            info.setPaperNoArchivedDays(endTime.toString());
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
             }
         }
         return recordsList;

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

@@ -237,8 +237,14 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
 
-        //查询超期时间天数
+        //查询超期时间天数(上报)
         List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_count");
+        //查询超期时间天数(电子归档)
+        List<MainDictDetail> adventRecordCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_count");
+        //查询超期时间天数(A类纸质归档)
+        List<MainDictDetail> adventRecordACount = DictUtils.getMainDictListOnProjectAdvent("advent_record_A_count");
+        //查询超期时间天数(B类纸质归档)
+        List<MainDictDetail> adventRecordBCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_B_count");
         if(adventCount.size()>0){
             //获取超期时间天数转int
             Integer endingCount = Integer.parseInt(adventCount.get(0).getLabel());
@@ -315,6 +321,22 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         List<WorkProjectNotify> paperProjectNotifyList = workProjectNotifyService.findList(workProjectNotify);*/
 
 
+        Integer endingAdventRecordCount = 0;
+        if(adventRecordCount.size()>0){
+            //获取超期时间天数(电子归档)转int
+            endingAdventRecordCount = Integer.parseInt(adventRecordCount.get(0).getLabel());
+        }
+        Integer endingAdventRecordACount = 0;
+        if(adventRecordACount.size()>0){
+            //获取超期时间天数(A类纸质归档)转int
+            endingAdventRecordACount = Integer.parseInt(adventRecordACount.get(0).getLabel());
+        }
+        Integer endingAdventRecordBCount = 0;
+        if(adventRecordBCount.size()>0){
+            //获取超期时间天数(A类纸质归档)转int
+            endingAdventRecordBCount = Integer.parseInt(adventRecordBCount.get(0).getLabel());
+        }
+
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date();
         //查询负责人信息
@@ -324,13 +346,28 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             if ("1".equals(records.getSubmitMoney())){
                 //设置电子未归档天数
                 if (null != records.getPrdAuditDate() && 5 != records.getProjectReportRecordStatus()
-                        && 7 != records.getProjectReportRecordStatus()){
+                        && 7!= records.getProjectReportRecordStatus()){
                     try {
                         Date date2 = format.parse(records.getPrdAuditDate());
                         Long dateTimeLong = date.getTime();
                         Long date2TimeLong = date2.getTime();
                         //计算未归档天数
                         Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                        endTime = endTime - endingAdventRecordCount;
+                        records.setNoArchivedDays(endTime.toString());
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                }else if (null != records.getPrdAuditDate() && (5 == records.getProjectReportRecordStatus()
+                        || 7 == records.getProjectReportRecordStatus()) && null != records.getProjectReportRecordAuditDate()) {
+                    try {
+                        Date date2 = format.parse(records.getPrdAuditDate());
+                        //获取电子归档审核通过时间
+                        Long dateTimeLong = records.getProjectReportRecordAuditDate().getTime();
+                        Long date2TimeLong = date2.getTime();
+                        //计算未归档天数
+                        Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                        endTime = endTime - endingAdventRecordCount;
                         records.setNoArchivedDays(endTime.toString());
                     } catch (ParseException e) {
                         e.printStackTrace();
@@ -339,29 +376,61 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 
                 //设置纸质未归档天数
                 if (null != records.getPrdAuditDate()
-                        && 5 != records.getFilingProjectStatus()
-                        && 7 != records.getFilingProjectStatus() && 10 != records.getFilingProjectStatus()){
+                        && !"5".equals(records.getPaperFilingStatus())
+                        && !"7".equals(records.getPaperFilingStatus()) && !"10".equals(records.getPaperFilingStatus())){
                     try {
                         Date date2 = format.parse(records.getPrdAuditDate());
                         Long dateTimeLong = date.getTime();
                         Long date2TimeLong = date2.getTime();
                         //计算未归档天数
                         Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                        endTime = endTime - endingAdventRecordBCount;
                         records.setPaperNoArchivedDays(endTime.toString());
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
+                }else if(null != records.getPrdAuditDate()
+                        && ("5".equals(records.getPaperFilingStatus())
+                        || "10".equals(records.getPaperFilingStatus())) && null != records.getFilingBatchAuditPassDate()) {
+                    try {
+                        Date date2 = format.parse(records.getPrdAuditDate());
+                        //获取电子归档审核通过时间
+                        Long dateTimeLong = records.getFilingBatchAuditPassDate().getTime();
+                        Long date2TimeLong = date2.getTime();
+                        //计算未归档天数
+                        Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                        endTime = endTime - endingAdventRecordBCount;
+                        records.setPaperNoArchivedDays(endTime.toString());
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+
                 }
             } else if ("2".equals(records.getSubmitMoney())){
                 //设置电子未归档天数
                 if (null != records.getTwoAuditPassDate() && 5 != records.getProjectReportRecordStatus()
-                            && 7!= records.getProjectReportRecordStatus()){
+                        && 7!= records.getProjectReportRecordStatus()){
                     try {
                         Date date2 = format.parse(records.getTwoAuditPassDate());
                         Long dateTimeLong = date.getTime();
                         Long date2TimeLong = date2.getTime();
                         //计算未归档天数
                         Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                        endTime = endTime - endingAdventRecordCount;
+                        records.setNoArchivedDays(endTime.toString());
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                }else if (null != records.getTwoAuditPassDate() && (5 == records.getProjectReportRecordStatus()
+                        || 7 == records.getProjectReportRecordStatus()) && null != records.getProjectReportRecordAuditDate()) {
+                    try {
+                        Date date2 = format.parse(records.getTwoAuditPassDate());
+                        //获取电子归档审核通过时间
+                        Long dateTimeLong = records.getProjectReportRecordAuditDate().getTime();
+                        Long date2TimeLong = date2.getTime();
+                        //计算未归档天数
+                        Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                        endTime = endTime - endingAdventRecordCount;
                         records.setNoArchivedDays(endTime.toString());
                     } catch (ParseException e) {
                         e.printStackTrace();
@@ -371,13 +440,28 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 //设置纸质未归档天数
                 if (null != records.getTwoAuditPassDate()
                         && !"5".equals(records.getPaperFilingStatus()) &&
-                        !"7".equals(records.getPaperFilingStatus())&&!"10".equals(records.getPaperFilingStatus())){
+                        !"7".equals(records.getPaperFilingStatus()) && !"10".equals(records.getPaperFilingStatus())){
                     try {
                         Date date2 = format.parse(records.getTwoAuditPassDate());
                         Long dateTimeLong = date.getTime();
                         Long date2TimeLong = date2.getTime();
                         //计算未归档天数
                         Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+                        endTime = endTime - endingAdventRecordACount;
+                        records.setPaperNoArchivedDays(endTime.toString());
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                }else if (null != records.getTwoAuditPassDate() && (5 == records.getProjectReportRecordStatus()
+                        || 7 == records.getProjectReportRecordStatus()) && null != records.getPaperFilingAuditPassDate()) {
+                    try {
+                        Date date2 = format.parse(records.getTwoAuditPassDate());
+                        //获取电子归档审核通过时间
+                        Long dateTimeLong = records.getPaperFilingAuditPassDate().getTime();
+                        Long date2TimeLong = date2.getTime();
+                        //计算未归档天数
+                        Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+                        endTime = endTime - endingAdventRecordACount;
                         records.setPaperNoArchivedDays(endTime.toString());
                     } catch (ParseException e) {
                         e.printStackTrace();

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

@@ -4497,7 +4497,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		}
 		projectRecords.setPage(page);
 		List<RuralProjectRecords> recordsList = dao.selectDepartmentReportPageOverdue(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
-		int count = dao.selectDepartmentReportPageOverdueCount(projectRecords,statementCompanyComprehensiveInfo);
+		int count = dao.selectDepartmentReportPageOverdueCount(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
 		page.setPageNo(oldPageNo);
 		page.setCount(count);
 		page.setCountFlag(false);
@@ -5123,7 +5123,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public void getPaperArchiveNotify(){
 		RuralProjectRecords projectRecords = new RuralProjectRecords();
 		//查询归档超期时间天数
-		List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_count");
+		List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_A_count");
 		if(adventCount.size()>0){
 			//获取超期时间天数转int
 			Integer endingCount = Integer.parseInt(adventCount.get(0).getLabel());
@@ -5200,11 +5200,10 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public void getBatchArchiveNotify(){
 		RuralProjectRecords projectRecords = new RuralProjectRecords();
 		//查询归档超期时间天数
-		List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_count");
+		List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_B_count");
 		if(adventCount.size()>0){
 			//获取超期时间天数转int
-			//Integer endingCount = Integer.parseInt(adventCount.get(0).getLabel());
-			Integer endingCount = 90;
+			Integer endingCount = Integer.parseInt(adventCount.get(0).getLabel());
 			//设置开始时间为还有7天开始通知
 			projectRecords.setStartCount(endingCount);
 			projectRecords.setEndingCount(endingCount);

src/main/java/com/jeeplus/modules/sys/service/HelpService.java

@@ -74,12 +74,27 @@ public class HelpService extends CrudService<HelpDao, Help> {
 
     // 字符串转Unicode
     public String stringToUnicode(String str) {
-        StringBuffer sb = new StringBuffer();
-        char[] c = str.toCharArray();
-        for (int i = 0; i < c.length; i++) {
-            sb.append("\\u" + Integer.toHexString(c[i]));
+        StringBuilder unicode = new StringBuilder();
+        for (int i = 0; i < str.length(); i++) {
+            // 取出每一个字符
+            char c = str.charAt(i);
+            if (c<0x20 || c>0x7E) {
+                // 转换为unicode
+                String tmp = Integer.toHexString(c);
+                if (tmp.length() >= 4) {
+                    unicode.append("\\u").append(Integer.toHexString(c));
+                } else if (tmp.length() == 3){
+                    unicode.append("\\u0").append(Integer.toHexString(c));
+                } else if (tmp.length() == 2){
+                    unicode.append("\\u00").append(Integer.toHexString(c));
+                } else {
+                    unicode.append("\\u000").append(Integer.toHexString(c));
+                }
+            } else {
+                unicode.append(c);
+            }
         }
-        return sb.toString();
+        return unicode.toString();
     }
 
 }

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

@@ -115,10 +115,10 @@ public class HelpController extends BaseController {
         Help byNumber = helpService.getByNumber(number);
         if(Objects.nonNull(byNumber)) {
             if (StringUtils.isNotBlank(byNumber.getFeatures())) {
-                title = helpService.stringToUnicode(byNumber.getFeatures());
+                title = byNumber.getFeatures();
             }
             if (StringUtils.isNotBlank(byNumber.getDescription())) {
-                content = helpService.stringToUnicode(byNumber.getDescription());
+                content = byNumber.getDescription();
             }
         }
         map.put("title", title);

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

@@ -436,27 +436,33 @@ END) as projectScale*/
 			</otherwise>
 		</choose>
 		,prr.process_instance_id as prrProcessInstanceId
+		,prr.accomplish_date as "projectReportRecordAuditDate"
 		,prd.id as prdId
 		,prr.id as prrId
 		,prd.audit_pass_date as auditPassDate
+		,prd.audit_pass_date as "reportAuditDate"
 		,if(date_add(prd.audit_pass_date,interval #{endingCount} day) >now(),"0","1") as reportedType
 		,ifnull(rprr.report_status,0) as "reportStatus"
 		,ifnull(rprr.sync_status,0) as "syncStatus"
 		,rprr.process_instance_id as "reportedProcessInstanceId"
+		,rprr.accomplish_date as "projectRecordsReportedAuditPassDate"
 		,ifnull(prdt.status,0) as "projectReportStatusTwo"
 		,prdt.id as prdtId
 		,prdt.process_instance_id as prdtProcessinstanceId
 		,prdt.audit_pass_date as "twoAuditPassDate"
+		,prdt.audit_pass_date as "reportTwoAuditDate"
 		,ifnull(pmdr.status,0) as "defectRecordStatus"
 		,pmdr.process_instance_id as "pmdrProcessInstanceId"
 		,pmdr.id as pmdrId
 		/*,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.audit_pass_date as "paperFilingAuditPassDate"
 		,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"
+		,pfp.audit_pass_date as "filingBatchAuditPassDate"
 		,prd.audit_pass_date as "prdAuditDate"
 		,prd.ZiXunShouRu as "money"
 		,cb.case_process_id as "caseProcessId"
@@ -471,9 +477,9 @@ END) as projectScale*/
 		left join case_base cb on a.id = cb.project_id
 		/*LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id*/
 		left join
-		(select id,status,project_id,filing_batch from
+		(select id,status,project_id,filing_batch,audit_pass_date from
 		(
-		select id,create_date,status,project_id,filing_batch
+		select id,create_date,status,project_id,filing_batch,audit_pass_date
 		from project_flingbatch_relation order by create_date desc
 		)z
 		group by z.project_id desc
@@ -808,6 +814,10 @@ END) as projectScale*/
 		'已归档' else '未归档'
 		end) as downArchiveStatus
 
+		,prr.accomplish_date as "projectReportRecordAuditDate"
+		,prd.audit_pass_date as "reportAuditDate"
+		,rprr.accomplish_date as "projectRecordsReportedAuditPassDate"
+		,prdt.audit_pass_date as "reportTwoAuditDate"
 		,concat(ifnull( pfp.STATUS, 0 ),ifnull( ppf.STATUS, 0 )) as "downProjectReportRecordPaperFilingStatus"
 		,su.name as "leaderNameStr"
 		,su.id as "leaderNameIds"
@@ -845,9 +855,11 @@ END) as projectScale*/
 		,pmdr.id as pmdrId
 
 		,(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
+		,pfp.audit_pass_date as "filingBatchAuditPassDate"
 		/*,ifnull(ppf.status,0) as "paperFilingStatus"*/
 		,ppf.process_instance_id as "ppfProcessInstanceId"
 		,ppf.id as "ppfId"
+		,ppf.audit_pass_date as "paperFilingAuditPassDate"
 		,pfb.process_instance_id AS "filingProcessinstanceId"
 		/*,ifnull(pfp.status,0) as "filingProjectStatus"*/
 		,prd.audit_pass_date as "prdAuditDate"
@@ -865,9 +877,9 @@ END) as projectScale*/
 		left join case_base cb on a.id = cb.project_id
 		/*LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id*/
 		left join
-		(select id,status,project_id,filing_batch from
+		(select id,status,project_id,filing_batch,audit_pass_date from
 		(
-		select id,create_date,status,project_id,filing_batch
+		select id,create_date,status,project_id,filing_batch,audit_pass_date
 		from project_flingbatch_relation order by create_date desc
 		)z
 		group by z.project_id desc

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

@@ -430,27 +430,33 @@
 			</otherwise>
 		</choose>
 		,prr.process_instance_id as prrProcessInstanceId
+		,prr.accomplish_date as "projectReportRecordAuditDate"
 		,prd.id as prdId
 		,prr.id as prrId
 		,prd.audit_pass_date as auditPassDate
+		,prd.audit_pass_date as "reportAuditDate"
 		,if(date_add(prd.audit_pass_date,interval #{endingCount} day) >now(),"0","1") as reportedType
 		,ifnull(rprr.report_status,0) as "reportStatus"
 		,ifnull(rprr.sync_status,0) as "syncStatus"
 		,rprr.process_instance_id as "reportedProcessInstanceId"
+		,rprr.accomplish_date as "projectRecordsReportedAuditPassDate"
 		,ifnull(prdt.status,0) as "projectReportStatusTwo"
 		,prdt.id as prdtId
 		,prdt.process_instance_id as prdtProcessinstanceId
 		,prdt.audit_pass_date as "twoAuditPassDate"
+		,prdt.audit_pass_date as "reportTwoAuditDate"
 		,ifnull(pmdr.status,0) as "defectRecordStatus"
 		,pmdr.process_instance_id as "pmdrProcessInstanceId"
 		,pmdr.id as pmdrId
 		/*,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.audit_pass_date as "paperFilingAuditPassDate"
 		,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"
+		,pfp.audit_pass_date as "filingBatchAuditPassDate"
 		,prd.audit_pass_date as "prdAuditDate"
 		,cb.case_process_id as "caseProcessId"
 		,cb.case_type as "caseType"
@@ -464,9 +470,9 @@
 		left join case_base cb on a.id = cb.project_id
 		/*LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id*/
 		left join
-		(select id,status,project_id,filing_batch from
+		(select id,status,project_id,filing_batch,audit_pass_date from
 		(
-		select id,create_date,status,project_id,filing_batch
+		select id,create_date,status,project_id,filing_batch,audit_pass_date
 		from project_flingbatch_relation order by create_date desc
 		)z
 		group by z.project_id desc
@@ -532,7 +538,7 @@
                 AND su.name like concat(concat('%',#{leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
             </if>-->
 			<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
-				AND ((w.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w.is_master = '1' AND w.del_flag='0'
+				AND ((w1.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w1.is_master = '1' AND w1.del_flag='0'
 			</if>
             <if test="projectStatus !=null">
                 AND a.status = #{projectStatus}
@@ -858,7 +864,7 @@
                 AND su.name like concat(concat('%',#{leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
             </if>-->
 			<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
-				AND ((w.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w.is_master = '1' AND w.del_flag='0'
+				AND ((w1.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w1.is_master = '1' AND w1.del_flag='0'
 			</if>
             <if test="projectStatus !=null">
                 AND a.status = #{projectStatus}

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

@@ -3367,7 +3367,8 @@
 			and sdi.year = #{statementCompanyComprehensiveInfo.year}
 			and sdi.type = #{statementCompanyComprehensiveInfo.type}
 			and sdi.big_date_type = #{statementCompanyComprehensiveInfo.bigDateType}
-			<if test="statementCompanyComprehensiveInfo.departmentLevel != null and statementCompanyComprehensiveInfo.departmentLevel !='' and statementCompanyComprehensiveInfo.departmentLevel != 'company'">
+
+			<if test="statementCompanyComprehensiveInfo.smallDateType != null and statementCompanyComprehensiveInfo.smallDateType !=''">
 				and sdi.small_date_type = #{statementCompanyComprehensiveInfo.smallDateType}
 			</if>
 			and sdi.office_id = #{statementCompanyComprehensiveInfo.officeId}
@@ -3389,6 +3390,9 @@
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
 				and a.over_due_status = 1
+				and a.reported_state != 7
+				and a.reported_state != 10
+				and a.reported_state != 11
 				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">
@@ -3574,7 +3578,7 @@
 			and sdi.year = #{statementCompanyComprehensiveInfo.year}
 			and sdi.type = #{statementCompanyComprehensiveInfo.type}
 			and sdi.big_date_type = #{statementCompanyComprehensiveInfo.bigDateType}
-			<if test="statementCompanyComprehensiveInfo.departmentLevel != null and statementCompanyComprehensiveInfo.departmentLevel !='' and statementCompanyComprehensiveInfo.departmentLevel != 'company'">
+			<if test="statementCompanyComprehensiveInfo.smallDateType != null and statementCompanyComprehensiveInfo.smallDateType !=''">
 				and sdi.small_date_type = #{statementCompanyComprehensiveInfo.smallDateType}
 			</if>
 			and sdi.office_id = #{statementCompanyComprehensiveInfo.officeId}
@@ -3596,6 +3600,9 @@
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
 				and a.over_due_status = 1
+				and a.reported_state != 7
+				and a.reported_state != 10
+				and a.reported_state != 11
 				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">
@@ -4228,12 +4235,15 @@
 				and a.over_record_status = 1
 				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
 				/*and rprr.status = 5*/
-				and rprr.del_flag = 0
-				and rprr.accomplish_date >= #{beginDate}
-				and rprr.accomplish_date &lt;= #{endDate}
+				and prr.del_flag = 0
+				and prr.accomplish_date >= #{beginDate}
+				and prr.accomplish_date &lt;= #{endDate}
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
 				and a.over_due_status = 1
+				and a.reported_state != 7
+				and a.reported_state != 10
+				and a.reported_state != 11
 				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">
@@ -4422,7 +4432,7 @@
 			and sdi.year = #{statementCompanyComprehensiveInfo.year}
 			and sdi.type = #{statementCompanyComprehensiveInfo.type}
 			and sdi.big_date_type = #{statementCompanyComprehensiveInfo.bigDateType}
-			<if test="statementCompanyComprehensiveInfo.departmentLevel != null and statementCompanyComprehensiveInfo.departmentLevel !='' and statementCompanyComprehensiveInfo.departmentLevel != 'company'">
+			<if test="statementCompanyComprehensiveInfo.smallDateType != null and statementCompanyComprehensiveInfo.smallDateType !=''">
 				and sdi.small_date_type = #{statementCompanyComprehensiveInfo.smallDateType}
 			</if>
 			and sdi.office_id = #{statementCompanyComprehensiveInfo.officeId}
@@ -4444,6 +4454,9 @@
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
 				and a.over_due_status = 1
+				and a.reported_state != 7
+				and a.reported_state != 10
+				and a.reported_state != 11
 				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">
@@ -5835,6 +5848,9 @@ GROUP BY
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
 				and a.over_due_status = 1
+				and a.reported_state != 7
+				and a.reported_state != 10
+				and a.reported_state != 11
 				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">

src/main/resources/mappings/modules/statement/StatementCompanyComprehensiveDao.xml

@@ -1084,7 +1084,7 @@
 		<where>
 			a.del_flag=0
 			and a.status = 5
-			and a.reported_state != 7
+			and a.reported_state != 7 and a.reported_state != 10 and a.reported_state != 11
 			and a.over_due_status = 1
 			and pmdrd.id is null
 		</where>

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementDao.xml

@@ -85,6 +85,9 @@
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>
+			<if test="number != null and number != ''">
+				AND a.number like concat('%',#{number},'%')
+			</if>
 			<if test="project != null and project.id != null and project.id != ''">
 				AND wa.project_id = #{project.id}
 			</if>

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

@@ -1071,6 +1071,9 @@
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}
+		.layui-table-view .layui-table th .layui-table-cell {
+			text-align: center;
+		}
 	</style>
 </head>
 <body>
@@ -1414,7 +1417,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;' title='未归档天数'>" + 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>";
 						}
@@ -1457,7 +1460,7 @@
 						}
 						if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
 							// return "<font style = 'font-size:14px;font-weight:500;'>"+paperNoArchivedDays + '天'+"</font>";
-							xml+="<span style='margin-left: 5px;' title='未归档天数'>" + paperNoArchivedDays + "天" + "</span>";
+							xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
 						}else{
 							// return "<font style = 'font-size:14px;font-weight:500;'></font>";
 						}

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

@@ -691,6 +691,10 @@
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}
+		.layui-table-view .layui-table th .layui-table-cell {
+			text-align: center;
+		}
+
 	</style>
 </head>
 <body>
@@ -1041,7 +1045,7 @@
 						}
 						return xml;
 					}}
-                ,{align:'left', title: '电子',  width:150,templet:function(d){
+                ,{field:'projectReportRecordStatus',align:'left', title: '电子/超期天数',  width:170,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var noArchivedDays=d.noArchivedDays;
                         if(st.action){
@@ -1051,7 +1055,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;' title='未归档天数'>" + noArchivedDays + "天" + "</span>";
+							xml+="<span style='margin-left: 5px;' title='超期天数'>" + noArchivedDays + "天" + "</span>";
 						}else{
 						}
 						var de = getdefectRecordState(""+d.defectRecordStatus);
@@ -1068,7 +1072,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{align:'left', title: '纸质',  width:140,templet:function(d){
+				,{field:'downProjectReportRecordStatus', align:'left', title: '纸质/超期天数',  width:140,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -1085,7 +1089,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
-							xml+="<span style='margin-left: 5px;' title='未归档天数'>" + paperNoArchivedDays + "天" + "</span>";
+							xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
 						}else{
 						}
 						return xml;
@@ -1191,7 +1195,7 @@
 						</shiro:hasPermission>
 
 
-                        <shiro:hasPermission name="ruralProject:ruralProjectMessageAll:adminDescription">
+                        <%--<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:adminDescription">
                             //归档资料缺失说明
                             if(d.projectReportStatusTwo == 0){
                                 if(d.projectReportStatus == 5){
@@ -1212,7 +1216,7 @@
                                     }
                                 }
                             }
-                        </shiro:hasPermission>
+                        </shiro:hasPermission>--%>
 
 						<c:if test="<%=admin%>">
 							<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportedProvincialStanding">
@@ -1227,6 +1231,11 @@
 						return[xml].join('');
 					}}
             ]]
+			, done: function (data, curr, count) {  //回调函数
+				//添加图片到表格中所有的第二个单元格里面
+				$('.layui-table thead tr th[data-field="projectReportRecordStatus"] .layui-table-cell').append('<a href="#" class="details layui-icon layui-icon-help" id="projectReportRecordStatus-i" onclick="details('+ "'bz-0001'" +')"></a>');
+				$('.layui-table thead tr th[data-field="downProjectReportRecordStatus"] .layui-table-cell').append('<a href="#" class="details layui-icon layui-icon-help" id="downProjectReportRecordStatus-i" onclick="details()"></a>');
+			}
             ,data: [
                 <c:if test="${ not empty page.list}">
                 <c:forEach items="${page.list}" var="projectRecords" varStatus="index">

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

@@ -685,6 +685,9 @@
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}
+		.layui-table-view .layui-table th .layui-table-cell {
+			text-align: center;
+		}
 	</style>
 </head>
 <body>
@@ -982,7 +985,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;' title='未归档天数' >" + 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>";
 						}
@@ -1016,7 +1019,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
-							xml+="<span style='margin-left: 5px;' title='未归档天数'>" + paperNoArchivedDays + "天" + "</span>";
+							xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
 						}else{
 						}
                         return xml;

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

@@ -38,6 +38,15 @@
                     <input id="toflag" name="toflag" type="hidden" value="1"/>
                     <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
                     <div class="commonQuery">
+
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label">报销编号：</label>
+                            <div class="layui-input-block with-icon">
+                                <input id="number" placeholder="请输入报销编号" name="number" type="text" maxlength="20" class="form-control layui-input" value="${workReimbursement.number}"/>
+                                </input>
+                            </div>
+                        </div>
+
                         <div class="layui-item query athird">
                             <label class="layui-form-label">报销项目：</label>
                             <div class="layui-input-block with-icon">
@@ -62,18 +71,6 @@
                             </div>
                         </div>--%>
 
-                        <div class="layui-item query athird">
-                            <label class="layui-form-label">报销时间：</label>
-                            <div class="layui-input-block readOnlyFFF">
-                                <input id="startDate" placeholder="开始时间" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-                                       value="<fmt:formatDate value="${workReimbursement.startDate}" pattern="yyyy-MM-dd"/>"/>
-                                </input>
-                                <span class="group-sep">-</span>
-                                <input id="endDate" placeholder="结束时间" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-                                       value="<fmt:formatDate value="${workReimbursement.endDate}" pattern="yyyy-MM-dd"/>"/>
-                                </input>
-                            </div>
-                        </div>
 
                         <div class="layui-item athird">
                             <div class="input-group">
@@ -87,6 +84,19 @@
                         <div style="    clear:both;"></div>
                     </div>
                     <div id="moresees" style="clear:both;display:none;">
+
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label">报销时间：</label>
+                            <div class="layui-input-block readOnlyFFF">
+                                <input id="startDate" placeholder="开始时间" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+                                       value="<fmt:formatDate value="${workReimbursement.startDate}" pattern="yyyy-MM-dd"/>"/>
+                                </input>
+                                <span class="group-sep">-</span>
+                                <input id="endDate" placeholder="结束时间" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+                                       value="<fmt:formatDate value="${workReimbursement.endDate}" pattern="yyyy-MM-dd"/>"/>
+                                </input>
+                            </div>
+                        </div>
                         <div class="layui-item query athird">
                             <label class="layui-form-label">经办人：</label>
                             <div class="layui-input-block with-icon">

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

@@ -95,6 +95,13 @@
                     <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
                     <div class="commonQuery">
                         <div class="layui-item query athird">
+                            <label class="layui-form-label">报销编号：</label>
+                            <div class="layui-input-block with-icon">
+                                <input id="number" placeholder="请输入报销编号" name="number" type="text" maxlength="20" class="form-control layui-input" value="${workReimbursement.number}"/>
+                                </input>
+                            </div>
+                        </div>
+                        <div class="layui-item query athird">
                             <label class="layui-form-label">报销项目：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:gridselectcallprojectt url="${ctx}/workreimbursement/workReimbursement/selectprojectOnList" id="project" name="project.id"  value="${workReimbursement.project.id}"  title="选择报销项目" labelName="project.projectName" cssStyle="background-color:#fff"
@@ -118,18 +125,6 @@
                             </div>
                         </div>--%>
 
-                        <div class="layui-item query athird">
-                            <label class="layui-form-label">报销时间：</label>
-                            <div class="layui-input-block readOnlyFFF">
-                                <input id="startDate" placeholder="开始时间" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group bg-white"
-                                       value="<fmt:formatDate value="${workReimbursement.startDate}" pattern="yyyy-MM-dd"/>"/>
-                                </input>
-                                <span class="group-sep">-</span>
-                                <input id="endDate" placeholder="结束时间" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group  bg-white"
-                                       value="<fmt:formatDate value="${workReimbursement.endDate}" pattern="yyyy-MM-dd"/>"/>
-                                </input>
-                            </div>
-                        </div>
 
                         <div class="layui-item athird">
                             <div class="input-group">
@@ -144,6 +139,18 @@
                     </div>
                     <div id="moresees" style="clear:both;display:none;">
                         <div class="layui-item query athird">
+                            <label class="layui-form-label">报销时间：</label>
+                            <div class="layui-input-block readOnlyFFF">
+                                <input id="startDate" placeholder="开始时间" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group bg-white"
+                                       value="<fmt:formatDate value="${workReimbursement.startDate}" pattern="yyyy-MM-dd"/>"/>
+                                </input>
+                                <span class="group-sep">-</span>
+                                <input id="endDate" placeholder="结束时间" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group  bg-white"
+                                       value="<fmt:formatDate value="${workReimbursement.endDate}" pattern="yyyy-MM-dd"/>"/>
+                                </input>
+                            </div>
+                        </div>
+                        <div class="layui-item query athird">
                             <label class="layui-form-label">经办人：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:inquireselectUser id="handleId" name="handleId" value="${workReimbursement.handleId}" labelName="handleName" labelValue="${workReimbursement.handleName}"