Redeem 1 周之前
父节点
当前提交
07c97fb8cc
共有 2 个文件被更改,包括 36 次插入27 次删除
  1. 24 24
      pom.xml
  2. 12 3
      src/main/java/com/steerinfo/baseinfo/meterbasemattermap/mapper/MeterBaseMatterMapMapper.xml

+ 24 - 24
pom.xml

@@ -70,30 +70,30 @@
             <!-- 配置文件模版位置在 generator-maven-plugin-3.0.jar 包的主目录下 -->
             <!--<xmlProject>${project.basedir}\src\main\resources\generatorConfig.xml</xmlProject>-->
             <!-- 表生成model默认生成驼峰式:sys_user->SysUser,如果需要生成其它名字可以用逗号分隔:sys_user,User -->
-            <plugin>
-                <groupId>com.steerinfo</groupId>
-                <artifactId>generator-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <connUrl>jdbc:oracle:thin:@10.99.200.87:1521/jgwzjl</connUrl>
-                    <targetPackage>com.steerinfo.baseinfo</targetPackage>
-                    <user>lims</user>
-                    <password>lims_2021</password>
-                    <tables>
-                        <params>METER_REPORT_WIDE</params>
-                        <params>METER_BASE_MATTER_MAP_OUT</params>
-                        <params>TRUCK_TARE_CHECK_WIDE</params>
-                    </tables>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>steerinfo</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>com.steerinfo</groupId>-->
+<!--                <artifactId>generator-maven-plugin</artifactId>-->
+<!--                <version>3.0</version>-->
+<!--                <configuration>-->
+<!--                    <connUrl>jdbc:oracle:thin:@10.99.200.87:1521/jgwzjl</connUrl>-->
+<!--                    <targetPackage>com.steerinfo.baseinfo</targetPackage>-->
+<!--                    <user>lims</user>-->
+<!--                    <password>lims_2021</password>-->
+<!--                    <tables>-->
+<!--                        <params>METER_REPORT_WIDE</params>-->
+<!--                        <params>METER_BASE_MATTER_MAP_OUT</params>-->
+<!--                        <params>TRUCK_TARE_CHECK_WIDE</params>-->
+<!--                    </tables>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <phase>compile</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>steerinfo</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

+ 12 - 3
src/main/java/com/steerinfo/baseinfo/meterbasemattermap/mapper/MeterBaseMatterMapMapper.xml

@@ -206,8 +206,17 @@
     </foreach>
   </update>
   <select id="selectMatterMap" resultType="java.lang.Integer">
-    SELECT COUNT(*) FROM METER_BASE_MATTER_MAP_OUT where MAATER_NO1 = #{matterNo1}
-    AND MAATER_NO2 = #{matterNo2}
-    AND VALUE_FLAG = '1'
+    SELECT
+      (SELECT COUNT(*) FROM METER_BASE_MATTER_MAP_OUT
+       WHERE MAATER_NO1 = #{matterNo1}
+         AND MAATER_NO2 = #{matterNo2}
+         AND VALUE_FLAG = '1')
+        +
+      (SELECT COUNT(*) FROM METER_BASE_MATTER_MAP_OUT
+       WHERE MAATER_NO1 = #{matterNo2}
+         AND MAATER_NO2 = #{matterNo1}
+         AND VALUE_FLAG = '1')
+        AS total
+    FROM DUAL
   </select>
 </mapper>