更新最新的辅助核算余额后台代码

src/main/java/io/renren/modules/app/dao/GrwxzjDao.java

@@ -11,6 +11,7 @@ import io.renren.modules.app.entity.ZhxxEntity;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -228,4 +229,24 @@ public interface GrwxzjDao extends BaseMapper<YwpzEntity> {
 	
 	void inserttemp(YwpzEntity ywpzEntity);
 	
+	List<HashMap<String, String>> selectxmbm();
+	
+	List<YwpzEntity> QUERYDW(String kjqj);
+	
+	List<YwpzEntity> QUERYGR(String kjqj);
+	
+	List<YwpzEntity> QUERYSY(String kjqj);
+	
+	List<YwpzEntity> QUERYTK(String kjqj);
+	
+    List<YwpzEntity> QUERYDWDY(String kjqj);
+	
+	List<YwpzEntity> QUERYGRDY(String kjqj);
+	
+	List<YwpzEntity> QUERYSYDY(String kjqj);
+	
+	List<YwpzEntity> QUERYSYDY2(String kjqj);
+	
+	List<YwpzEntity> QUERYTKDY(String kjqj);
+	
 }

src/main/java/io/renren/modules/app/service/impl/HPzServiceImpl.java

@@ -4858,13 +4858,16 @@ public class HPzServiceImpl extends ServiceImpl<HPzDao, HPzEntity> implements HP
 		Double sum5901df=0.0;
 		Double sum5901jf=0.0;
 		Double sum3101df=0.0;
+		Double sum3101jf=0.0;
 		for(HPzEntity pp:list3){
 			if("400101".equals(pp.getKm())){
 				sum400101df+=pp.getDfje();
 				sum400101jf+=pp.getJfje();
 			}else if("400102".equals(pp.getKm())){
+				if(!"挂账期初数".equals(pp.getZymc())){
 					sum400102df+=pp.getDfje();
 					sum400102jf+=pp.getJfje();	
+				}
 			}else if("4201".equals(pp.getKm())){
 				sum4201df+=pp.getDfje();
 				sum4201jf+=pp.getJfje();
@@ -4891,6 +4894,7 @@ public class HPzServiceImpl extends ServiceImpl<HPzDao, HPzEntity> implements HP
 				sum5901jf+=pp.getJfje();
 			}else if("3101".equals(pp.getKm())){
 				sum3101df+=pp.getDfje();
+				sum3101jf+=pp.getJfje();
 			}
 		}
 		// --------------------第四行：(一)+(二)+(三)
@@ -4980,8 +4984,8 @@ public class HPzServiceImpl extends ServiceImpl<HPzDao, HPzEntity> implements HP
 			} else if ("6".equals(y.getBm())) {
 				Double sum1 = 0.0;
 				Double sum2 = 0.0;
-				sum1=sum3101df;
-//				sum2=sum3101df;
+//				sum1=sum3101df;
+				sum1=sum3101jf;
 				if (sum1 != 0) {
 					y.setSpzzwxzj(sum1);
 					bm4wx = bm4wx + sum1;

src/main/resources/mapper/app/GrwxzjDao.xml

@@ -524,10 +524,13 @@
 
 	<select id="queryByPageFZHSMX" parameterType="io.renren.modules.app.entity.YwpzEntity"
 		resultType="io.renren.modules.app.entity.YwpzEntity">
-		select gjkjqj,djbh,(case
+		select DISTINCT gjkjqj,djbh,(case
 		djlx
-		when '01' then '单位预交' when '03' then
-		'个人预交' when '13' then '业主退款' when '21' then '首次拨付分摊' when '22' then
+		when '01' then '单位预交' when '03'
+		then
+		'个人预交' when '05' then
+		'个人预交' when '13' then '业主退款' when '21' then
+		'首次拨付分摊' when '22' then
 		'余额拨付分摊' when '10' then
 		'年度结息' else '' END)
 		djlx,djrq,jffse,dffse,zymc,cwkjqj,pzh,zqlx from fzhsmx
@@ -638,18 +641,20 @@
 		djbh=#{id})))
 	</select>
 
-	<select id="selectqqqq" parameterType="java.lang.String" resultType="io.renren.modules.app.entity.YwpzEntity">
+	<select id="selectqqqq" parameterType="java.lang.String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
 		select DISTINCT
 		y.kjqj,y.djbh,y.djlx,y.djrq,z.xmbm,0,y.je,CONCAT(q.xqmc,'_',x.xmmc,'_',f.mphm,'_',f.xm)
 		dwmc,(case when (ISNULL(y.pzh)=1 || (LENGTH(trim(y.pzh))=0)) then null
 		else y.kjqj end)cwkjqj,y.pzh from ywpz
-		y,ywpzmx m,zhxx z,fwxx f,xm x,xqxx q where y.djbh=m.djbh and m.dhbm=z.dhbm and
-		m.fwbm=f.fwbm and z.xmbm=x.xmbm and x.xqbm=q.xqbm and y.djlx='03' and y.kjqj=#{id}
+		y,ywpzmx m,zhxx z,fwxx f,xm
+		x,xqxx q where y.djbh=m.djbh and m.dhbm=z.dhbm and
+		m.fwbm=f.fwbm and
+		z.xmbm=x.xmbm and x.xqbm=q.xqbm and y.djlx='03' and y.kjqj=#{id}
 	</select>
 
 	<!-- <insert id="insertqqqq" parameterType="io.renren.modules.app.entity.YwpzEntity"> 
-	insert into
-		fzhsmx(gjkjqj,djbh,djlx,djrq,xmbm,dffse,zymc,cwkjqj,pzh)values(#{kjqj},#{djbh},#{djlx},#{djrq},#{xmbm},#{je},#{dwmc},#{cwkjqj},#{pzh})
+		insert into fzhsmx(gjkjqj,djbh,djlx,djrq,xmbm,dffse,zymc,cwkjqj,pzh)values(#{kjqj},#{djbh},#{djlx},#{djrq},#{xmbm},#{je},#{dwmc},#{cwkjqj},#{pzh}) 
 		</insert> -->
 
 	<insert id="insertqqqq">
@@ -674,8 +679,10 @@
 		</foreach>
 	</insert>
 
-	<select id="selectqqqqww" parameterType="java.lang.String" resultType="io.renren.modules.app.entity.YwpzEntity">
-		select * from fzhsye_copy where djlx in ('01','03') and gjkjqj BETWEEN '2019-01' and '2021-01'
+	<select id="selectqqqqww" parameterType="java.lang.String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		select * from fzhsye_copy where djlx in ('01','03') and
+		gjkjqj BETWEEN '2019-01' and '2021-01'
 	</select>
 
 	<insert id="insertqqqqww">
@@ -702,16 +709,210 @@
 		select * from gjandcw
 	</select>
 
-	<select id="selectypz" parameterType="io.renren.modules.app.entity.YwpzEntity" resultType="io.renren.modules.app.entity.YwpzEntity">
-		select djbh,djrq,je,kjqj,pzh from ywpz where kjqj=#{kjqj} and pzh=#{pzh}
+	<select id="selectypz" parameterType="io.renren.modules.app.entity.YwpzEntity"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		select djbh,djrq,je,kjqj,pzh from ywpz where kjqj=#{kjqj}
+		and pzh=#{pzh}
 	</select>
 
-	<select id="selectcpz" parameterType="io.renren.modules.app.entity.YwpzEntity" resultType="Double">
+	<select id="selectcpz" parameterType="io.renren.modules.app.entity.YwpzEntity"
+		resultType="Double">
 		select dfje from h_pz where kjqj=#{kjqj} and pzh=#{pzh}
 	</select>
 
 	<insert id="inserttemp" parameterType="io.renren.modules.app.entity.YwpzEntity">
-	insert into tempgjcw (djbh,djrq,je,kjqj,pzh) values (#{djbh},#{djrq},#{je},#{kjqj},#{pzh})
+		insert into tempgjcw
+		(djbh,djrq,je,kjqj,pzh) values
+		(#{djbh},#{djrq},#{je},#{kjqj},#{pzh})
 	</insert>
 
+	<select id="selectxmbm" resultType="HashMap">
+		select xmmc,xmbm from xm
+	</select>
+
+	<select id="QUERYDW" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.je) je
+		FROM
+		ywpz y,
+		yjmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx IN
+		('01')
+		AND kjqj BETWEEN '2005-01'
+		AND #{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
+	<select id="QUERYGR" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.je) je
+		FROM
+		ywpz y,
+		ywpzmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx
+		IN ('03', '05')
+		AND kjqj BETWEEN '2005-01'
+		AND #{kjqj}
+		AND pzh IS NOT
+		NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
+	<select id="QUERYSY" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		xgbm xmbm,
+		sum(je) je
+		FROM
+		ywpz
+		WHERE
+		djlx IN ('21', '22')
+		AND kjqj BETWEEN '2005-01'
+		AND #{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		xgbm
+	</select>
+
+	<select id="QUERYTK" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.bjje) je
+		FROM
+		ywpz y,
+		ywpzmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx
+		IN ('13')
+		AND kjqj BETWEEN '2005-01'
+		AND #{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
+	<select id="QUERYDWDY" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.je) je
+		FROM
+		ywpz y,
+		yjmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx IN
+		('01')
+		AND kjqj=#{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
+	<select id="QUERYGRDY" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.je) je
+		FROM
+		ywpz y,
+		ywpzmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx
+		IN ('03', '05')
+		AND kjqj=#{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
+	<select id="QUERYSYDY" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		xgbm xmbm,
+		sum(je) je
+		FROM
+		ywpz
+		WHERE
+		djlx IN ('21', '22')
+		AND kjqj=#{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		xgbm
+	</select>
+
+	<select id="QUERYSYDY2" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		sum(m.dwje) dwje,
+		sum(m.grje) grje,
+		y.xgbm xmbm
+		FROM
+		ywpz y,
+		ywpzmx m
+		WHERE
+		y.djbh = m.djbh
+		AND y.djlx IN ('21', '22')
+		AND y.kjqj=#{kjqj}
+		AND y.pzh IS NOT NULL
+		GROUP BY
+		y.xgbm
+	</select>
+
+	<select id="QUERYTKDY" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.bjje) je
+		FROM
+		ywpz y,
+		ywpzmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx
+		IN ('13')
+		AND kjqj=#{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
 </mapper>
\ No newline at end of file

target/classes/META-INF/maven/io.renren/renren-fast/pom.properties

 #Generated by Maven Integration for Eclipse
-#Thu Jan 28 08:34:58 CST 2021
+#Wed Feb 03 14:51:05 CST 2021
 version=2.1.0
 groupId=io.renren
 m2e.projectName=renren-fast

target/classes/mapper/app/GrwxzjDao.xml

@@ -524,10 +524,13 @@
 
 	<select id="queryByPageFZHSMX" parameterType="io.renren.modules.app.entity.YwpzEntity"
 		resultType="io.renren.modules.app.entity.YwpzEntity">
-		select gjkjqj,djbh,(case
+		select DISTINCT gjkjqj,djbh,(case
 		djlx
-		when '01' then '单位预交' when '03' then
-		'个人预交' when '13' then '业主退款' when '21' then '首次拨付分摊' when '22' then
+		when '01' then '单位预交' when '03'
+		then
+		'个人预交' when '05' then
+		'个人预交' when '13' then '业主退款' when '21' then
+		'首次拨付分摊' when '22' then
 		'余额拨付分摊' when '10' then
 		'年度结息' else '' END)
 		djlx,djrq,jffse,dffse,zymc,cwkjqj,pzh,zqlx from fzhsmx
@@ -638,18 +641,20 @@
 		djbh=#{id})))
 	</select>
 
-	<select id="selectqqqq" parameterType="java.lang.String" resultType="io.renren.modules.app.entity.YwpzEntity">
+	<select id="selectqqqq" parameterType="java.lang.String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
 		select DISTINCT
 		y.kjqj,y.djbh,y.djlx,y.djrq,z.xmbm,0,y.je,CONCAT(q.xqmc,'_',x.xmmc,'_',f.mphm,'_',f.xm)
 		dwmc,(case when (ISNULL(y.pzh)=1 || (LENGTH(trim(y.pzh))=0)) then null
 		else y.kjqj end)cwkjqj,y.pzh from ywpz
-		y,ywpzmx m,zhxx z,fwxx f,xm x,xqxx q where y.djbh=m.djbh and m.dhbm=z.dhbm and
-		m.fwbm=f.fwbm and z.xmbm=x.xmbm and x.xqbm=q.xqbm and y.djlx='03' and y.kjqj=#{id}
+		y,ywpzmx m,zhxx z,fwxx f,xm
+		x,xqxx q where y.djbh=m.djbh and m.dhbm=z.dhbm and
+		m.fwbm=f.fwbm and
+		z.xmbm=x.xmbm and x.xqbm=q.xqbm and y.djlx='03' and y.kjqj=#{id}
 	</select>
 
 	<!-- <insert id="insertqqqq" parameterType="io.renren.modules.app.entity.YwpzEntity"> 
-	insert into
-		fzhsmx(gjkjqj,djbh,djlx,djrq,xmbm,dffse,zymc,cwkjqj,pzh)values(#{kjqj},#{djbh},#{djlx},#{djrq},#{xmbm},#{je},#{dwmc},#{cwkjqj},#{pzh})
+		insert into fzhsmx(gjkjqj,djbh,djlx,djrq,xmbm,dffse,zymc,cwkjqj,pzh)values(#{kjqj},#{djbh},#{djlx},#{djrq},#{xmbm},#{je},#{dwmc},#{cwkjqj},#{pzh}) 
 		</insert> -->
 
 	<insert id="insertqqqq">
@@ -674,8 +679,10 @@
 		</foreach>
 	</insert>
 
-	<select id="selectqqqqww" parameterType="java.lang.String" resultType="io.renren.modules.app.entity.YwpzEntity">
-		select * from fzhsye_copy where djlx in ('01','03') and gjkjqj BETWEEN '2019-01' and '2021-01'
+	<select id="selectqqqqww" parameterType="java.lang.String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		select * from fzhsye_copy where djlx in ('01','03') and
+		gjkjqj BETWEEN '2019-01' and '2021-01'
 	</select>
 
 	<insert id="insertqqqqww">
@@ -702,16 +709,210 @@
 		select * from gjandcw
 	</select>
 
-	<select id="selectypz" parameterType="io.renren.modules.app.entity.YwpzEntity" resultType="io.renren.modules.app.entity.YwpzEntity">
-		select djbh,djrq,je,kjqj,pzh from ywpz where kjqj=#{kjqj} and pzh=#{pzh}
+	<select id="selectypz" parameterType="io.renren.modules.app.entity.YwpzEntity"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		select djbh,djrq,je,kjqj,pzh from ywpz where kjqj=#{kjqj}
+		and pzh=#{pzh}
 	</select>
 
-	<select id="selectcpz" parameterType="io.renren.modules.app.entity.YwpzEntity" resultType="Double">
+	<select id="selectcpz" parameterType="io.renren.modules.app.entity.YwpzEntity"
+		resultType="Double">
 		select dfje from h_pz where kjqj=#{kjqj} and pzh=#{pzh}
 	</select>
 
 	<insert id="inserttemp" parameterType="io.renren.modules.app.entity.YwpzEntity">
-	insert into tempgjcw (djbh,djrq,je,kjqj,pzh) values (#{djbh},#{djrq},#{je},#{kjqj},#{pzh})
+		insert into tempgjcw
+		(djbh,djrq,je,kjqj,pzh) values
+		(#{djbh},#{djrq},#{je},#{kjqj},#{pzh})
 	</insert>
 
+	<select id="selectxmbm" resultType="HashMap">
+		select xmmc,xmbm from xm
+	</select>
+
+	<select id="QUERYDW" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.je) je
+		FROM
+		ywpz y,
+		yjmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx IN
+		('01')
+		AND kjqj BETWEEN '2005-01'
+		AND #{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
+	<select id="QUERYGR" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.je) je
+		FROM
+		ywpz y,
+		ywpzmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx
+		IN ('03', '05')
+		AND kjqj BETWEEN '2005-01'
+		AND #{kjqj}
+		AND pzh IS NOT
+		NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
+	<select id="QUERYSY" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		xgbm xmbm,
+		sum(je) je
+		FROM
+		ywpz
+		WHERE
+		djlx IN ('21', '22')
+		AND kjqj BETWEEN '2005-01'
+		AND #{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		xgbm
+	</select>
+
+	<select id="QUERYTK" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.bjje) je
+		FROM
+		ywpz y,
+		ywpzmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx
+		IN ('13')
+		AND kjqj BETWEEN '2005-01'
+		AND #{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
+	<select id="QUERYDWDY" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.je) je
+		FROM
+		ywpz y,
+		yjmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx IN
+		('01')
+		AND kjqj=#{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
+	<select id="QUERYGRDY" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.je) je
+		FROM
+		ywpz y,
+		ywpzmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx
+		IN ('03', '05')
+		AND kjqj=#{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
+	<select id="QUERYSYDY" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		xgbm xmbm,
+		sum(je) je
+		FROM
+		ywpz
+		WHERE
+		djlx IN ('21', '22')
+		AND kjqj=#{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		xgbm
+	</select>
+
+	<select id="QUERYSYDY2" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		sum(m.dwje) dwje,
+		sum(m.grje) grje,
+		y.xgbm xmbm
+		FROM
+		ywpz y,
+		ywpzmx m
+		WHERE
+		y.djbh = m.djbh
+		AND y.djlx IN ('21', '22')
+		AND y.kjqj=#{kjqj}
+		AND y.pzh IS NOT NULL
+		GROUP BY
+		y.xgbm
+	</select>
+
+	<select id="QUERYTKDY" parameterType="String"
+		resultType="io.renren.modules.app.entity.YwpzEntity">
+		SELECT
+		x.xmbm xmbm,
+		sum(m.bjje) je
+		FROM
+		ywpz y,
+		ywpzmx m,
+		zhxx z,
+		xm x
+		WHERE
+		y.djbh = m.djbh
+		AND m.dhbm = z.dhbm
+		AND z.xmbm = x.xmbm
+		AND djlx
+		IN ('13')
+		AND kjqj=#{kjqj}
+		AND pzh IS NOT NULL
+		GROUP BY
+		x.xmbm
+	</select>
+
 </mapper>
\ No newline at end of file