Browse Source

应收明细查询条件修改

dingyl 6 years ago
parent
commit
dbcd71f009

+ 2 - 3
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java

@@ -188,8 +188,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         //计算期间金额
         Statsinfo statsinfo = new Statsinfo();
         List<Integer> ymList = othreceiptsdetailMapper.selectYm(Math.toIntExact(id));
-        Integer ym = ymList.indexOf(0);
-        System.out.println("ym:"+ym);
+        Integer ym = ymList.get(0);
         statsinfo.setCompanyid(companyId);
         Integer yms = statsinfoMapper.select(ym, companyId);
         statsinfo.setSi_yearmonth(Double.valueOf(ym));
@@ -275,7 +274,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         //计算期间金额
         Statsinfo statsinfo = new Statsinfo();
         List<Integer> ymList = othreceiptsdetailMapper.selectYm(id);
-        Integer ym = ymList.indexOf(0);
+        Integer ym = ymList.get(0);
         statsinfo.setCompanyid(BaseContextHolder.getCompanyId());
         Integer yms = statsinfoMapper.select(ym, BaseContextHolder.getCompanyId());
         statsinfo.setSi_yearmonth(Double.valueOf(ym));

+ 2 - 4
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthspendingsServiceImpl.java

@@ -227,8 +227,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         //计算期间金额
         Statsinfo statsinfo = new Statsinfo();
         List<Integer> ymList = othspendingsdetailMapper.selectYm(Math.toIntExact(id));
-        Integer ym = ymList.indexOf(0);
-        System.out.println("ym:"+ym);
+        Integer ym = ymList.get(0);
         statsinfo.setCompanyid(BaseContextHolder.getCompanyId());
         Integer yms = statsinfoMapper.select(ym, BaseContextHolder.getCompanyId());
         statsinfo.setSi_yearmonth(Double.valueOf(ym));
@@ -309,8 +308,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         //计算期间金额
         Statsinfo statsinfo = new Statsinfo();
         List<Integer> ymList = othspendingsdetailMapper.selectYm(id);
-        Integer ym = ymList.indexOf(0);
-        System.out.println("ym:"+ym);
+        Integer ym = ymList.get(0);
         statsinfo.setCompanyid(BaseContextHolder.getCompanyId());
         Integer yms = statsinfoMapper.select(ym, BaseContextHolder.getCompanyId());
         statsinfo.setSi_yearmonth(Double.valueOf(ym));

+ 2 - 4
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -266,8 +266,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         //计算期间金额
         Statsinfo statsinfo = new Statsinfo();
         List<Integer> ymList = paybalancedetMapper.selectYm(Math.toIntExact(id));
-        Integer ym = ymList.indexOf(0);
-        System.out.println("ym:"+ym);
+        Integer ym = ymList.get(0);
         statsinfo.setCompanyid(BaseContextHolder.getCompanyId());
         Integer yms = statsinfoMapper.select(ym, BaseContextHolder.getCompanyId());
         statsinfo.setSi_yearmonth(Double.valueOf(ym));
@@ -395,8 +394,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         //计算期间金额
         Statsinfo statsinfo = new Statsinfo();
         List<Integer> ymList = paybalancedetMapper.selectYm(id);
-        Integer ym = ymList.indexOf(0);
-        System.out.println("ym:"+ym);
+        Integer ym = ymList.get(0);
         statsinfo.setCompanyid(BaseContextHolder.getCompanyId());
         Integer yms = statsinfoMapper.select(ym, BaseContextHolder.getCompanyId());
         statsinfo.setSi_yearmonth(Double.valueOf(ym));

+ 2 - 4
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -312,8 +312,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         //计算期间金额
         Statsinfo statsinfo = new Statsinfo();
         List<Integer> ymList = recbalancedetMapper.selectYm(Math.toIntExact(id));
-        Integer ym = ymList.indexOf(0);
-        System.out.println("ym:"+ym);
+        Integer ym = ymList.get(0);
         statsinfo.setCompanyid(BaseContextHolder.getCompanyId());
         Integer yms = statsinfoMapper.select(ym, BaseContextHolder.getCompanyId());
         statsinfo.setSi_yearmonth(Double.valueOf(ym));
@@ -442,8 +441,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         //计算期间金额
         Statsinfo statsinfo = new Statsinfo();
         List<Integer> ymList = recbalancedetMapper.selectYm(Math.toIntExact(id));
-        Integer ym = ymList.indexOf(0);
-        System.out.println("ym:"+ym);
+        Integer ym = ymList.get(0);
         statsinfo.setCompanyid(BaseContextHolder.getCompanyId());
         Integer yms = statsinfoMapper.select(ym, BaseContextHolder.getCompanyId());
         statsinfo.setSi_yearmonth(Double.valueOf(ym));

+ 1 - 1
applications/money/money-server/src/main/resources/mapper/StatsinfoMapper.xml

@@ -98,6 +98,6 @@
     </update>
 
     <select id="select" resultType="java.lang.Integer">
-        select DISTINCT si_yearmonth from statsinfo where si_yearmonth =#{si_yearmonth,jdbcType=INTEGER} and companyid = #{companyid,jdbcType=INTEGER}
+        select DISTINCT si_yearmonth from statsinfo where si_yearmonth =#{si_yearmonth,jdbcType=INTEGER} and companyid = #{companyid,jdbcType=INTEGER} and si_type='FUND'
     </select>
 </mapper>