Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/persistence/CrudDao.java

@@ -120,4 +120,5 @@ public interface CrudDao<T> extends BaseDao {
 	 * @return
 	 */
 	public Integer queryCount(T entity);
+
 }

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

@@ -3404,9 +3404,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 
 	//公司级：项目报表详细
 	public Page<RuralProjectRecords> findReportPage(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,String officeId,String grade,String bigDateType,String smallDateType
-													,String recordState,String reportedState) {
-		//将获取的datetype转为需要的具体时间
-		Map<String,String> map = statementCompanyComprehensiveService.getDate(new Integer(bigDateType),new Integer(smallDateType));
+													,String recordState,String reportedState,String year) {
+		//将获取的datetype转为需要的具体时间   含年月日
+		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
         String endDate = map.get("endDate");
 		if(null!= projectRecords.getOffice() && StringUtils.isNotBlank(projectRecords.getOffice().getId())){
@@ -3422,7 +3422,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		}
 		projectRecords.setPage(page);
 		List<RuralProjectRecords> recordsList = dao.selectReportPage(projectRecords,officeId,grade,beginDate,endDate,recordState,reportedState);
-		int count = dao.reportPageCount(projectRecords,officeId,grade,beginDate,endDate,recordState,reportedState); //deigai
+		int count = dao.reportPageCount(projectRecords,officeId,grade,beginDate,endDate,recordState,reportedState);
 		page.setPageNo(oldPageNo);
 		page.setCount(count);
 		page.setCountFlag(false);

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

@@ -6,7 +6,6 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
 import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
-import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
@@ -14,7 +13,6 @@ import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
 import com.jeeplus.modules.statement.service.StatementCompanyComprehensiveService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkCntractBorrow;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
@@ -98,6 +96,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
                             , Model model, @Param(value = "bigDateType") String bigDateType
                             , @Param(value = "smallDateType") String smallDateType
                             , @Param(value = "officeId") String officeId
+                            , @Param(value = "year") String year
                             , @Param(value = "grade")String grade
                             , @Param(value = "recordState")String recordState
                             , @Param(value = "reportedState")String reportedState){
@@ -106,6 +105,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("bigDateType",bigDateType);
         model.addAttribute("smallDateType",smallDateType);
         model.addAttribute("officeId",officeId);
+        model.addAttribute("year",year);
         model.addAttribute("grade",grade);
         model.addAttribute("recordState",recordState);
         model.addAttribute("reportedState",reportedState);
@@ -130,7 +130,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         //添加查询类型(造价审核)
         //projectRecords.setProjectType("2");
         //获取项目信息
-        Page<RuralProjectRecords> page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords,officeId,grade,bigDateType,smallDateType,recordState,reportedState);
+        Page<RuralProjectRecords> page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords,officeId,grade,bigDateType,smallDateType,recordState,reportedState,year);
 
         //查询工程类型
         if (projectRecords.getEngineeringType()!=null){
@@ -138,7 +138,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
             model.addAttribute("engineeringInfo", engineeringInfo);
         }
         model.addAttribute("page", page);
-        return "modules/ruralprojectrecords/cost/projectReportList";
+        return "modules/statement/projectReportList";
     }
 
     //公司级：开票报表详细
@@ -147,12 +147,14 @@ public class StatementCompanyComprehensiveController extends BaseController {
     @RequestMapping("billingReportList")
     public String billingReportList(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, Model model
                                 ,@Param("officeIdd") String officeIdd,@Param("bigDateType")String bigDateType,@Param("smallDateType")String smallDateType
-                                ,@Param("newlyAdded") String newlyAdded,@Param("collectionThisMonth") String collectionThisMonth) {
+                                ,@Param("newlyAdded") String newlyAdded,@Param("collectionThisMonth") String collectionThisMonth
+                                 , @Param(value = "year") String year) {
 
         //每次都必须接收前端传参并放入model
         model.addAttribute("bigDateType",bigDateType);
         model.addAttribute("smallDateType",smallDateType);
         model.addAttribute("officeIdd",officeIdd);
+        model.addAttribute("year",year);
         model.addAttribute("newlyAdded",newlyAdded);
         model.addAttribute("collectionThisMonth",collectionThisMonth);
 
@@ -173,7 +175,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
             workInvoice.setAccountCheckingUserId(null);
         }
         //获取信息
-        Page<WorkInvoice> page = workInvoiceService.findBillingReportPage(new Page<WorkInvoice>(request, response), workInvoice, officeIdd,bigDateType,smallDateType,newlyAdded,collectionThisMonth);
+        Page<WorkInvoice> page = workInvoiceService.findBillingReportPage(new Page<WorkInvoice>(request, response), workInvoice, officeIdd,bigDateType,smallDateType,newlyAdded,collectionThisMonth,year);
 
 
         String getSumMoney = workInvoiceService.getSumMoney(workInvoice);
@@ -202,19 +204,21 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("sumMoney", getSumMoney);
         model.addAttribute("workInvoiceShow", workInvoice);
 
-        return "modules/workinvoice/billingReportList";
+        return "modules/statement/billingReportList";
     }
 
     //公司级：报销报表详细
     //参数：officeId ，bigDateType，smallDateType
     @RequestMapping("reimbursementReportList")
     public String reimbursementReportList(WorkReimbursement workReimbursement, HttpServletRequest request, HttpServletResponse response, Model model
-                                    ,@Param("officeIdd") String officeIdd,@Param("bigDateType")String bigDateType,@Param("smallDateType")String smallDateType) {
+                                    ,@Param("officeIdd") String officeIdd,@Param("bigDateType")String bigDateType,@Param("smallDateType")String smallDateType
+                                    , @Param(value = "year") String year) {
 
         //每次都必须接收前端传参并放入model
         model.addAttribute("bigDateType",bigDateType);
         model.addAttribute("smallDateType",smallDateType);
         model.addAttribute("officeIdd",officeIdd);
+        model.addAttribute("year",year);
 
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(workReimbursement.getToflag())){
@@ -229,7 +233,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         }
         //workReimbursement.setOfficeId(UserUtils.getSelectOffice().getId());
         //获取信息
-        Page<WorkReimbursement> page = workReimbursementService.findReimbursementReportPage(new Page<WorkReimbursement>(request, response), workReimbursement,officeIdd,bigDateType,smallDateType);
+        Page<WorkReimbursement> page = workReimbursementService.findReimbursementReportPage(new Page<WorkReimbursement>(request, response), workReimbursement,officeIdd,bigDateType,smallDateType,year);
         List<WorkReimbursement> list = page.getList();
 
         //查询所有和当前登陆人有关的项目的审核
@@ -275,7 +279,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
             }
         }
         model.addAttribute("page", page);
-        return "modules/workreimbursement/reimbursementReportList";
+        return "modules/statement/reimbursementReportList";
     }
 
     //公司级：合同报表详细
@@ -284,12 +288,13 @@ public class StatementCompanyComprehensiveController extends BaseController {
     @RequestMapping(value = "contractStatementList")
     public String contractStatementList(WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model
                      ,@Param("officeIdd") String officeIdd,@Param("bigDateType")String bigDateType,@Param("smallDateType")String smallDateType
-                     ,@Param("contractRecordState")String contractRecordState) {
+                     ,@Param("contractRecordState")String contractRecordState, @Param(value = "year") String year) {
 
         //每次都必须接收前端传参并放入model
         model.addAttribute("bigDateType",bigDateType);
         model.addAttribute("smallDateType",smallDateType);
         model.addAttribute("officeIdd",officeIdd);
+        model.addAttribute("year",year);
         model.addAttribute("contractRecordState",contractRecordState);
 
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
@@ -308,7 +313,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         User user = UserUtils.getUser();
 
         //查询信息
-        Page<WorkContractInfo> page = workContractInfoService.findContractStatementPage(new Page<WorkContractInfo>(request, response), workContractInfo,officeIdd,bigDateType,smallDateType,contractRecordState);
+        Page<WorkContractInfo> page = workContractInfoService.findContractStatementPage(new Page<WorkContractInfo>(request, response), workContractInfo,officeIdd,bigDateType,smallDateType,contractRecordState,year);
         List<WorkContractInfo> list = page.getList();
 
         //查询所有和当前登陆人有关的项目的审核
@@ -425,6 +430,6 @@ public class StatementCompanyComprehensiveController extends BaseController {
             }
         }
         model.addAttribute("page", page);
-        return "modules/workcontractinfo/contractStatementList";
+        return "modules/statement/contractStatementList";
     }
 }

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

@@ -619,6 +619,83 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         return map;
     }
 
+    /**
+     * 根据状态获取查询得开始和结束时间   获取精确的年月日
+     * @param bigDateType 状态1（0：年；1：季度；2：月份）
+     * @param smallDateType 状态2（针对状态1进行精确所在指定季度或者月份）
+     * @param year
+     * @return
+     */
+    public Map<String,String> getDateNew(Integer bigDateType,Integer smallDateType,Integer year){
+        Map<String,String> map = new HashMap();
+//        Calendar cal = Calendar.getInstance();
+//        //获取当前年份
+//        int year = cal.get(Calendar.YEAR);
+        String beginDate = "";
+        String endDate = "";
+        String statementDate = "";
+        switch (bigDateType){
+            //年度汇总
+            case 0:
+                beginDate = year + "-01-01 00:00:00";
+                endDate = year + "-12-31 23:59:59";
+                statementDate = year + "年";
+                break;
+            //季度汇总
+            case 1:
+                //smallDateType  为季度时候
+                switch (smallDateType){
+                    case 1:
+                        beginDate = year + "-01-01 00:00:00";
+                        endDate = year + "-03-31 23:59:59";
+                        break;
+                    case 2:
+                        beginDate = year + "-04-01 00:00:00";
+                        endDate = year + "-06-30 23:59:59";
+                        break;
+                    case 3:
+                        beginDate = year + "-07-01 00:00:00";
+                        endDate = year + "-09-30 23:59:59";
+                        break;
+                    case 4:
+                        beginDate = year + "-10-01 00:00:00";
+                        endDate = year + "-12-31 23:59:59";
+                        break;
+                }
+                statementDate = year + "年" + smallDateType + "季度";
+                break;
+            //月度汇总
+            case 2:
+                //smallDateType  为月度时候
+                switch (smallDateType){
+                    case 1:
+                    case 2:
+                    case 3:
+                    case 4:
+                    case 5:
+                    case 6:
+                    case 7:
+                    case 8:
+                    case 9:
+                        beginDate = year + "-0" + smallDateType + "-01 00:00:00";
+                        endDate = year + "-0" + smallDateType + "-31 23:59:59";
+                        break;
+                    case 10:
+                    case 11:
+                    case 12:
+                        beginDate = year + "-" + smallDateType + "-01 00:00:00";
+                        endDate = year + "-" + smallDateType + "-31 23:59:59";
+                        break;
+                }
+                statementDate = year + "年" + smallDateType + "月";
+                break;
+        }
+        map.put("beginDate",beginDate);
+        map.put("endDate",endDate);
+        map.put("statementDate",statementDate);
+        return map;
+    }
+
 
     /**
      * 部门级信息处理

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -3981,9 +3981,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	}
 
 	//公司级：报销报表详细
-	public Page<WorkContractInfo> findContractStatementPage(Page<WorkContractInfo> page, WorkContractInfo workContractInfo,String officeId,String bigDateType,String smallDateType,String contractRecordState) {
+	public Page<WorkContractInfo> findContractStatementPage(Page<WorkContractInfo> page, WorkContractInfo workContractInfo,String officeId,String bigDateType,String smallDateType,String contractRecordState,String year) {
 		//将获取的datetype转为需要的具体时间
-		Map<String,String> map = statementCompanyComprehensiveService.getDate(new Integer(bigDateType),new Integer(smallDateType));
+		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
 		String endDate = map.get("endDate");
 

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -2801,9 +2801,9 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 	}
 
 	//公司级：开票报表详细
-	public Page<WorkInvoice> findBillingReportPage(Page<WorkInvoice> page, WorkInvoice workInvoice,String officeId,String bigDateType,String smallDateType,String newlyAdded,String collectionThisMonth) {
+	public Page<WorkInvoice> findBillingReportPage(Page<WorkInvoice> page, WorkInvoice workInvoice,String officeId,String bigDateType,String smallDateType,String newlyAdded,String collectionThisMonth,String year) {
 		//将获取的datetype转为需要的具体时间
-		Map<String,String> map = statementCompanyComprehensiveService.getDate(new Integer(bigDateType),new Integer(smallDateType));
+		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
 		String endDate = map.get("endDate");
 

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -1532,10 +1532,10 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     }
 
     //公司级：报销报表详细
-    public Page<WorkReimbursement> findReimbursementReportPage(Page<WorkReimbursement> page, WorkReimbursement workReimbursement,String officeId,String bigDateType,String smallDateType) {
+    public Page<WorkReimbursement> findReimbursementReportPage(Page<WorkReimbursement> page, WorkReimbursement workReimbursement,String officeId,String bigDateType,String smallDateType,String year) {
         workReimbursement.getSqlMap().put("dsf", dataScopeFilter(workReimbursement.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_REIMBURSEMENT.getValue()));
         //将获取的datetype转为需要的具体时间
-        Map<String,String> map = statementCompanyComprehensiveService.getDate(new Integer(bigDateType),new Integer(smallDateType));
+        Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
         String beginDate = map.get("beginDate");
         String endDate = map.get("endDate");
 

src/main/webapp/webpage/modules/workinvoice/billingReportList.jsp

@@ -511,6 +511,7 @@
 				<input id="toflag" name="toflag" type="hidden" value="1"/>
 
 					<input id="officeIdd" name="officeIdd" type="hidden" value="${officeIdd}"/>
+					<input id="year" name="year" type="hidden" value="${year}"/>
 					<input id="bigDateType" name="bigDateType" type="hidden" value="${bigDateType}"/>
 					<input id="smallDateType" name="smallDateType" type="hidden" value="${smallDateType}"/>
 					<input id="newlyAdded" name="newlyAdded" type="hidden" value="${newlyAdded}"/>
@@ -681,9 +682,9 @@
 <%--							<table:exportExcel url="${ctx}/workinvoiceTwo/workinvoiceTwo/export"></table:exportExcel><!-- 导出按钮 -->--%>
 <%--						</shiro:hasPermission>--%>
 						<button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
-						<div class=" layui-btn-sm" style="float: right;width: 300px">
-							<span style="color: red">金额汇总(开票金额)：${sumMoney}(元)</span>
-						</div>
+<%--						<div class=" layui-btn-sm" style="float: right;width: 300px">--%>
+<%--							<span style="color: red">金额汇总(开票金额)：${sumMoney}(元)</span>--%>
+<%--						</div>--%>
 					</div>
 
 

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

@@ -884,28 +884,28 @@
 				,{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+"&grade=2','95%', '95%')\">" + d.field1 + "</a>";
+							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+"&grade=1','95%', '95%')\">" + d.field2 + "</a>";
+							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: '本${nyr}电子归档',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+"&recordState=5','95%', '95%')\">" + d.field3 + "</a>";
+							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: '本${nyr}上报',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+"&reportedState=5','95%', '95%')\">" + d.field4 + "</a>";
+							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>";
 						}
@@ -925,6 +925,7 @@
 				<c:if test="${index.index != 0}">,</c:if>
 				{
 					"id":"${reportFormList.id}"
+					,"year":"${reportFormList.year}"
 					,"officeId":"${reportFormList.officeId}"
 					,"bigDateType":"${reportFormList.bigDateType}"
 					,"smallDateType":"${reportFormList.smallDateType}"
@@ -956,7 +957,7 @@
 				,{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+"&newlyAdded=5','95%', '95%')\">" + d.field1 + "</a>";
+							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>";
 						}
@@ -964,7 +965,7 @@
 				,{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+"&collectionThisMonth=5','95%', '95%')\">" + d.field1 + "</a>";
+							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>";
 						}
@@ -977,6 +978,7 @@
 				<c:if test="${index.index != 0}">,</c:if>
 				{
 					"id":"${reportFormList.id}"
+					,"year":"${reportFormList.year}"
 					,"officeId":"${reportFormList.officeId}"
 					,"bigDateType":"${reportFormList.bigDateType}"
 					,"smallDateType":"${reportFormList.smallDateType}"
@@ -1004,7 +1006,7 @@
 				,{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+"','95%', '95%')\">" + d.field1 + "</a>";
+							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>";
 						}
@@ -1017,6 +1019,7 @@
 				<c:if test="${index.index != 0}">,</c:if>
 				{
 					"id":"${reportFormList.id}"
+					,"year":"${reportFormList.year}"
 					,"officeId":"${reportFormList.officeId}"
 					,"bigDateType":"${reportFormList.bigDateType}"
 					,"smallDateType":"${reportFormList.smallDateType}"
@@ -1042,14 +1045,14 @@
 				,{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+"','95%', '95%')\">" + d.field1 + "</a>";
+							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: '本${nyr}纸质归档',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+"&contractRecordState=5','95%', '95%')\">" + d.field2 + "</a>";
+							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>";
 						}
@@ -1066,6 +1069,7 @@
 				<c:if test="${index.index != 0}">,</c:if>
 				{
 					"id":"${reportFormList.id}"
+					,"year":"${reportFormList.year}"
 					,"officeId":"${reportFormList.officeId}"
 					,"bigDateType":"${reportFormList.bigDateType}"
 					,"smallDateType":"${reportFormList.smallDateType}"

src/main/webapp/webpage/modules/workcontractinfo/contractStatementList.jsp

@@ -547,6 +547,7 @@
 				<input id="toflag" name="toflag" type="hidden" value="1"/>
 
 				<input id="officeIdd" name="officeIdd" type="hidden" value="${officeIdd}"/>
+					<input id="year" name="year" type="hidden" value="${year}"/>
 				<input id="bigDateType" name="bigDateType" type="hidden" value="${bigDateType}"/>
 				<input id="smallDateType" name="smallDateType" type="hidden" value="${smallDateType}"/>
 

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

@@ -363,6 +363,7 @@
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
 
 					<input id="officeId" name="officeId" type="hidden" value="${officeId}"/>
+					<input id="year" name="year" type="hidden" value="${year}"/>
 					<input id="bigDateType" name="bigDateType" type="hidden" value="${bigDateType}"/>
 					<input id="smallDateType" name="smallDateType" type="hidden" value="${smallDateType}"/>
 					<input id="grade" name="grade" type="hidden" value="${grade}"/>

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

@@ -94,6 +94,7 @@
                     <input id="toflag" name="toflag" type="hidden" value="1"/>
 
                     <input id="officeIdd" name="officeIdd" type="hidden" value="${officeIdd}"/>
+                    <input id="year" name="year" type="hidden" value="${year}"/>
                     <input id="bigDateType" name="bigDateType" type="hidden" value="${bigDateType}"/>
                     <input id="smallDateType" name="smallDateType" type="hidden" value="${smallDateType}"/>