公司级查询代码修改

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

@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping(value = "${adminPath}/statement/StatementCompanyComprehensive")
@@ -62,21 +63,13 @@ public class StatementCompanyComprehensiveController extends BaseController {
     @RequestMapping(value = "list")
     public String list(Model model){
 
-        //表的抬头，标题
-        String taiTou1 = "";
-        String taiTou2 = "";
-        String taiTou3 = "";
-        String taiTou4 = "";
         //这个会改，由它处传参
-        String nyr = "2";//实际是他处传的参数  （0：年；1：季度；2：月份）
-
-        StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo = new StatementCompanyComprehensiveInfo();
-
-        //状态1  传过来的
-        statementCompanyComprehensiveInfo.setBigDateType(nyr);
-
+        String year = "2022";//实际是他处传的参数  （0：年；1：季度；2：月份）
+        String bigDateType = "2";//实际是他处传的参数  （0：年；1：季度；2：月份）
+        String smallDateType = "1";//实际是他处传的参数  （0：年；1：季度；2：月份）
+        String nyr = "";
         //根据传的参数：nyr进行匹配 方便传到前端显示
-        switch (nyr){
+        switch (bigDateType){
             case "0":
                 nyr = "年";
                 break;
@@ -88,126 +81,11 @@ public class StatementCompanyComprehensiveController extends BaseController {
                 break;
             default:break;
         }
-        taiTou1 = "项目"+nyr+"报";
-        taiTou2 = "开票"+nyr+"报";
-        taiTou3 = "报销"+nyr+"报";
-        taiTou4 = "合同"+nyr+"报";
-
-        //公司级：项目报表总览
-        //type:类型（1：项目；2：开票；3：报销；4：合同）
-        statementCompanyComprehensiveInfo.setType("1");
-        List<StatementCompanyComprehensiveInfo> reportFormList1 = statementCompanyComprehensiveService.selectAllByType(statementCompanyComprehensiveInfo);
-        //项目表 各列合计
-        String xmnum1 = "0";
-        String xmnum2 = "0";
-        String xmnum3 = "0";
-        String xmnum4 = "0";
-        String xmnum5 = "0";
-        String xmnum6 = "0";
-        String xmnum7 = "0";
-        String xmnum8 = "0";
-        for(StatementCompanyComprehensiveInfo info:reportFormList1){
-            //转BigDecimal 处理   合计
-            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();
-            xmnum5 = new BigDecimal(info.getField5()).add(new BigDecimal(xmnum5)).toString();
-            xmnum6 = new BigDecimal(info.getField6()).add(new BigDecimal(xmnum6)).toString();
-            xmnum7 = new BigDecimal(info.getField7()).add(new BigDecimal(xmnum7)).toString();
-            xmnum8 = new BigDecimal(info.getField8()).add(new BigDecimal(xmnum8)).toString();
-        }
-        //存放到对应报表的list集合，方便页面集合展示
-        StatementCompanyComprehensiveInfo xminfo = new StatementCompanyComprehensiveInfo();
-        xminfo.setOfficeName("本"+nyr+"合计");
-        xminfo.setField1(xmnum1);
-        xminfo.setField2(xmnum2);
-        xminfo.setField3(xmnum3);
-        xminfo.setField4(xmnum4);
-        xminfo.setField5(xmnum5);
-        xminfo.setField6(xmnum6);
-        xminfo.setField7(xmnum7);
-        xminfo.setField8(xmnum8);
-        reportFormList1.add(xminfo);
-
-        //公司级：开票报表
-        //类型（1：项目；2：开票；3：报销；4：合同）
-        statementCompanyComprehensiveInfo.setType("2");
-        List<StatementCompanyComprehensiveInfo> reportFormList2 = statementCompanyComprehensiveService.selectAllByType(statementCompanyComprehensiveInfo);
-        //各列合计
-        String kpnum1 = "0";
-        String kpnum2 = "0";
-        String kpnum3 = "0";
-        String kpnum4 = "0";
-        for(StatementCompanyComprehensiveInfo info:reportFormList2){
-            //转BigDecimal 处理
-            kpnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(kpnum1)).toString();
-            kpnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(kpnum2)).toString();
-            kpnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(kpnum3)).toString();
-            kpnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(kpnum4)).toString();
-        }
-        //存放到对应报表的list集合，方便页面集合展示
-        StatementCompanyComprehensiveInfo kpinfo = new StatementCompanyComprehensiveInfo();
-        kpinfo.setOfficeName("本"+nyr+"合计");
-        kpinfo.setField1(kpnum1);
-        kpinfo.setField2(kpnum2);
-        kpinfo.setField3(kpnum3);
-        kpinfo.setField4(kpnum4);
-        reportFormList2.add(kpinfo);
-
-        //公司级：报销报表
-        //类型（1：项目；2：开票；3：报销；4：合同）
-        statementCompanyComprehensiveInfo.setType("3");
-        List<StatementCompanyComprehensiveInfo> reportFormList3 = statementCompanyComprehensiveService.selectAllByType(statementCompanyComprehensiveInfo);
-        //合计
-        String bxnum1 = "0";
-        String bxnum2 = "0";
-        for(StatementCompanyComprehensiveInfo info:reportFormList3){
-            //转BigDecimal 处理
-            bxnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(bxnum1)).toString();
-            bxnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(bxnum2)).toString();
-        }
-        //存放到对应报表的list集合，方便页面集合展示
-        StatementCompanyComprehensiveInfo bxinfo = new StatementCompanyComprehensiveInfo();
-        bxinfo.setOfficeName("本"+nyr+"合计");
-        bxinfo.setField1(bxnum1);
-        bxinfo.setField2(bxnum2);
-        reportFormList3.add(bxinfo);
-
-        //公司级：合同报表
-        //类型（1：项目；2：开票；3：报销；4：合同）
-        statementCompanyComprehensiveInfo.setType("4");
-        List<StatementCompanyComprehensiveInfo> reportFormList4= statementCompanyComprehensiveService.selectAllByType(statementCompanyComprehensiveInfo);
-        //合计
-        String htnum1 = "0";
-        String htnum2 = "0";
-        String htnum3 = "0";
-        String htnum4 = "0";
-        for(StatementCompanyComprehensiveInfo info:reportFormList4){
-            //转BigDecimal 处理
-            htnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(htnum1)).toString();
-            htnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(htnum2)).toString();
-            htnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(htnum3)).toString();
-            htnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(htnum4)).toString();
-        }
-        //存放到对应报表的list集合，方便页面集合展示
-        StatementCompanyComprehensiveInfo htinfo = new StatementCompanyComprehensiveInfo();
-        htinfo.setOfficeName("本"+nyr+"合计");
-        htinfo.setField1(htnum1);
-        htinfo.setField2(htnum2);
-        htinfo.setField3(htnum3);
-        htinfo.setField4(htnum4);
-        reportFormList4.add(htinfo);
-
-
-        model.addAttribute("reportFormList1",reportFormList1);//项目报表
-        model.addAttribute("reportFormList2",reportFormList2);//开票报表
-        model.addAttribute("reportFormList3",reportFormList3);//报销报表
-        model.addAttribute("reportFormList4",reportFormList4);//合同报表
-        model.addAttribute("taiTou1",taiTou1);//项目报表抬头
-        model.addAttribute("taiTou2",taiTou2);//开票报表抬头
-        model.addAttribute("taiTou3",taiTou3);//报销报表抬头
-        model.addAttribute("taiTou4",taiTou4);//合同报表抬头
+        Map<String, List<StatementCompanyComprehensiveInfo>> stringListMap = statementCompanyComprehensiveService.viewList(year,bigDateType,smallDateType);
+        model.addAttribute("reportFormList1",stringListMap.get("reportFormList1"));//项目报表
+        model.addAttribute("reportFormList2",stringListMap.get("reportFormList2"));//开票报表
+        model.addAttribute("reportFormList3",stringListMap.get("reportFormList3"));//报销报表
+        model.addAttribute("reportFormList4",stringListMap.get("reportFormList4"));//合同报表
         model.addAttribute("nyr",nyr);
 
         return "modules/ruralprojectrecords/cost/reportForm";

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

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -29,6 +30,150 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
     private WorkProjectNotifyService workProjectNotifyService;
 
     /**
+     *
+     * @param year 年份
+     * @param bigDateType 状态1（0：年；1：季度；2：月份）
+     * @param smallDateType 状态2（针对状态1进行精确所在指定季度或者月份）
+     * @return
+     */
+    public Map<String,List<StatementCompanyComprehensiveInfo>> viewList(String year,String bigDateType,String smallDateType){
+        Map<String,List<StatementCompanyComprehensiveInfo>> map = new HashMap<>();
+        StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo = new StatementCompanyComprehensiveInfo();
+
+        //状态1  传过来的
+        statementCompanyComprehensiveInfo.setBigDateType(bigDateType);
+        statementCompanyComprehensiveInfo.setSmallDateType(smallDateType);
+        statementCompanyComprehensiveInfo.setYear(year);
+        String nyr = "";
+        //根据传的参数：nyr进行匹配 方便传到前端显示
+        switch (bigDateType){
+            case "0":
+                nyr = "年";
+                break;
+            case "1":
+                nyr ="季";
+                break;
+            case "2":
+                nyr ="月";
+                break;
+            default:break;
+        }
+
+        //公司级：项目报表总览
+        //type:类型（1：项目；2：开票；3：报销；4：合同）
+        statementCompanyComprehensiveInfo.setType("1");
+        List<StatementCompanyComprehensiveInfo> reportFormList1 = this.selectAllByType(statementCompanyComprehensiveInfo);
+        //项目表 各列合计
+        String xmnum1 = "0";
+        String xmnum2 = "0";
+        String xmnum3 = "0";
+        String xmnum4 = "0";
+        String xmnum5 = "0";
+        String xmnum6 = "0";
+        String xmnum7 = "0";
+        String xmnum8 = "0";
+        for(StatementCompanyComprehensiveInfo info:reportFormList1){
+            //转BigDecimal 处理   合计
+            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();
+            xmnum5 = new BigDecimal(info.getField5()).add(new BigDecimal(xmnum5)).toString();
+            xmnum6 = new BigDecimal(info.getField6()).add(new BigDecimal(xmnum6)).toString();
+            xmnum7 = new BigDecimal(info.getField7()).add(new BigDecimal(xmnum7)).toString();
+            xmnum8 = new BigDecimal(info.getField8()).add(new BigDecimal(xmnum8)).toString();
+        }
+        //存放到对应报表的list集合，方便页面集合展示
+        StatementCompanyComprehensiveInfo xminfo = new StatementCompanyComprehensiveInfo();
+        xminfo.setOfficeName("本"+nyr+"合计");
+        xminfo.setField1(xmnum1);
+        xminfo.setField2(xmnum2);
+        xminfo.setField3(xmnum3);
+        xminfo.setField4(xmnum4);
+        xminfo.setField5(xmnum5);
+        xminfo.setField6(xmnum6);
+        xminfo.setField7(xmnum7);
+        xminfo.setField8(xmnum8);
+        reportFormList1.add(xminfo);
+
+        //公司级：开票报表
+        //类型（1：项目；2：开票；3：报销；4：合同）
+        statementCompanyComprehensiveInfo.setType("2");
+        List<StatementCompanyComprehensiveInfo> reportFormList2 = this.selectAllByType(statementCompanyComprehensiveInfo);
+        //各列合计
+        String kpnum1 = "0";
+        String kpnum2 = "0";
+        String kpnum3 = "0";
+        String kpnum4 = "0";
+        for(StatementCompanyComprehensiveInfo info:reportFormList2){
+            //转BigDecimal 处理
+            kpnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(kpnum1)).toString();
+            kpnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(kpnum2)).toString();
+            kpnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(kpnum3)).toString();
+            kpnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(kpnum4)).toString();
+        }
+        //存放到对应报表的list集合，方便页面集合展示
+        StatementCompanyComprehensiveInfo kpinfo = new StatementCompanyComprehensiveInfo();
+        kpinfo.setOfficeName("本"+nyr+"合计");
+        kpinfo.setField1(kpnum1);
+        kpinfo.setField2(kpnum2);
+        kpinfo.setField3(kpnum3);
+        kpinfo.setField4(kpnum4);
+        reportFormList2.add(kpinfo);
+
+        //公司级：报销报表
+        //类型（1：项目；2：开票；3：报销；4：合同）
+        statementCompanyComprehensiveInfo.setType("3");
+        List<StatementCompanyComprehensiveInfo> reportFormList3 = this.selectAllByType(statementCompanyComprehensiveInfo);
+        //合计
+        String bxnum1 = "0";
+        String bxnum2 = "0";
+        for(StatementCompanyComprehensiveInfo info:reportFormList3){
+            //转BigDecimal 处理
+            bxnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(bxnum1)).toString();
+            bxnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(bxnum2)).toString();
+        }
+        //存放到对应报表的list集合，方便页面集合展示
+        StatementCompanyComprehensiveInfo bxinfo = new StatementCompanyComprehensiveInfo();
+        bxinfo.setOfficeName("本"+nyr+"合计");
+        bxinfo.setField1(bxnum1);
+        bxinfo.setField2(bxnum2);
+        reportFormList3.add(bxinfo);
+
+        //公司级：合同报表
+        //类型（1：项目；2：开票；3：报销；4：合同）
+        statementCompanyComprehensiveInfo.setType("4");
+        List<StatementCompanyComprehensiveInfo> reportFormList4= this.selectAllByType(statementCompanyComprehensiveInfo);
+        //合计
+        String htnum1 = "0";
+        String htnum2 = "0";
+        String htnum3 = "0";
+        String htnum4 = "0";
+        for(StatementCompanyComprehensiveInfo info:reportFormList4){
+            //转BigDecimal 处理
+            htnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(htnum1)).toString();
+            htnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(htnum2)).toString();
+            htnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(htnum3)).toString();
+            htnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(htnum4)).toString();
+        }
+        //存放到对应报表的list集合，方便页面集合展示
+        StatementCompanyComprehensiveInfo htinfo = new StatementCompanyComprehensiveInfo();
+        htinfo.setOfficeName("本"+nyr+"合计");
+        htinfo.setField1(htnum1);
+        htinfo.setField2(htnum2);
+        htinfo.setField3(htnum3);
+        htinfo.setField4(htnum4);
+        reportFormList4.add(htinfo);
+        map.put("reportFormList1",reportFormList1);
+        map.put("reportFormList2",reportFormList2);
+        map.put("reportFormList3",reportFormList3);
+        map.put("reportFormList4",reportFormList4);
+        return map;
+    }
+
+
+
+    /**
      * 公司级信息处理
      * @param bigDateType 状态1（0：年；1：季度；2：月份）
      * @param smallDateType 状态2（针对状态1进行精确所在指定季度或者月份）

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

@@ -708,6 +708,13 @@
 	</select>
 
 	<select id="selectAllByType" parameterType="StatementCompanyComprehensiveInfo" resultType="StatementCompanyComprehensiveInfo">
-		select *,(select name from sys_office where id = office_id) officeName from statement_company_comprehensive_info where type = #{type} and del_flag = 0 and big_date_type = #{bigDateType}
+		select *,
+		(select name from sys_office where id = office_id) officeName
+		from statement_company_comprehensive_info
+		where type = #{type}
+		and del_flag = 0
+		and big_date_type = #{bigDateType}
+		and year = #{year}
+		and small_date_type = #{smallDateType}
 	</select>
 </mapper>

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

@@ -805,19 +805,19 @@
 				</div>
 
 				<%--项目报表--%>
-				<div><b>${taiTou1}</b></div>
+				<div><b>项目${nyr}报</b></div>
 				<table class="oa-table layui-table" id="contentTable1" lay-filter="test"></table>
 
 				<%--开票报表--%>
-				<div><b>${taiTou2}</b></div>
+				<div><b>开票${nyr}报</b></div>
 				<table class="oa-table layui-table" id="contentTable2" lay-filter="test"></table>
 
 				<%--报销报表--%>
-				<div><b>${taiTou3}</b></div>
+				<div><b>报销${nyr}报</b></div>
 				<table class="oa-table layui-table" id="contentTable3" lay-filter="test"></table>
 
 				<%--合同报表--%>
-				<div><b>${taiTou4}</b></div>
+				<div><b>合同${nyr}报</b></div>
 				<table class="oa-table layui-table" id="contentTable4" lay-filter="test"></table>
 
 
@@ -1093,4 +1093,4 @@
     });
 </script>
 </body>
-</html>
+</html>