2022/7/11 公司级报表年度级别

src/main/java/com/jeeplus/modules/statement/controller/StatementCompanyComprehensiveController.java

@@ -872,4 +872,8 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("page", page);
         return "modules/statement/departmentContractStatementList";
     }
+
+
+//    切换年度报表
+//    public String
 }

src/main/java/com/jeeplus/modules/statement/dao/StatementCompanyComprehensiveDao.java

@@ -548,6 +548,14 @@ public interface StatementCompanyComprehensiveDao  extends CrudDao<StatementComp
      */
     List<StatementCompanyComprehensiveInfo> selectAllByType(StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo);
 
+
+    /**
+     * 根据类型查询公司及所有报表信息 已年级
+     * @param statementCompanyComprehensiveInfo
+     * @return
+     */
+    List<StatementCompanyComprehensiveInfo> selectAllByTypeInYearReport(StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo);
+
     /**
      * 部门级查询新增报销信息
      * @param userId
@@ -686,4 +694,9 @@ public interface StatementCompanyComprehensiveDao  extends CrudDao<StatementComp
      */
     Integer deleteOfficeAuditComprehensive(StatementAuditDataInfo info);
 
+
+    /**
+     * 从statement_company_comprehensive_info中获取当前月份的数据
+     */
+    List<StatementCompanyComprehensiveInfo> getMonthData(@Param("type")String type,@Param("smallDateType") Integer smallDateType);
 }

src/main/java/com/jeeplus/modules/statement/service/StatementCompanyComprehensiveService.java

@@ -170,10 +170,123 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         htinfo.setField3(htnum3);
         htinfo.setField4(htnum4);
         reportFormList4.add(htinfo);
+
+        //公司级：项目报表总览 年度级
+        //type:类型（1：项目；2：开票；3：报销；4：合同）
+        statementCompanyComprehensiveInfo.setType("1");
+        List<StatementCompanyComprehensiveInfo> reportFormList5 = this.selectAllByTypeInYearReport(statementCompanyComprehensiveInfo);
+        //项目表 各列合计
+        String xmnumyear1 = "0";
+        String xmnumyear2 = "0";
+        String xmnumyear3 = "0";
+        String xmnumyear4 = "0";
+        String xmnumyear5 = "0";
+        String xmnumyear6 = "0";
+        String xmnumyear7 = "0";
+        String xmnumyear8 = "0";
+        for(StatementCompanyComprehensiveInfo info:reportFormList1){
+            //转BigDecimal 处理   合计
+            xmnumyear1 = new BigDecimal(info.getField1()).add(new BigDecimal(xmnumyear1)).toString();
+            xmnumyear2 = new BigDecimal(info.getField2()).add(new BigDecimal(xmnumyear2)).toString();
+            xmnumyear3 = new BigDecimal(info.getField3()).add(new BigDecimal(xmnumyear3)).toString();
+            xmnumyear4 = new BigDecimal(info.getField4()).add(new BigDecimal(xmnumyear4)).toString();
+            xmnumyear5 = new BigDecimal(info.getField5()).add(new BigDecimal(xmnumyear5)).toString();
+            xmnumyear6 = new BigDecimal(info.getField6()).add(new BigDecimal(xmnumyear6)).toString();
+            xmnumyear7 = new BigDecimal(info.getField7()).add(new BigDecimal(xmnumyear7)).toString();
+            xmnumyear8 = new BigDecimal(info.getField8()).add(new BigDecimal(xmnumyear8)).toString();
+        }
+        //存放到对应报表的list集合，方便页面集合展示
+        StatementCompanyComprehensiveInfo xmyearinfo = new StatementCompanyComprehensiveInfo();
+        xmyearinfo.setOfficeName("本年合计");
+        xmyearinfo.setField1(xmnumyear1);
+        xmyearinfo.setField2(xmnumyear2);
+        xmyearinfo.setField3(xmnumyear3);
+        xmyearinfo.setField4(xmnumyear4);
+        xmyearinfo.setField5(xmnumyear5);
+        xmyearinfo.setField6(xmnumyear6);
+        xmyearinfo.setField7(xmnumyear7);
+        xmyearinfo.setField8(xmnumyear8);
+        reportFormList5.add(xmyearinfo);
+//        公司级报告年纪项目结束
+        //公司级：开票报表开始
+        //类型（1：项目；2：开票；3：报销；4：合同）
+        statementCompanyComprehensiveInfo.setType("2");
+        List<StatementCompanyComprehensiveInfo> reportFormList6 = this.selectAllByTypeInYearReport(statementCompanyComprehensiveInfo);
+        //各列合计
+        String kpyearnum1 = "0";
+        String kpyearnum2 = "0";
+        String kpyearnum3 = "0";
+        String kpyearnum4 = "0";
+        for(StatementCompanyComprehensiveInfo info:reportFormList2){
+            //转BigDecimal 处理
+            kpyearnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(kpyearnum1)).toString();
+            kpyearnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(kpyearnum2)).toString();
+            kpyearnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(kpyearnum3)).toString();
+            kpyearnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(kpyearnum4)).toString();
+        }
+        //存放到对应报表的list集合，方便页面集合展示
+        StatementCompanyComprehensiveInfo kpyearinfo = new StatementCompanyComprehensiveInfo();
+        kpyearinfo.setOfficeName("本年合计");
+        kpyearinfo.setField1(kpyearnum1);
+        kpyearinfo.setField2(kpyearnum2);
+        kpyearinfo.setField3(kpyearnum3);
+        kpyearinfo.setField4(kpyearnum4);
+        reportFormList6.add(kpyearinfo);
+//        公司级开票报表结束
+    //公司级：报销报表
+        //类型（1：项目；2：开票；3：报销；4：合同）
+        statementCompanyComprehensiveInfo.setType("3");
+        List<StatementCompanyComprehensiveInfo> reportFormList7 = this.selectAllByTypeInYearReport(statementCompanyComprehensiveInfo);
+        //合计
+        String bxyearnum1 = "0";
+        String bxyearnum2 = "0";
+        for(StatementCompanyComprehensiveInfo info:reportFormList3){
+            //转BigDecimal 处理
+            bxyearnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(bxyearnum1)).toString();
+            bxyearnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(bxyearnum2)).toString();
+        }
+        //存放到对应报表的list集合，方便页面集合展示
+        StatementCompanyComprehensiveInfo bxyearinfo = new StatementCompanyComprehensiveInfo();
+        bxinfo.setOfficeName("本年合计");
+        bxyearinfo.setField1(bxyearnum1);
+        bxyearinfo.setField2(bxyearnum2);
+        reportFormList7.add(bxyearinfo);
+        //公司级：报销报表结束
+        //公司级：合同报表
+        //类型（1：项目；2：开票；3：报销；4：合同）
+        statementCompanyComprehensiveInfo.setType("4");
+        List<StatementCompanyComprehensiveInfo> reportFormList8= this.selectAllByTypeInYearReport(statementCompanyComprehensiveInfo);
+        //合计
+        String htyearnum1 = "0";
+        String htyearnum2 = "0";
+        String htyearnum3 = "0";
+        String htyearnum4 = "0";
+        for(StatementCompanyComprehensiveInfo info:reportFormList4){
+            //转BigDecimal 处理
+            htyearnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(htyearnum1)).toString();
+            htyearnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(htyearnum2)).toString();
+            htyearnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(htyearnum3)).toString();
+            htyearnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(htyearnum4)).toString();
+        }
+        //存放到对应报表的list集合，方便页面集合展示
+        StatementCompanyComprehensiveInfo htyearinfo = new StatementCompanyComprehensiveInfo();
+        htinfo.setOfficeName("本年合计");
+        htyearinfo.setField1(htyearnum1);
+        htyearinfo.setField2(htyearnum2);
+        htyearinfo.setField3(htyearnum3);
+        htyearinfo.setField4(htyearnum4);
+        reportFormList8.add(htyearinfo);
+        //公司级：合同报表结束
+
+
         map.put("reportFormList1",reportFormList1);
         map.put("reportFormList2",reportFormList2);
         map.put("reportFormList3",reportFormList3);
         map.put("reportFormList4",reportFormList4);
+        map.put("reportFormList5",reportFormList5);
+        map.put("reportFormList6",reportFormList6);
+        map.put("reportFormList7",reportFormList7);
+        map.put("reportFormList8",reportFormList8);
         return map;
     }
 
@@ -230,6 +343,88 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         }
     }
 
+
+
+    /**
+     * 公司级年度信息处理
+     */
+    public void disposeStatementCompanyByyear(Integer year,Integer bigDateType,Integer smallDateType){
+        Calendar cal = Calendar.getInstance();
+        //获取当前年份
+        if(null == year){
+            year = cal.get(Calendar.YEAR);
+        }
+        int month = cal.get(Calendar.MONTH)+1;
+        List<StatementCompanyComprehensiveInfo> statementCompanyComprehensiveInfos = new ArrayList<StatementCompanyComprehensiveInfo>();
+        String xmnum1 = "0";
+        String xmnum2 = "0";
+        String xmnum3 = "0";
+        String xmnum4 = "0";
+//        获取项目月报的信息,将每个月的新增A类，B类、本月电子归档、本月上报进行增加 1为项目报告
+        for(int i =1;i<=month;i++){
+            statementCompanyComprehensiveInfos = dao.getMonthData("1",i);
+            //       从 statement_company_comprehensive_info中获取之前月份的信息，进行增加后保存到statement_company_comprehensive_info2中
+//          for(StatementCompanyComprehensiveInfo info:statementCompanyComprehensiveInfos){
+//              xmnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(xmnum1)).toString();
+//              xmnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(xmnum2)).toString();
+//              xmnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(xmnum3)).toString();
+//              xmnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(xmnum4)).toString();
+//          }
+            for(int j=0;j<statementCompanyComprehensiveInfos.size();j++){
+                xmnum1 = new BigDecimal(statementCompanyComprehensiveInfos.get(i).getField1()).add(new BigDecimal(xmnum1)).toString();
+                statementCompanyComprehensiveInfos.get(i).setField1(xmnum1);
+                xmnum2 = new BigDecimal(statementCompanyComprehensiveInfos.get(i).getField2()).add(new BigDecimal(xmnum2)).toString();
+                statementCompanyComprehensiveInfos.get(i).setField1(xmnum2);
+                xmnum3 = new BigDecimal(statementCompanyComprehensiveInfos.get(i).getField3()).add(new BigDecimal(xmnum3)).toString();
+                statementCompanyComprehensiveInfos.get(i).setField1(xmnum3);
+                xmnum4 = new BigDecimal(statementCompanyComprehensiveInfos.get(i).getField4()).add(new BigDecimal(xmnum4)).toString();
+                statementCompanyComprehensiveInfos.get(i).setField4(xmnum4);
+            }
+//          statementCompanyComprehensiveInfos
+//          dao.insertToStatementCompanyComprehensiveInfo(statementCompanyComprehensiveInfos);
+        }
+
+
+
+        Map<String, String> dateMap = getDateNew(bigDateType, smallDateType, year);
+        //开始时间
+        String beginDate = dateMap.get("beginDate");
+        //结束时间
+        String endDate = dateMap.get("endDate");
+        String statementDate = dateMap.get("statementDate");
+        //公司级项目处理
+        disposeStatementCompanyProject(year,beginDate,endDate,statementDate,bigDateType, smallDateType);
+        //查询部门信息
+        List<Office> officeList = dao.getAllOfficeListInfo();
+        //公司级开票处理
+        disposeStatementCompanyInvoice(year,beginDate,endDate,statementDate,bigDateType, smallDateType,officeList);
+        //公司级报销处理
+        disposeStatementCompanyReimbursement(year,beginDate,endDate,statementDate,bigDateType, smallDateType,officeList);
+        //公司级合同处理
+        disposeStatementCompanyContract(year,beginDate,endDate,statementDate,bigDateType, smallDateType,officeList);
+
+        //创建utilNotifyId参数
+        //参数是由 year、bigDateType、smallDateType参数设定
+        String utilNotifyId = year + "," + bigDateType + "," + smallDateType;
+        //发送通知
+        switch (bigDateType){
+            //年度汇总
+            case 0:
+                companyNotification(statementDate,"年","161",utilNotifyId);
+                break;
+            //季度汇总
+            case 1:
+                //smallDateType  为季度时候
+                companyNotification(statementDate,"季","162",utilNotifyId);
+                break;
+            //月度汇总
+            case 2:
+                //smallDateType  为月度时候
+                companyNotification(statementDate,"月","163",utilNotifyId);
+                break;
+        }
+    }
+
     /**
      * 公司级通知
      * @param statementDate
@@ -1567,6 +1762,11 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         return list;
     }
 
+//根据公司级报告查询所有的表内容
+    public List<StatementCompanyComprehensiveInfo> selectAllByTypeInYearReport(StatementCompanyComprehensiveInfo info){
+        List<StatementCompanyComprehensiveInfo> list = dao.selectAllByType(info);
+        return list;
+    }
 
     /**
      * 部门级 所有报表信息

src/main/java/com/jeeplus/modules/workcalendar/service/WorkCalendarTaskService.java

@@ -164,6 +164,9 @@ public class WorkCalendarTaskService  {
             logger.info("-----------公司级—月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
             logger.info("------------公司级—月度报表（结束）------------------");
+            logger.info("------------公司级—年度报表（开始)------------------");
+            statementCompanyComprehensiveService.disposeStatementCompanyByyear(year,0,month);
+            logger.info("------------公司级—年度报表（结束）------------------");
             logger.info("-----------部门级—月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
             logger.info("------------部门级—月度报表（结束）------------------");

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -7443,7 +7443,10 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("reportFormList2",stringListMap.get("reportFormList2"));//开票报表
 					model.addAttribute("reportFormList3",stringListMap.get("reportFormList3"));//报销报表
 					model.addAttribute("reportFormList4",stringListMap.get("reportFormList4"));//合同报表
-
+					model.addAttribute("reportFormList5",stringListMap.get("reportFormList5"));//年度项目报表
+					model.addAttribute("reportFormList6",stringListMap.get("reportFormList6"));//年度开票报表
+					model.addAttribute("reportFormList7",stringListMap.get("reportFormList7"));//年度报销报表
+					model.addAttribute("reportFormList8",stringListMap.get("reportFormList8"));//年度合同报表
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/statement/companyDataView";
 					}

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

@@ -197,7 +197,7 @@
 		</where>
 	</select>
 
-	<select id="getProjectCountByRecordAll" resultType="com.jeeplus.modules.statement.entity.ReportDataEntity">
+		<select id="getProjectCountByRecordAll" resultType="com.jeeplus.modules.statement.entity.ReportDataEntity">
 		select a.office_id as "officeId",so.parent_ids as "officeParentIds",count(1) as "count" from rural_project_records a
 		left join project_report_data prd on a.id = prd.project_id
 		left join rural_project_report_record rprr on prd.id = rprr.report_id
@@ -1324,6 +1324,38 @@
 		</where>
 	</select>
 
+
+
+	<select id="selectAllByTypeInYearReport" parameterType="StatementCompanyComprehensiveInfo" resultType="StatementCompanyComprehensiveInfo">
+		select
+		a.id as "id",
+		a.del_flag as "delFlag",
+		a.create_date as "createDate",
+		a.year as "year",
+		a.type as "type",
+		a.big_date_type as "bigDateType",
+		a.small_date_type as "smallDateType",
+		a.statement_date as "statementDate",
+		a.office_id as "officeId",
+		a.field1 as "field1",
+		a.field2 as "field2",
+		a.field3 as "field3",
+		a.field4 as "field4",
+		a.field5 as "field5",
+		a.field6 as "field6",
+		a.field7 as "field7",
+		a.field8 as "field8",
+		(select name from sys_office where id = office_id) officeName
+		from statement_company_comprehensive_info2 a
+		<where>
+			a.type = #{type}
+			and a.del_flag = 0
+			and a.big_date_type = #{bigDateType}
+			and a.year = #{year}
+			and a.small_date_type = #{smallDateType}
+		</where>
+	</select>
+
 	<select id="selectAllByOfficeId" parameterType="StatementCompanyComprehensiveInfo" resultType="StatementCompanyComprehensiveInfo">
 		SELECT
 			su.NAME as "userName",
@@ -1458,4 +1490,35 @@
 		AND ( a.reported_state = 6 OR a.reported_state IS NULL )
 		and prd.create_date>=#{beginDate} and prd.create_date &lt;=#{endDate}
 	</select>
+
+
+	<select id="getMonthData" resultType="com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo">
+
+	select a.id as "id",
+		a.del_flag as "delFlag",
+		a.create_date as "createDate",
+		a.year as "year",
+		a.type as "type",
+		a.big_date_type as "bigDateType",
+		a.small_date_type as "smallDateType",
+		a.statement_date as "statementDate",
+		a.office_id as "officeId",
+		a.field1 as "field1",
+		a.field2 as "field2",
+		a.field3 as "field3",
+		a.field4 as "field4",
+		a.field5 as "field5",
+		a.field6 as "field6",
+		a.field7 as "field7",
+		a.field8 as "field8",
+	from statement_company_comprehensive_info a
+	where
+	<if test="type != null and type != ''">
+		type  = #{type}
+	</if>
+	<if test="smallDateType !=null and smallDateType!=''">
+		small_date_type  = #{small_date_type}
+	</if>
+		and a.del_flag = 0
+	</select>
 </mapper>

src/main/webapp/webpage/modules/statement/companyDataView.jsp

@@ -778,6 +778,12 @@
 			xml+="</div>";
 			return[xml].join('');
 		}
+		
+	//	单选按钮点击事件
+		function switchReport() {
+			// var nyr = $('input:radio:checked').val();
+			// alert nyr;
+		}
 	</script>
 	<style>
 		body{
@@ -805,22 +811,86 @@
 				</div>
 
 				<%--项目报表--%>
-				<div class="form-group-label"><h2>项目${nyr}报</h2></div>
+<%--				<div class="form-group-label"><h2>项目${nyr}报</h2>--%>
+				<div class="form-group-label" style="display: block"><h2>项目${nyr}报
+<%--					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--%>
+<%--					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--%>
+					<div style="float: right;height: 17.9px">
+						<input type="radio" name="projectReport" value="year"><span style="font-size: 16px;font-weight: normal" onclick="switchReport">年</span>
+						<input type="radio" name="projectReport" value="month" checked="checked"><span style="font-size: 16px;font-weight: normal" onclick="switchReport" >月</span>
+					</div>
+				</h2>
+
+<%--					<input type="radio" checked="checked" name="month" style="text-align:left">月--%>
+				</div>
+<%--				年月单选按钮--%>
+
 				<table class="oa-table layui-table" id="contentTable1" lay-filter="test"></table>
 
 				<%--开票报表--%>
-				<div class="form-group-label"><h2>开票${nyr}报</h2></div>
+				<div class="form-group-label"><h2>开票${nyr}报
+					<div style="float: right;height: 17.9px">
+						<input type="radio" name="projectReport" value="year"><span style="font-size: 16px;font-weight: normal" onclick="switchReport">年</span>
+						<input type="radio" name="projectReport" value="month" checked="checked"><span style="font-size: 16px;font-weight: normal" onclick="switchReport" >月</span>
+					</div>
+				</h2></div>
 				<table class="oa-table layui-table" id="contentTable2" lay-filter="test"></table>
 
 				<%--报销报表--%>
-				<div class="form-group-label"><h2>报销${nyr}报</h2></div>
+				<div class="form-group-label"><h2>报销${nyr}报
+					<div style="float: right;height: 17.9px">
+						<input type="radio" name="projectReport" value="year"><span style="font-size: 16px;font-weight: normal" onclick="switchReport">年</span>
+						<input type="radio" name="projectReport" value="month" checked="checked"><span style="font-size: 16px;font-weight: normal" onclick="switchReport" >月</span>
+					</div>
+				</h2></div>
 				<table class="oa-table layui-table" id="contentTable3" lay-filter="test"></table>
 
 				<%--合同报表--%>
-				<div class="form-group-label"><h2>合同${nyr}报</h2></div>
+				<div class="form-group-label"><h2>合同${nyr}报
+					<div style="float: right;height: 17.9px">
+						<input type="radio" name="projectReport" value="year"><span style="font-size: 16px;font-weight: normal" onclick="switchReport">年</span>
+						<input type="radio" name="projectReport" value="month" checked="checked"><span style="font-size: 16px;font-weight: normal" onclick="switchReport" >月</span>
+					</div>
+				</h2></div>
 				<table class="oa-table layui-table" id="contentTable4" lay-filter="test"></table>
 
 
+				<%--项目报表年纪--%>
+                <div class="form-group-label"><h2>项目年报
+					<div style="float: right;height: 17.9px">
+						<input type="radio" name="projectReport" value="year"><span style="font-size: 16px;font-weight: normal" onclick="switchReport">年</span>
+						<input type="radio" name="projectReport" value="month" checked="checked"><span style="font-size: 16px;font-weight: normal" onclick="switchReport" >月</span>
+					</div>
+				</h2></div>
+				<table class="oa-table layui-table" id="contentTable5" lay-filter="test"></table>
+
+				<%--开票年纪--%>
+				<div class="form-group-label"><h2>开票年报
+					<div style="float: right;height: 17.9px">
+						<input type="radio" name="projectReport" value="year"><span style="font-size: 16px;font-weight: normal" onclick="switchReport">年</span>
+						<input type="radio" name="projectReport" value="month" checked="checked"><span style="font-size: 16px;font-weight: normal" onclick="switchReport" >月</span>
+					</div>
+				</h2></div>
+				<table class="oa-table layui-table" id="contentTable6" lay-filter="test"></table>
+
+				<%--报销年纪--%>
+				<div class="form-group-label"><h2>报销年报
+					<div style="float: right;height: 17.9px">
+						<input type="radio" name="projectReport" value="year"><span style="font-size: 16px;font-weight: normal" onclick="switchReport">年</span>
+						<input type="radio" name="projectReport" value="month" checked="checked"><span style="font-size: 16px;font-weight: normal" onclick="switchReport" >月</span>
+					</div>
+				</h2></div>
+				<table class="oa-table layui-table" id="contentTable7" lay-filter="test"></table>
+
+				<%--项目报表年纪--%>
+				<div class="form-group-label"><h2>合同年报
+					<div style="float: right;height: 17.9px">
+						<input type="radio" name="projectReport" value="year"><span style="font-size: 16px;font-weight: normal" onclick="switchReport">年</span>
+						<input type="radio" name="projectReport" value="month" checked="checked"><span style="font-size: 16px;font-weight: normal" onclick="switchReport" >月</span>
+					</div>
+				</h2></div>
+				<table class="oa-table layui-table" id="contentTable8" lay-filter="test"></table>
+
 				<div style="clear: both;"></div>
 			</div>
 		</div>
@@ -996,6 +1066,7 @@
 					}}
 				,{field:'field4',align:'center', title: '本${nyr}收款金额'}
 			]]
+			//年级报表结束
 			,data: [
 				//data下是list集合，一定要这样写，不然无逗号分割会报错
 				<c:forEach items="${reportFormList2}" var="reportFormList" varStatus="index">
@@ -1065,8 +1136,8 @@
 			,page: false
 			,cols: [[
 				// {checkbox: true, fixed: true},
-				{field: 'statementDate',align:'center', title: '时间',rowspan:2}
-				,{field:'officeName',align:'center', title: '部门',rowspan:2}
+				{field: 'statementDate',align:'center', title: '11时间',rowspan:2}
+				,{field:'officeName',align:'center', title: '11部门',rowspan:2}
 				,{field:'field1',align:'center', title: '新增',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
 							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"','95%', '95%')\">" + d.field1 + "</a>";
@@ -1123,6 +1194,259 @@
 	})
 
 
+	//项目报表年级
+	layui.use('table', function(){
+		layui.table.render({
+			elem: '#contentTable5'
+			,page: false
+			,cols: [[
+				// {checkbox: true, fixed: true},
+				{field: 'statementDate',align:'center', title: '时间',rowspan:2}
+				,{field:'officeName',align:'center', title: '部门',rowspan:2}
+				,{field:'field1',align:'center', title: '新增A类',rowspan:2,templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增A类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&grade=2','95%', '95%')\">" + d.field1 + "</a>";
+						}else{
+							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
+						}
+					}}
+				,{field:'field2',align:'center', title: '新增B类',rowspan:2,templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增B类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&grade=1','95%', '95%')\">" + d.field2 + "</a>";
+						}else{
+							return "<span title='"+ d.field2 +"'>" +d.field2+ "</span>";
+						}
+					}}
+				,{field:'field3',align:'center', title: '本年电子归档',rowspan:2,templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&recordState=5','95%', '95%')\">" + d.field3 + "</a>";
+						}else{
+							return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
+						}
+					}}
+				,{field:'field4',align:'center', title: '本年上报',rowspan:2,templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&reportedState=5','95%', '95%')\">" + d.field4 + "</a>";
+						}else{
+							return "<span title='"+ d.field4 +"'>" +d.field4+ "</span>";
+						}
+					}}
+				,{align:'center', title: '电子超期未归档',colspan: 2}
+				,{align:'center', title: '上报超期',colspan:2}
+			],
+				[
+					{field:'field5',align:'center',title:'超期未归档',templet:function(d){
+							if("" != d.statementDate){
+								return "<a class=\"attention-info\" title=\"" + d.field5 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field5=5','95%', '95%')\">" + d.field5 + "</a>";
+							}else{
+								return "<span title='"+ d.field5 +"'>" +d.field5+ "</span>";
+							}
+						}}
+					,{field:'field6',align:'center',title:'超期已归档',templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field6 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field6=5','95%', '95%')\">" + d.field6 + "</a>";
+						}else{
+							return "<span title='"+ d.field6 +"'>" +d.field6+ "</span>";
+						}
+					}}
+					,{field:'field7',align:'center',title:'超期未上报',templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field7 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field7=5','95%', '95%')\">" + d.field7 + "</a>";
+						}else{
+							return "<span title='"+ d.field7 +"'>" +d.field7+ "</span>";
+						}
+					}}
+					,{field:'field8',align:'center',title:'超期已上报',templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field8 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field8=5','95%', '95%')\">" + d.field8 + "</a>";
+						}else{
+							return "<span title='"+ d.field8 +"'>" +d.field8+ "</span>";
+						}
+					}}
+				]]
+			,data: [
+				//data下是list集合，一定要这样写，不然无逗号分割会报错
+				<c:forEach items="${reportFormList1}" var="reportFormList" varStatus="index">
+				<c:if test="${index.index != 0}">,</c:if>
+				{
+					"id":"${reportFormList.id}"
+					,"year":"${reportFormList.year}"
+					,"officeId":"${reportFormList.officeId}"
+					,"bigDateType":"${reportFormList.bigDateType}"
+					,"smallDateType":"${reportFormList.smallDateType}"
+					,"statementDate":"${reportFormList.statementDate}"
+					,"officeName":"${reportFormList.officeName}"
+					,"field1":"${reportFormList.field1}"
+					,"field2":"${reportFormList.field2}"
+					,"field3":"${reportFormList.field3}"
+					,"field4":"${reportFormList.field4}"
+					,"field5":"${reportFormList.field5}"
+					,"field6":"${reportFormList.field6}"
+					,"field7":"${reportFormList.field7}"
+					,"field8":"${reportFormList.field8}"
+				}
+				</c:forEach>
+			]
+			,limit: 100
+		});
+	})
+	//项目报表年级结束
+
+	//开票报表开始
+	layui.use('table', function(){
+		layui.table.render({
+			elem: '#contentTable6'
+			,page: false
+			,cols: [[
+				// {checkbox: true, fixed: true},
+				{field: 'statementDate',align:'center', title: '时间'}
+				,{field:'officeName',align:'center', title: '部门'}
+				,{field:'field1',align:'center', title: '新增发票',templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&newlyAdded=5','95%', '95%')\">" + d.field1 + "</a>";
+						}else{
+							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
+						}
+					}}
+				,{field:'field2',align:'center', title: '开票金额'}
+				,{field:'field3',align:'center', title: '本${nyr}收款发票',templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}收款发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&collectionThisMonth=5','95%', '95%')\">" + d.field3 + "</a>";
+						}else{
+							return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
+						}
+					}}
+				,{field:'field4',align:'center', title: '本${nyr}收款金额'}
+			]]
+			//年级报表结束
+			,data: [
+				//data下是list集合，一定要这样写，不然无逗号分割会报错
+				<c:forEach items="${reportFormList2}" var="reportFormList" varStatus="index">
+				<c:if test="${index.index != 0}">,</c:if>
+				{
+					"id":"${reportFormList.id}"
+					,"year":"${reportFormList.year}"
+					,"officeId":"${reportFormList.officeId}"
+					,"bigDateType":"${reportFormList.bigDateType}"
+					,"smallDateType":"${reportFormList.smallDateType}"
+					,"statementDate":"${reportFormList.statementDate}"
+					,"officeName":"${reportFormList.officeName}"
+					,"field1":"${reportFormList.field1}"
+					,"field2":"${reportFormList.field2}"
+					,"field3":"${reportFormList.field3}"
+					,"field4":"${reportFormList.field4}"
+				}
+				</c:forEach>
+			]
+			,limit: 100
+		});
+	})
+	// 开票报表结束
+
+	//报销列表开始
+	layui.use('table', function(){
+		layui.table.render({
+			elem: '#contentTable7'
+			,page: false
+			,cols: [[
+				// {checkbox: true, fixed: true},
+				{field: 'statementDate',align:'center', title: '时间'}
+				,{field:'officeName',align:'center', title: '部门'}
+				,{field:'field1',align:'center', title: '新增报销',templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增报销', '${ctx}/statement/StatementCompanyComprehensive/reimbursementReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"','95%', '95%')\">" + d.field1 + "</a>";
+						}else{
+							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
+						}
+					}}
+				,{field:'field2',align:'center', title: '报销金额'}
+			]]
+			,data: [
+				//data下是list集合，一定要这样写，不然无逗号分割会报错
+				<c:forEach items="${reportFormList3}" var="reportFormList" varStatus="index">
+				<c:if test="${index.index != 0}">,</c:if>
+				{
+					"id":"${reportFormList.id}"
+					,"year":"${reportFormList.year}"
+					,"officeId":"${reportFormList.officeId}"
+					,"bigDateType":"${reportFormList.bigDateType}"
+					,"smallDateType":"${reportFormList.smallDateType}"
+					,"statementDate":"${reportFormList.statementDate}"
+					,"officeName":"${reportFormList.officeName}"
+					,"field1":"${reportFormList.field1}"
+					,"field2":"${reportFormList.field2}"
+				}
+				</c:forEach>
+			]
+			,limit: 100
+		});
+	})
+	//报销列表结束
+
+	// 合同报表开始
+	layui.use('table', function(){
+		layui.table.render({
+			elem: '#contentTable8'
+			,page: false
+			,cols: [[
+				// {checkbox: true, fixed: true},
+				{field: 'statementDate',align:'center', title: '时间',rowspan:2}
+				,{field:'officeName',align:'center', title: '部门',rowspan:2}
+				,{field:'field1',align:'center', title: '新增',rowspan:2,templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"','95%', '95%')\">" + d.field1 + "</a>";
+						}else{
+							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
+						}
+					}}
+				,{field:'field2',align:'center', title: '本年纸质归档',rowspan:2,templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}纸质归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&contractRecordState=5','95%', '95%')\">" + d.field2 + "</a>";
+						}else{
+							return "<span title='"+ d.field2 +"'>" +d.field2+ "</span>";
+						}
+					}}
+				,{align:'center', title: '未纸质归档',colspan: 2}
+			],
+				[
+					{field:'field3',align:'center',title:'超期未归档',templet:function(d){
+							if("" != d.statementDate){
+								return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&field3=5','95%', '95%')\">" + d.field3 + "</a>";
+							}else{
+								return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
+							}
+						}}
+					,{field:'field4',align:'center',title:'超期已归档',templet:function(d){
+						if("" != d.statementDate){
+							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&field4=5','95%', '95%')\">" + d.field4 + "</a>";
+						}else{
+							return "<span title='"+ d.field4 +"'>" +d.field4+ "</span>";
+						}
+					}}
+				]]
+			,data: [
+				//data下是list集合，一定要这样写，不然无逗号分割会报错
+				<c:forEach items="${reportFormList4}" var="reportFormList" varStatus="index">
+				<c:if test="${index.index != 0}">,</c:if>
+				{
+					"id":"${reportFormList.id}"
+					,"year":"${reportFormList.year}"
+					,"officeId":"${reportFormList.officeId}"
+					,"bigDateType":"${reportFormList.bigDateType}"
+					,"smallDateType":"${reportFormList.smallDateType}"
+					,"statementDate":"${reportFormList.statementDate}"
+					,"officeName":"${reportFormList.officeName}"
+					,"field1":"${reportFormList.field1}"
+					,"field2":"${reportFormList.field2}"
+					,"field3":"${reportFormList.field3}"
+					,"field4":"${reportFormList.field4}"
+				}
+				</c:forEach>
+			]
+			,limit: 100
+		});
+	})
+	// 合同结束开始
     resizeListTable();
     $("a").on("click",addLinkVisied);
 </script>