1. 增加年份条件

2. 增加省直面积,未审核面积

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/controller/QcSsgqzysytdqkController.java

@@ -157,13 +157,16 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
 
     @ApiOperation(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询", notes = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
     @GetMapping(value = "/listBygly")
-    public Result<IPage<QcSsgqzysytdqk>> queryPageListBygly(QcSsgqzysytdqk qcSsgqzysytdqk,
+    public Result<IPage<QcSsgqzysytdqk>> queryPageListBygly(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                             HttpServletRequest req) {
         QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
         queryWrapper.likeRight("sys_org_code", "A04");
         queryWrapper.gt("sfsb", 0);
+        if (year!=null){
+            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+        }
         Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
         IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -171,13 +174,16 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
 
     @ApiOperation(value = "省属国企占有使用土地情况调查-已上报待审核分页列表查询", notes = "省属国企占有使用土地情况调查-已上报待审核分页列表查询")
     @GetMapping(value = "/listByglyy")
-    public Result<IPage<QcSsgqzysytdqk>> queryPageListBygly2(QcSsgqzysytdqk qcSsgqzysytdqk,
+    public Result<IPage<QcSsgqzysytdqk>> queryPageListBygly2(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                              HttpServletRequest req) {
         QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
         queryWrapper.likeRight("sys_org_code", "A03");
         queryWrapper.gt("sfsb", 0);
+        if (year!=null){
+            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+        }
         Page<QcSsgqzysytdqk> page = new Page<QcSsgqzysytdqk>(pageNo, pageSize);
         IPage<QcSsgqzysytdqk> pageList = qcSsgqzysytdqkService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -304,7 +310,7 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
     //@AutoLog(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
     @ApiOperation(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询", notes = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
     @GetMapping(value = "/list2")
-    public Result<IPage<QcSsgqzysytdqk>> queryPageList2(QcSsgqzysytdqk qcSsgqzysytdqk,
+    public Result<IPage<QcSsgqzysytdqk>> queryPageList2(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                         HttpServletRequest req) {
@@ -315,6 +321,9 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
         sbzts.add(4);
         queryWrapper.in("sfsb", sbzts);
         queryWrapper.likeRight("sys_org_code", "A04");
+        if (year!=null){
+            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+        }
         if (qcSsgqzysytdqk.getShzt() != null) {
             queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
         }
@@ -415,7 +424,7 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
     //@AutoLog(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
     @ApiOperation(value = "省属国企占有使用土地情况调查-所有已经审核分页列表查询", notes = "省属国企占有使用土地情况调查-所有已经审核分页列表查询")
     @GetMapping(value = "/list7")
-    public Result<IPage<QcSsgqzysytdqk>> queryPageList7(QcSsgqzysytdqk qcSsgqzysytdqk,
+    public Result<IPage<QcSsgqzysytdqk>> queryPageList7(QcSsgqzysytdqk qcSsgqzysytdqk,String year,
                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                         HttpServletRequest req) {
@@ -426,6 +435,9 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
         sbzts.add(4);
         queryWrapper.in("sfsb", sbzts);
         queryWrapper.likeRight("sys_org_code", "A03");
+        if (year!=null){
+            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+        }
         if (qcSsgqzysytdqk.getShzt() != null) {
             queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
         }
@@ -904,14 +916,18 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
     @RateLimiter(permitRate = 0.1, timeout = 5, timeUnit = TimeUnit.SECONDS)
     @RequestMapping(value = "/exportXls")
     @PermissionData(pageComponent = "qcsb/QcSsgqzysytdqkList")
-    public ModelAndView exportXls(HttpServletRequest request, QcSsgqzysytdqk qcSsgqzysytdqk) {
+    public ModelAndView exportXls(HttpServletRequest request, QcSsgqzysytdqk qcSsgqzysytdqk,String year) {
 
         // Step.1 组装查询条件
         QueryWrapper<QcSsgqzysytdqk> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, request.getParameterMap());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
+        queryWrapper.likeRight("sys_org_code", "A04");
+        if (year!=null){
+            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+        }
         // Step.2 获取导出数据
-        List<QcSsgqzysytdqk> pageList = service.list(queryWrapper.likeRight("sys_org_code", "A04"));
+        List<QcSsgqzysytdqk> pageList = service.list(queryWrapper);
         List<QcSsgqzysytdqk> exportList = null;
 
         // 过滤选中数据
@@ -991,7 +1007,7 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
      */
     @RequestMapping(value = "/exportXls3")
     @PermissionData(pageComponent = "sydwqcsb/QcSsgqzysytdqkList")
-    public ModelAndView exportXls3(HttpServletRequest request, QcSsgqzysytdqk1 qcSsgqzysytdqk) {
+    public ModelAndView exportXls3(HttpServletRequest request, QcSsgqzysytdqk1 qcSsgqzysytdqk,String year) {
         // Step.1 组装查询条件
         QueryWrapper<QcSsgqzysytdqk1> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, request.getParameterMap());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -999,6 +1015,9 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
         // Step.2 获取导出数据
         queryWrapper.likeRight("sys_org_code", "A03");
         queryWrapper.gt("sfsb", 0);
+        if (year!=null){
+            queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+        }
         List<QcSsgqzysytdqk1> pageList = qcSsgqzysytdqkService1.list(queryWrapper);
         List<QcSsgqzysytdqk1> exportList = null;
 

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/controller/QcQyxxController.java

@@ -63,6 +63,19 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
 
+    /**
+     * 查询添加的年份列表,倒叙
+     *
+     * @param sugb
+     * @return 年份数组
+     */
+    @AutoLog(value = "查询入库的年份组合")
+    @ApiOperation(value = "查询入库的年份组合", notes = "查询入库的年份组合")
+    @GetMapping(value = "/queryYears")
+    public Result<List<String>> queryYears() {
+        List years = qcQyxxService.queryYears();
+        return Result.OK(years);
+    }
 
     /**
      * 分页列表查询
@@ -596,17 +609,17 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         String yxdls = qcQyxxService.yxdls();
         String sbdks = null;
         String yhjs = null;
-        String sbdkmj=null; //上报地块面积
+        String sbdkmj = null; //上报地块面积
         for (String s : rolesByUsername) {
             if (s.equals("shyh") || s.equals("gzw") || s.equals("xfzx") || s.equals("sjzh")) {
                 yhjs = "shyh";
                 sbdks = qcQyxxService.sbdksAdmin();
-                sbdkmj= qcQyxxService.sbdksMjAdmin();
+                sbdkmj = qcQyxxService.sbdksMjAdmin();
                 break;
             } else {
                 yhjs = "sbyh";
                 sbdks = qcQyxxService.sbdks(username);
-                sbdkmj= qcQyxxService.sbdksMj(username);
+                sbdkmj = qcQyxxService.sbdksMj(username);
             }
         }
         list.add(selectqyxx);//下发任务数
@@ -636,11 +649,15 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         String sbdks = null;
         String yhjs = null;
         String wsh = null;
+        String szsbMj = null;
+        String szwshMj = null;
         for (String s : rolesByUsername) {
             if (s.equals("shyh") || s.equals("gzw") || s.equals("xfzx") || s.equals("sjzh")) {
                 yhjs = "shyh";
                 sbdks = qcQyxxService.sydwsbdksAdmin();
                 wsh = qcQyxxService.sydwwshAdmin();
+                szsbMj = qcQyxxService.sydwwshAdminMj();
+                szwshMj = qcQyxxService.sydwwshAdminWshMj();
                 break;
             }
         }
@@ -650,6 +667,8 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         list.add(sbdks);//上报地块数
         list.add(wsh);//未审核
         list.add(yhjs);//用戶角色
+        list.add(szsbMj);//省直上报面积
+        list.add(szwshMj);//省直未审核面积
         return Result.OK(list);
     }
 
@@ -786,11 +805,11 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
                 break;
             }
         }
-        if (shmj==null){
-            shmj="0";
+        if (shmj == null) {
+            shmj = "0";
         }
-        if (shmj_not==null){
-            shmj_not="0";
+        if (shmj_not == null) {
+            shmj_not = "0";
         }
         list.add(tgsh);
         list.add(cwth);
@@ -819,21 +838,21 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         for (String s : rolesByUsername) {
             if (s.equals("shyh") || s.equals("gzw") || s.equals("xfzx") || s.equals("sjzh")) {
                 wshsl = qcQyxxService.wshslAdmin();
-                wshslMJ=qcQyxxService.wshslAdminMJ();
+                wshslMJ = qcQyxxService.wshslAdminMJ();
                 break;
             } else if (s.equals("sbyh") || s.equals("jgsbyh")) {
                 wshsl = qcQyxxService.wshsl(username);
-                wshslMJ=qcQyxxService.wshslMJ(username);
+                wshslMJ = qcQyxxService.wshslMJ(username);
             }
         }
         //|
-        if (wshsl==null){
-            wshsl="0";
+        if (wshsl == null) {
+            wshsl = "0";
         }
-        if (wshslMJ==null){
-            wshslMJ="0";
+        if (wshslMJ == null) {
+            wshslMJ = "0";
         }
-        return Result.OK(wshsl+"|"+wshslMJ);
+        return Result.OK(wshsl + "|" + wshslMJ);
     }
 
     /**

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/mapper/QcQyxxMapper.java

@@ -94,4 +94,10 @@ public interface QcQyxxMapper extends BaseMapper<QcQyxx> {
     String wshslAdminMJ();
 
     String wshslMJ(String username);
+
+    String sydwsbdksAdminMj();
+
+    String sydwwshAdminWshMj();
+
+    List<String> queryYears();
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/mapper/xml/QcQyxxMapper.xml

@@ -190,7 +190,20 @@
         where sfsb > 0
           and sys_org_code like 'A03%'
     </select>
+    <!--省直上报面积-->
+    <select id="sydwsbdksAdminMj" resultType="java.lang.String">
+        select sum(sjzytdmj) as sjmj
+        from qc_ssgqzysytdqk
+        where sfsb > 0
+          and sys_org_code like 'A03%'
+    </select>
 
+    <select id="sydwwshAdminWshMj" resultType="java.lang.String">
+        select sum(sjzytdmj) as sjmj
+        from qc_ssgqzysytdqk
+        where shzt='未审核'
+          and sys_org_code like 'A03%'
+    </select>
 
     <!--饼图-->
     <select id="sydwtgshAdmin" resultType="String">
@@ -387,5 +400,15 @@
         GROUP BY a.depart_name
 
     </select>
-
+    <!--查询入库的年份-->
+    <select id="queryYears" resultType="java.lang.String">
+        SELECT
+            TO_CHAR( create_time, 'YYYY' ) AS YEAR
+        FROM
+            qc_ssgqzysytdqk
+        GROUP BY
+            YEAR
+        ORDER BY
+            YEAR DESC
+    </select>
 </mapper>

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/service/IQcQyxxService.java

@@ -98,4 +98,10 @@ public interface IQcQyxxService extends IService<QcQyxx> {
     List<HashMap<String, Object>> szdkmjByqx(String xzqh);
 
     String wshslMJ(String username);
+
+    String sydwwshAdminMj();
+
+    String sydwwshAdminWshMj();
+    /*查询年份*/
+    List<String> queryYears();
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/service/impl/QcQyxxServiceImpl.java

@@ -92,11 +92,13 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
     public String wshsl(String username) {
         return qcQyxxMapper.wshsl(username);
     }
+
     @Override
     public String wshslMJ(String username) {
         return qcQyxxMapper.wshslMJ(username);
     }
 
+
     @Override
     public String tgshAdmin() {
         return qcQyxxMapper.tgshAdmin();
@@ -117,6 +119,7 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
     public String wshslAdmin() {
         return qcQyxxMapper.wshslAdmin();
     }
+
     @Override
     public String wshslAdminMJ() {
         return qcQyxxMapper.wshslAdminMJ();
@@ -158,11 +161,29 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
         return qcQyxxMapper.sydwyxdls();
     }
 
+    /**/
     @Override
     public String sydwsbdksAdmin() {
         return qcQyxxMapper.sydwsbdksAdmin();
     }
 
+    /*省直上报面积*/
+    @Override
+    public String sydwwshAdminMj() {
+        return qcQyxxMapper.sydwsbdksAdminMj();
+    }
+
+    /*未审核*/
+    @Override
+    public String sydwwshAdminWshMj() {
+        return qcQyxxMapper.sydwwshAdminWshMj();
+    }
+
+    @Override
+    public List<String> queryYears() {
+        return qcQyxxMapper.queryYears();
+    }
+
     @Override
     public String sydwtgshAdmin() {
         return qcQyxxMapper.sydwtgshAdmin();
@@ -230,6 +251,4 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
     }
 
 
-
-
 }