增加面积接口

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java

@@ -188,4 +188,9 @@ public class PasswordUtil {
 	}
 
 
+	public static void main(String[] args) {
+	String pass=	decrypt("fdce3e9f319ece7c","lcq","cLfYfAnM");
+		System.out.println(pass);
+	}
+
 }

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -143,7 +143,7 @@ spring:
 #          password: jeecgboot    
           validationQuery: select 1
           driver-class-name: org.postgresql.Driver
-          url: jdbc:postgresql://10.233.1.64:5432/zrzyqc
+          url: jdbc:postgresql://10.233.1.64:5432/zrzyqc_test
           username: postgres
           password: 660c1d95
           # url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai

jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -150,7 +150,7 @@ spring:
           #          password: jeecgboot
           validationQuery: select 1
           driver-class-name: org.postgresql.Driver
-          url: jdbc:postgresql://10.233.1.64:5432/zrzyqc
+          url: jdbc:postgresql://10.233.1.64:5432/zrzyqc_test
           username: postgres
           password: 660c1d95
           # 多数据源配置

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

@@ -596,21 +596,25 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         String yxdls = qcQyxxService.yxdls();
         String sbdks = null;
         String yhjs = 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();
                 break;
             } else {
                 yhjs = "sbyh";
                 sbdks = qcQyxxService.sbdks(username);
+                sbdkmj= qcQyxxService.sbdksMj(username);
             }
         }
-        System.out.println(rolesByUsername);
         list.add(selectqyxx);//下发任务数
         list.add(yxdls);//有效登录数
         list.add(sbdks);//上报地块数
         list.add(yhjs);//用戶角色
+        list.add(sbdkmj);//上报地块面积
+        System.out.println(rolesByUsername);
         return Result.OK(list);
     }
 
@@ -772,6 +776,8 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         String tgsh = qcQyxxService.tgsh(username);
         String cwth = qcQyxxService.cwth(username);
         String yhjs = null;
+        String shmj = qcQyxxService.shmj(username);
+        String shmj_not = qcQyxxService.shmj_not(username);
         for (String s : rolesByUsername) {
             if (s.equals("sbyh")) {
                 yhjs = "sbyh";
@@ -779,12 +785,19 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
                 yhjs = "shyh";
                 break;
             }
-
         }
-
+        if (shmj==null){
+            shmj="0";
+        }
+        if (shmj_not==null){
+            shmj_not="0";
+        }
         list.add(tgsh);
         list.add(cwth);
         list.add(yhjs);
+        list.add(shmj);  //审核通过
+        list.add(shmj_not); //审核不通过
+        System.out.println(list);
         return Result.OK(list);
     }
 
@@ -801,17 +814,26 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         ISysBaseAPI api = (ISysBaseAPI) SpringContextUtils.getBean("sysBaseApiImpl");
         String username = sysUser.getUsername();
         List<String> rolesByUsername = api.getRolesByUsername(sysUser.getUsername());
-        String wshsl = null;
+        String wshsl = "";
+        String wshslMJ = "";
         for (String s : rolesByUsername) {
             if (s.equals("shyh") || s.equals("gzw") || s.equals("xfzx") || s.equals("sjzh")) {
                 wshsl = qcQyxxService.wshslAdmin();
+                wshslMJ=qcQyxxService.wshslAdminMJ();
                 break;
             } else if (s.equals("sbyh") || s.equals("jgsbyh")) {
                 wshsl = qcQyxxService.wshsl(username);
+                wshslMJ=qcQyxxService.wshslMJ(username);
             }
         }
-
-        return Result.OK(wshsl);
+        //|
+        if (wshsl==null){
+            wshsl="0";
+        }
+        if (wshslMJ==null){
+            wshslMJ="0";
+        }
+        return Result.OK(wshsl+"|"+wshslMJ);
     }
 
     /**

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

@@ -21,7 +21,7 @@ public interface QcQyxxMapper extends BaseMapper<QcQyxx> {
     String sbdksAdmin();
 
     String sbdks(String name);
-
+    String sbdksMj(String name);
     String tgsh(String username);
 
     String wsh(String username);
@@ -31,6 +31,7 @@ public interface QcQyxxMapper extends BaseMapper<QcQyxx> {
     String dqsbs(String username);
 
     String cwth(String username);
+    String shmj(String username);
 
     String wshsl(String username);
 
@@ -86,4 +87,11 @@ public interface QcQyxxMapper extends BaseMapper<QcQyxx> {
 
     List<HashMap<String, Object>> yjdwhz(String xzqh);
 
-}
+    String sbdksMjAdmin();
+
+    String shmjNot(String username);
+
+    String wshslAdminMJ();
+
+    String wshslMJ(String username);
+}

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

@@ -21,12 +21,28 @@
         where sfsb > 0
           and sys_org_code like 'A04%'
     </select>
+    <!--    上报地块面积-->
+    <select id="sbdksMjAdmin" resultType="java.lang.String">
+        select sum(sjzytdmj) as sjmj
+        from qc_ssgqzysytdqk
+        where sfsb > 0
+          and sys_org_code like 'A04%'
+    </select>
+
     <select id="sbdks" resultType="String">
         select count(1) sbdk
         from qc_ssgqzysytdqk
         where sfsb > 0
           and create_by = #{username}
     </select>
+    <!--  面积-->
+    <select id="sbdksMj" resultType="java.lang.String">
+        select sum(sjzytdmj) as sjmj
+        from qc_ssgqzysytdqk
+        where sfsb > 0
+          and create_by = #{username}
+    </select>
+
     <select id="wsh" resultType="String" parameterType="String">
         select count(1) shzt
         from qc_ssgqzysytdqk
@@ -79,12 +95,35 @@
         where sfsb = 4
           and create_by = #{username}
     </select>
+    <!--    审核通过-->
+    <select id="shmj" resultType="java.lang.String">
+        select sum(sjzytdmj) as sjmj
+        from qc_ssgqzysytdqk
+        where shzt = '通过'
+          and create_by = #{username}
+    </select>
+    <!--    审核不通过-->
+    <select id="shmjNot" resultType="java.lang.String">
+        select sum(sjzytdmj) as sjmj
+        from qc_ssgqzysytdqk
+        where shzt = '不通过'
+          and create_by = #{username}
+    </select>
+<!--    已审核-->
     <select id="wshsl" resultType="String" parameterType="String">
         select count(1) sbdk
         from qc_ssgqzysytdqk
         where create_by = #{username}
           and sfsb in (1)
     </select>
+<!--  未审核  -->
+    <select id="wshslMJ" resultType="java.lang.String">
+        select sum(sjzytdmj) as sjmj
+        from qc_ssgqzysytdqk
+        where create_by = #{username}
+          and sfsb in (1)
+    </select>
+
     <!--sfsb 是否上报-->
     <select id="wshslAdmin" resultType="String" parameterType="String">
         select count(1) sbdk
@@ -92,6 +131,14 @@
         where sfsb = 1
           and sys_org_code like 'A04%'
     </select>
+    <select id="wshslAdminMJ" resultType="java.lang.String">
+        select sum(sjzytdmj) AS mj
+        from qc_ssgqzysytdqk
+        where sfsb = 1
+          and sys_org_code like 'A04%'
+    </select>
+
+
     <select id="shzsl" resultType="String" parameterType="String">
         select count(1) sbdk
         from qc_ssgqzysytdqk
@@ -242,7 +289,7 @@
     <select id="ssdkmj" resultType="map">
         select VA as "value", NA as "name", VA2 as "value2"
         from (
-                 select ROUND(sum(CAST(sjzytdmj_m AS DECIMAL(10,2))), 2) VA, b.SJXZQHMC na, b.SJXZQHDM xzqh
+                 select ROUND(sum(CAST(sjzytdmj_m AS DECIMAL(10, 2))), 2) VA, b.SJXZQHMC na, b.SJXZQHDM xzqh
                  from QC_SSGQZYSYTDQK a
                           LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                     on a.xzqh like b.SJXZQHDM || '%'
@@ -250,7 +297,7 @@
                    and sfsb = 3
                  GROUP BY b.SJXZQHDM, b.SJXZQHMC
              ) c
-                 LEFT JOIN (select ROUND(sum(CAST(sjzytdmj_m AS DECIMAL(10,2))), 2) VA2, b.SJXZQHDM as xzqh2
+                 LEFT JOIN (select ROUND(sum(CAST(sjzytdmj_m AS DECIMAL(10, 2))), 2) VA2, b.SJXZQHDM as xzqh2
                             from QC_SSGQZYSYTDQK a
                                      LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                                on a.xzqh like b.SJXZQHDM || '%'
@@ -263,7 +310,7 @@
     <select id="ssdkmjbyqx" resultType="map">
         select VA as "value", NA as "name", VA2 as "value2"
         from (
-                 select sum(CAST(sjzytdmj_m AS DECIMAL(10,2))) VA, b.XJXZQHMC na, b.XJXZQHDM xzqh, b.SJXZQHDM
+                 select sum(CAST(sjzytdmj_m AS DECIMAL(10, 2))) VA, b.XJXZQHMC na, b.XJXZQHDM xzqh, b.SJXZQHDM
                  from QC_SSGQZYSYTDQK a
                           LEFT JOIN (select * from XZQH) b
                                     on a.xzqh = b.XJXZQHDM
@@ -272,7 +319,7 @@
                    and xzqh like CONCAT(#{xzqh}, '%')
                  GROUP BY b.XJXZQHDM, b.XJXZQHMC, b.SJXZQHDM
              ) c
-                 LEFT JOIN (select sum(CAST(sjzytdmj_m AS DECIMAL(10,2))) VA2, b.XJXZQHDM as xzqh2
+                 LEFT JOIN (select sum(CAST(sjzytdmj_m AS DECIMAL(10, 2))) VA2, b.XJXZQHDM as xzqh2
                             from QC_SSGQZYSYTDQK a
                                      LEFT JOIN (select * from XZQH) b
                                                on a.xzqh = b.XJXZQHDM
@@ -341,5 +388,4 @@
 
     </select>
 
-
 </mapper>

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

@@ -21,8 +21,13 @@ public interface IQcQyxxService extends IService<QcQyxx> {
 
     String sbdksAdmin();
 
+    //上报地块面积,避免影响接口增加
+    String sbdksMjAdmin();
+
     String sbdks(String name);
 
+    String sbdksMj(String username);
+
     String tgsh(String name);
 
     String wsh(String name);
@@ -33,11 +38,18 @@ public interface IQcQyxxService extends IService<QcQyxx> {
 
     String cwth(String username);
 
+    //审核面积
+    String shmj(String username);
+
+    //    审核不通过
+    String shmj_not(String username);
+
     String wshsl(String username);
 
     String tgshAdmin();
 
     String wshAdmin();
+    String wshslAdminMJ();
 
     String btgshAdmin();
 
@@ -85,5 +97,5 @@ public interface IQcQyxxService extends IService<QcQyxx> {
 
     List<HashMap<String, Object>> szdkmjByqx(String xzqh);
 
-
+    String wshslMJ(String username);
 }

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

@@ -38,10 +38,20 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
     }
 
     @Override
+    public String sbdksMjAdmin() {
+        return qcQyxxMapper.sbdksMjAdmin();
+    }
+
+    @Override
     public String sbdks(String name) {
         return qcQyxxMapper.sbdks(name);
     }
 
+    @Override
+    public String sbdksMj(String username) {
+        return qcQyxxMapper.sbdksMj(username);
+    }
+
 
     @Override
     public String tgsh(String name) {
@@ -69,9 +79,23 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
     }
 
     @Override
+    public String shmj(String username) {
+        return qcQyxxMapper.shmj(username);
+    }
+
+    @Override
+    public String shmj_not(String username) {
+        return qcQyxxMapper.shmjNot(username);
+    }
+
+    @Override
     public String wshsl(String username) {
         return qcQyxxMapper.wshsl(username);
     }
+    @Override
+    public String wshslMJ(String username) {
+        return qcQyxxMapper.wshslMJ(username);
+    }
 
     @Override
     public String tgshAdmin() {
@@ -83,6 +107,7 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
         return qcQyxxMapper.wshAdmin();
     }
 
+
     @Override
     public String btgshAdmin() {
         return qcQyxxMapper.btgshAdmin();
@@ -92,6 +117,11 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
     public String wshslAdmin() {
         return qcQyxxMapper.wshslAdmin();
     }
+    @Override
+    public String wshslAdminMJ() {
+        return qcQyxxMapper.wshslAdminMJ();
+    }
+
 
     @Override
     public String shzsl(String username) {
@@ -200,4 +230,6 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
     }
 
 
+
+
 }