Skip to content

R
renren-fast
Commit a17947e0 authored by 华润's avatar 华润
Browse files
Options

分户信息，个人缴交金额，单位缴交金额，缴交总额，当前余额后台算法整改优化

parent 9a948b87
Expand all Show whitespace changes
Inline Side-by-side
Showing with 205 additions and 101 deletions
.idea/workspace.xml
View file @ a17947e0
This diff is collapsed.
src/main/java/io/renren/modules/app/dao/FhxxSelectDao.java
View file @ a17947e0
......@@ -2,6 +2,7 @@ package io.renren.modules.app.dao;
import java.util.List;
import io.renren.modules.app.entity.FwxxEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -31,5 +32,15 @@ public interface FhxxSelectDao extends BaseMapper<FhxxSelectEntity> {
int selectfwyjhs3(String id);
List<FwxxEntity> selectgrje(String dhbm);
List<FwxxEntity> selectdwje(String dhbm);
List<FwxxEntity> selectgrje2(String xmbm);
List<FwxxEntity> selectdwje2(String xmbm);
List<FwxxEntity> selectgrje3(String xqbm);
List<FwxxEntity> selectdwje3(String xqbm);
}
src/main/java/io/renren/modules/app/service/impl/FhxxSelectServicelmpl.java
View file @ a17947e0
package io.renren.modules.app.service.impl;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import io.renren.modules.app.entity.FwxxEntity;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
......@@ -36,30 +38,36 @@ public class FhxxSelectServicelmpl extends ServiceImpl<FhxxSelectDao, FhxxSelect
Double jjze = 0.0;
//当前余额
Double dqye = 0.0;
Double zqje=0.0;
List<FhxxSelectEntity> list2=new ArrayList<FhxxSelectEntity>();
List<FwxxEntity> list3=new ArrayList<FwxxEntity>();
List<FwxxEntity> list4=new ArrayList<FwxxEntity>();
if(!"".equals(fhxxSelectEntity.getXqbm())&&fhxxSelectEntity.getXqbm()!=null&&!"".equals(fhxxSelectEntity.getXmbm())&&fhxxSelectEntity.getXmbm()!=null&&!"".equals(fhxxSelectEntity.getDhbm())&&fhxxSelectEntity.getDhbm()!=null){
list2 = baseMapper.selectFhxx(fhxxSelectEntity);
list3 =baseMapper.selectgrje(fhxxSelectEntity.getDhbm());
list4 =baseMapper.selectdwje(fhxxSelectEntity.getDhbm());
}else if(!"".equals(fhxxSelectEntity.getXqbm())&&fhxxSelectEntity.getXqbm()!=null&&!"".equals(fhxxSelectEntity.getXmbm())&&fhxxSelectEntity.getXmbm()!=null&&("".equals(fhxxSelectEntity.getDhbm())||fhxxSelectEntity.getDhbm()==null)){
list2 = baseMapper.selectFhxx2(fhxxSelectEntity);
list3 =baseMapper.selectgrje2(fhxxSelectEntity.getXmbm());
list4 =baseMapper.selectdwje2(fhxxSelectEntity.getXmbm());
}else if(!"".equals(fhxxSelectEntity.getXqbm())&&fhxxSelectEntity.getXqbm()!=null&&("".equals(fhxxSelectEntity.getXmbm())||fhxxSelectEntity.getXmbm()==null)&&("".equals(fhxxSelectEntity.getDhbm())||fhxxSelectEntity.getDhbm()==null)){
list2 = baseMapper.selectFhxx3(fhxxSelectEntity);
list3 =baseMapper.selectgrje3(fhxxSelectEntity.getXqbm());
list4 =baseMapper.selectdwje3(fhxxSelectEntity.getXqbm());
}
FhxxSelectEntity entity = new FhxxSelectEntity();
for (int i = 0; i < list2.size(); i++) {
Double grje2 = Double.parseDouble(list2.get(i).getGrje());
grje = grje + grje2;
Double jjze2 = Double.parseDouble(list2.get(i).getJjze());
jjze = jjze+jjze2;
Double dwje2 = Double.parseDouble(list2.get(i).getDwje());
dwje = dwje+dwje2;
Double dqye2 = Double.parseDouble(list2.get(i).getDqye());
dqye = dqye+dqye2;
for(FwxxEntity f:list3){//合计行个人缴交额合计值
grje+=f.getGrje();
}
for(FwxxEntity f:list4){//合计行单位缴交额合计值
dwje+=f.getDwje();
}
for(FhxxSelectEntity f:list2){//合计行支取支出额合计值
zqje+=Double.parseDouble(f.getZqje());
}
jjze=grje+dwje;//缴交总额合计值
dqye=grje+dwje-zqje;//当前余额合计值
PageHelper.startPage(pageNum, pageSize);
List<FhxxSelectEntity> list = new ArrayList<FhxxSelectEntity>();
if(!"".equals(fhxxSelectEntity.getXqbm())&&fhxxSelectEntity.getXqbm()!=null&&!"".equals(fhxxSelectEntity.getXmbm())&&fhxxSelectEntity.getXmbm()!=null&&!"".equals(fhxxSelectEntity.getDhbm())&&fhxxSelectEntity.getDhbm()!=null){
......@@ -69,7 +77,31 @@ public class FhxxSelectServicelmpl extends ServiceImpl<FhxxSelectDao, FhxxSelect
}else if(!"".equals(fhxxSelectEntity.getXqbm())&&fhxxSelectEntity.getXqbm()!=null&&("".equals(fhxxSelectEntity.getXmbm())||fhxxSelectEntity.getXmbm()==null)&&("".equals(fhxxSelectEntity.getDhbm())||fhxxSelectEntity.getDhbm()==null)){
list = baseMapper.selectFhxx3(fhxxSelectEntity);
}
//--------------------------------------------每一户的grje，dwje，jjze，dqye
for(FhxxSelectEntity f1:list){
Double grje0=0.0;
Double dwje0=0.0;
Double jjze0=0.0;
Double dqye0=0.0;
for(FwxxEntity f2:list3){
if(f1.getFwbm().equals(f2.getFwbm())){
grje0+=f2.getGrje();
}
}
for(FwxxEntity f3:list4){
if(f1.getFwbm().equals(f3.getFwbm())){
dwje0+=f3.getDwje();
}
}
jjze0=grje0+dwje0;
dqye0=grje0+dwje0-Double.parseDouble(f1.getZqje());
f1.setGrje(grje0.toString());
f1.setDwje(dwje0.toString());
f1.setJjze(jjze0.toString());
BigDecimal b = new BigDecimal(dqye0);
f1.setDqye(Double.toString(b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
}
//--------------------------------------------
int fwyjhs=0;
if(!"".equals(fhxxSelectEntity.getXqbm())&&fhxxSelectEntity.getXqbm()!=null&&!"".equals(fhxxSelectEntity.getXmbm())&&fhxxSelectEntity.getXmbm()!=null&&!"".equals(fhxxSelectEntity.getDhbm())&&fhxxSelectEntity.getDhbm()!=null){
fwyjhs=baseMapper.selectfwyjhs(fhxxSelectEntity.getDhbm());
......
src/main/resources/application-prod.yml
View file @ a17947e0
......@@ -5,8 +5,8 @@ spring:
druid:
first:
url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: renren
password: 123456
username: root
password: root
initial-size: 10
max-active: 100
min-idle: 10
......
src/main/resources/mapper/app/FhxxSelectDao.xml
View file @ a17947e0
......@@ -23,11 +23,11 @@
fwxx.dz,
fwxx.htbh,
fwxx.fpbh,
ifnull((fwxx.grje + fwxx.dwje),'0') jjze,
<!-- 当前余额 -->
ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy),'0') dqye,
ifnull(fwxx.grje,'0') grje,
ifnull(fwxx.dwje,'0') dwje,
<!-- ifnull((fwxx.grje + fwxx.dwje),'0') jjze,-->
<!-- &lt;!&ndash; 当前余额 &ndash;&gt;-->
<!-- ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy),'0') dqye,-->
<!-- ifnull(fwxx.grje,'0') grje,-->
<!-- ifnull(fwxx.dwje,'0') dwje,-->
<!-- fwxx.dqye, -->
CASE
WHEN fwxx.sfsc = '0' THEN
......@@ -40,7 +40,7 @@
dyxx.dymc,
fwxx.grjjl,
fwxx.ggsy,
(fwxx.zqje+fwxx.zqje2) zqje,
ifnull((fwxx.zqje+fwxx.zqje2),0) zqje,
fwxx.ljlx,
fwxx.xhje,
fwxx.xhjx
......@@ -82,11 +82,11 @@
fwxx.dz,
fwxx.htbh,
fwxx.fpbh,
ifnull((fwxx.grje + fwxx.dwje),'0') jjze,
<!-- 当前余额 -->
ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy),'0') dqye,
ifnull(fwxx.grje,'0') grje,
ifnull(fwxx.dwje,'0') dwje,
<!-- ifnull((fwxx.grje + fwxx.dwje),'0') jjze,-->
<!-- &lt;!&ndash; 当前余额 &ndash;&gt;-->
<!-- ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy),'0') dqye,-->
<!-- ifnull(fwxx.grje,'0') grje,-->
<!-- ifnull(fwxx.dwje,'0') dwje,-->
<!-- fwxx.dqye, -->
CASE
WHEN fwxx.sfsc = '0' THEN
......@@ -99,7 +99,7 @@
dyxx.dymc,
fwxx.grjjl,
fwxx.ggsy,
(fwxx.zqje+fwxx.zqje2) zqje,
ifnull((fwxx.zqje+fwxx.zqje2),0) zqje,
fwxx.ljlx,
fwxx.xhje,
fwxx.xhjx
......@@ -143,11 +143,11 @@
fwxx.dz,
fwxx.htbh,
fwxx.fpbh,
ifnull((fwxx.grje + fwxx.dwje),'0') jjze,
<!-- 当前余额 -->
ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy ),'0') dqye,
ifnull(fwxx.grje,'0') grje,
ifnull(fwxx.dwje,'0') dwje,
<!-- ifnull((fwxx.grje + fwxx.dwje),'0') jjze,-->
<!-- &lt;!&ndash; 当前余额 &ndash;&gt;-->
<!-- ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy ),'0') dqye,-->
<!-- ifnull(fwxx.grje,'0') grje,-->
<!-- ifnull(fwxx.dwje,'0') dwje,-->
<!-- fwxx.dqye, -->
CASE
WHEN fwxx.sfsc = '0' THEN
......@@ -160,7 +160,7 @@
dyxx.dymc,
fwxx.grjjl,
fwxx.ggsy,
(fwxx.zqje+fwxx.zqje2) zqje,
ifnull((fwxx.zqje+fwxx.zqje2),0) zqje,
fwxx.ljlx,
fwxx.xhje,
fwxx.xhjx
......@@ -202,4 +202,23 @@
<select id="selectfwyjhs3" parameterType="String" resultType="int">
select count(*) from fwxx where dhbm in(select dhbm from zhxx where xmbm in(select xmbm from xm where xqbm=#{id})) and sfyj='1'
</select>
<select id="selectgrje" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) grje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='03' or SUBSTR(djbh FROM 5 FOR 2)='03' or SUBSTR(djbh FROM 1 FOR 2)='05' or SUBSTR(djbh FROM 5 FOR 2)='05') and dhbm=#{dhbm}
</select>
<select id="selectdwje" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) dwje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='02' or SUBSTR(djbh FROM 5 FOR 2)='02') and dhbm=#{dhbm}
</select>
<select id="selectgrje2" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) grje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='03' or SUBSTR(djbh FROM 5 FOR 2)='03' or SUBSTR(djbh FROM 1 FOR 2)='05' or SUBSTR(djbh FROM 5 FOR 2)='05') and dhbm in(select dhbm from zhxx where xmbm=#{xmbm})
</select>
<select id="selectdwje2" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) dwje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='02' or SUBSTR(djbh FROM 5 FOR 2)='02') and dhbm in(select dhbm from zhxx where xmbm=#{xmbm})
</select>
<select id="selectgrje3" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) grje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='03' or SUBSTR(djbh FROM 5 FOR 2)='03' or SUBSTR(djbh FROM 1 FOR 2)='05' or SUBSTR(djbh FROM 5 FOR 2)='05') and dhbm in(select dhbm from zhxx where xmbm in(select xmbm from xm where xqbm=#{xqbm}))
</select>
<select id="selectdwje3" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) dwje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='02' or SUBSTR(djbh FROM 5 FOR 2)='02') and dhbm in(select dhbm from zhxx where xmbm in(select xmbm from xm where xqbm=#{xqbm}))
</select>
</mapper>
\ No newline at end of file
target/classes/application-prod.yml
View file @ a17947e0
......@@ -4,9 +4,9 @@ spring:
driverClassName: com.mysql.jdbc.Driver
druid:
first:
url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: renren
password: 123456
url: jdbc:mysql://192.168.101.213:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: root
password: Cd85617711
initial-size: 10
max-active: 100
min-idle: 10
......
target/classes/application.yml
View file @ a17947e0
......@@ -13,7 +13,7 @@ server:
spring:
# 环境 dev|test|prod
profiles:
active: dev
active: prod
# jackson时间格式化
jackson:
time-zone: GMT+8
......
target/classes/mapper/app/FhxxSelectDao.xml
View file @ a17947e0
......@@ -23,11 +23,11 @@
fwxx.dz,
fwxx.htbh,
fwxx.fpbh,
ifnull((fwxx.grje + fwxx.dwje),'0') jjze,
<!-- 当前余额 -->
ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy),'0') dqye,
ifnull(fwxx.grje,'0') grje,
ifnull(fwxx.dwje,'0') dwje,
<!-- ifnull((fwxx.grje + fwxx.dwje),'0') jjze,-->
<!-- &lt;!&ndash; 当前余额 &ndash;&gt;-->
<!-- ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy),'0') dqye,-->
<!-- ifnull(fwxx.grje,'0') grje,-->
<!-- ifnull(fwxx.dwje,'0') dwje,-->
<!-- fwxx.dqye, -->
CASE
WHEN fwxx.sfsc = '0' THEN
......@@ -40,7 +40,7 @@
dyxx.dymc,
fwxx.grjjl,
fwxx.ggsy,
(fwxx.zqje+fwxx.zqje2) zqje,
ifnull((fwxx.zqje+fwxx.zqje2),0) zqje,
fwxx.ljlx,
fwxx.xhje,
fwxx.xhjx
......@@ -82,11 +82,11 @@
fwxx.dz,
fwxx.htbh,
fwxx.fpbh,
ifnull((fwxx.grje + fwxx.dwje),'0') jjze,
<!-- 当前余额 -->
ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy),'0') dqye,
ifnull(fwxx.grje,'0') grje,
ifnull(fwxx.dwje,'0') dwje,
<!-- ifnull((fwxx.grje + fwxx.dwje),'0') jjze,-->
<!-- &lt;!&ndash; 当前余额 &ndash;&gt;-->
<!-- ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy),'0') dqye,-->
<!-- ifnull(fwxx.grje,'0') grje,-->
<!-- ifnull(fwxx.dwje,'0') dwje,-->
<!-- fwxx.dqye, -->
CASE
WHEN fwxx.sfsc = '0' THEN
......@@ -99,7 +99,7 @@
dyxx.dymc,
fwxx.grjjl,
fwxx.ggsy,
(fwxx.zqje+fwxx.zqje2) zqje,
ifnull((fwxx.zqje+fwxx.zqje2),0) zqje,
fwxx.ljlx,
fwxx.xhje,
fwxx.xhjx
......@@ -143,11 +143,11 @@
fwxx.dz,
fwxx.htbh,
fwxx.fpbh,
ifnull((fwxx.grje + fwxx.dwje),'0') jjze,
<!-- 当前余额 -->
ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy ),'0') dqye,
ifnull(fwxx.grje,'0') grje,
ifnull(fwxx.dwje,'0') dwje,
<!-- ifnull((fwxx.grje + fwxx.dwje),'0') jjze,-->
<!-- &lt;!&ndash; 当前余额 &ndash;&gt;-->
<!-- ifnull((fwxx.grje + fwxx.dwje + fwxx.ggsy ),'0') dqye,-->
<!-- ifnull(fwxx.grje,'0') grje,-->
<!-- ifnull(fwxx.dwje,'0') dwje,-->
<!-- fwxx.dqye, -->
CASE
WHEN fwxx.sfsc = '0' THEN
......@@ -160,7 +160,7 @@
dyxx.dymc,
fwxx.grjjl,
fwxx.ggsy,
(fwxx.zqje+fwxx.zqje2) zqje,
ifnull((fwxx.zqje+fwxx.zqje2),0) zqje,
fwxx.ljlx,
fwxx.xhje,
fwxx.xhjx
......@@ -202,4 +202,23 @@
<select id="selectfwyjhs3" parameterType="String" resultType="int">
select count(*) from fwxx where dhbm in(select dhbm from zhxx where xmbm in(select xmbm from xm where xqbm=#{id})) and sfyj='1'
</select>
<select id="selectgrje" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) grje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='03' or SUBSTR(djbh FROM 5 FOR 2)='03' or SUBSTR(djbh FROM 1 FOR 2)='05' or SUBSTR(djbh FROM 5 FOR 2)='05') and dhbm=#{dhbm}
</select>
<select id="selectdwje" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) dwje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='02' or SUBSTR(djbh FROM 5 FOR 2)='02') and dhbm=#{dhbm}
</select>
<select id="selectgrje2" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) grje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='03' or SUBSTR(djbh FROM 5 FOR 2)='03' or SUBSTR(djbh FROM 1 FOR 2)='05' or SUBSTR(djbh FROM 5 FOR 2)='05') and dhbm in(select dhbm from zhxx where xmbm=#{xmbm})
</select>
<select id="selectdwje2" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) dwje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='02' or SUBSTR(djbh FROM 5 FOR 2)='02') and dhbm in(select dhbm from zhxx where xmbm=#{xmbm})
</select>
<select id="selectgrje3" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) grje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='03' or SUBSTR(djbh FROM 5 FOR 2)='03' or SUBSTR(djbh FROM 1 FOR 2)='05' or SUBSTR(djbh FROM 5 FOR 2)='05') and dhbm in(select dhbm from zhxx where xmbm in(select xmbm from xm where xqbm=#{xqbm}))
</select>
<select id="selectdwje3" parameterType="String" resultType="io.renren.modules.app.entity.FwxxEntity">
select ifnull(je,0) dwje,fwbm from ywpzmx where (SUBSTR(djbh FROM 1 FOR 2)='02' or SUBSTR(djbh FROM 5 FOR 2)='02') and dhbm in(select dhbm from zhxx where xmbm in(select xmbm from xm where xqbm=#{xqbm}))
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment