更新最新代码（辅助核算余额代码整改）

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

@@ -402,6 +402,7 @@ public class FwwxdshServiceImpl extends ServiceImpl<FwwxdshDao, SqwxzqEntity> im
 				if(f.getFwbm().equals(m.getFwbm())){
 					f.setDwje(m.getQdwje());
 					f.setGrje(m.getQgrje());
+					f.setDqye((double) Math.round((m.getQdwje()+m.getQgrje()) * 100) / 100);
 				}
 			}
 			//--------------------------------
@@ -410,8 +411,8 @@ public class FwwxdshServiceImpl extends ServiceImpl<FwwxdshDao, SqwxzqEntity> im
 			// f.setDqye((double) Math.round(a * 100) / 100);
 			f.setZhje((double) Math.round(a * 100) / 100);// 账户金额
 			// 每一户房屋的余额=dqye
-			Double b = f.getDqye();// 表里面dqye是随着每一笔交存和支取业务动态改变的，所以每一户的账户余额也等于dqye
-			f.setDqye((double) Math.round(b * 100) / 100);
+//			Double b = f.getDqye();// 表里面dqye是随着每一笔交存和支取业务动态改变的，所以每一户的账户余额也等于dqye
+//			f.setDqye((double) Math.round(b * 100) / 100);
 			YwpzEntity y = new YwpzEntity();
 			y.setDhbm(f.getDhbm());
 			y.setSqdbh(f.getSqdbh());
@@ -592,6 +593,7 @@ public class FwwxdshServiceImpl extends ServiceImpl<FwwxdshDao, SqwxzqEntity> im
 						if(fEntity.getFwbm().equals(m.getFwbm())){
 							fEntity.setDwje(m.getQdwje());
 							fEntity.setGrje(m.getQgrje());
+							fEntity.setDqye((double) Math.round((m.getQdwje()+m.getQgrje()) * 100) / 100);
 						}
 					}
 					//--------------------------------

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

@@ -744,34 +744,38 @@ public class GrwxzjServiceImpl extends ServiceImpl<GrwxzjDao, YwpzEntity> implem
 	@Override
 	public PageInfo<YwpzEntity> queryByPageFZHSMX(Integer pageNum, Integer pageSize, YwpzEntity ywpzEntity) {
 		PageHelper.startPage(pageNum, pageSize);
-		if ("01".equals(ywpzEntity.getFzlb())) {
-			ywpzEntity.setDjlx2("辅助类别专用");
-		} else if ("02".equals(ywpzEntity.getFzlb())) {
-			ywpzEntity.setDjlx("10");
-		} else if ("03".equals(ywpzEntity.getFzlb())) {
-			ywpzEntity.setDjlx3("支取类别专业");
-		} else if ("04".equals(ywpzEntity.getFzlb())) {
-			ywpzEntity.setDjlx("13");
-		}
-
-		if (!"".equals(ywpzEntity.getFzkmlb()) && ywpzEntity.getFzkmlb() != null && "01".equals(ywpzEntity.getFzlb())) {
-			ywpzEntity.setDjlx2("");
+//		if ("01".equals(ywpzEntity.getFzlb())) {
+//			ywpzEntity.setDjlx2("辅助类别专用");
+//		} else if ("02".equals(ywpzEntity.getFzlb())) {
+//			ywpzEntity.setDjlx("10");
+//		} else if ("03".equals(ywpzEntity.getFzlb())) {
+//			ywpzEntity.setDjlx3("支取类别专业");
+//		} else if ("04".equals(ywpzEntity.getFzlb())) {
+//			ywpzEntity.setDjlx("13");
+//		}
+
+//		if (!"".equals(ywpzEntity.getFzkmlb()) && ywpzEntity.getFzkmlb() != null && "01".equals(ywpzEntity.getFzlb())) {
+//			ywpzEntity.setDjlx2("");
 			if ("D".equals(ywpzEntity.getFzkmlb())) {
 				ywpzEntity.setDjlx("01");
+				ywpzEntity.setZqlx("01");
 			} else if ("Y".equals(ywpzEntity.getFzkmlb())) {
 				ywpzEntity.setDjlx("03");
-			}
-		} else if (!"".equals(ywpzEntity.getFzkmlb()) && ywpzEntity.getFzkmlb() != null
-				&& "03".equals(ywpzEntity.getFzlb())) {
-			// ywpzEntity.setDjlx3("");
-			if ("SCBF".equals(ywpzEntity.getFzkmlb())) {
-
-				ywpzEntity.setZqlx("01");
-			} else if ("YEBF".equals(ywpzEntity.getFzkmlb())) {
-
 				ywpzEntity.setZqlx("03");
-			}
-		}
+			}else{
+//				ywpzEntity.setDjlx("");
+			}
+//		} else if (!"".equals(ywpzEntity.getFzkmlb()) && ywpzEntity.getFzkmlb() != null
+//				&& "03".equals(ywpzEntity.getFzlb())) {
+//			// ywpzEntity.setDjlx3("");
+//			if ("SCBF".equals(ywpzEntity.getFzkmlb())) {
+//
+//				ywpzEntity.setZqlx("01");
+//			} else if ("YEBF".equals(ywpzEntity.getFzkmlb())) {
+//
+//				ywpzEntity.setZqlx("03");
+//			}
+//		}
 
 		List<YwpzEntity> ywpzEntitys = baseMapper.queryByPageFZHSMX(ywpzEntity);
 		for (YwpzEntity y : ywpzEntitys) {
@@ -815,11 +819,11 @@ public class GrwxzjServiceImpl extends ServiceImpl<GrwxzjDao, YwpzEntity> implem
 		List<HashMap<String, String>> list = baseMapper.selectxmbm();// 所有项目
 		List<YwpzEntity> listdw = baseMapper.QUERYDW(datestr);// 单位缴款(期初)
 		List<YwpzEntity> listgr = baseMapper.QUERYGR(datestr);// 个人缴款(期初)
-		List<YwpzEntity> listsy = baseMapper.QUERYSY(datestr);// 使用(期初)
-		List<YwpzEntity> listtk = baseMapper.QUERYTK(datestr);// 退款(期初)
+		List<YwpzEntity> listsy = baseMapper.QUERYSY(datestr);// 使用(期初)包括单位个人
+		List<YwpzEntity> listtk = baseMapper.QUERYTK(datestr);// 退款(期初)个人
 		List<YwpzEntity> listdwdy = baseMapper.QUERYDWDY(ywpzEntity.getKjqj());// 单位缴款(当月发生)
 		List<YwpzEntity> listgrdy = baseMapper.QUERYGRDY(ywpzEntity.getKjqj());// 个人缴款(当月发生)
-		List<YwpzEntity> listsydy = baseMapper.QUERYSYDY(ywpzEntity.getKjqj());// 使用(当月发生)(2021以前支取分不清个人单位分别缴了多少，所以用这个查单位+个人一共的)
+//		List<YwpzEntity> listsydy = baseMapper.QUERYSYDY(ywpzEntity.getKjqj());// 使用(当月发生)(2021以前支取分不清个人单位分别缴了多少，所以用这个查单位+个人一共的)
 		List<YwpzEntity> listsydy2 = baseMapper.QUERYSYDY2(ywpzEntity.getKjqj());// 使用(当月发生)(2021-01以后可以查单位和个人分别缴了多少，所以用这个查)
 		List<YwpzEntity> listtkdy = baseMapper.QUERYTKDY(ywpzEntity.getKjqj());// 退款(当月发生)
 		for (HashMap<String, String> map : list) {
@@ -832,15 +836,16 @@ public class GrwxzjServiceImpl extends ServiceImpl<GrwxzjDao, YwpzEntity> implem
 				xmbm = map.get("xmbm");// 项目编码
 				xmmc = map.get("xmmc");// 项目名称
 			}
-			Double qcyedw = 0.0;
-			Double qcyegr = 0.0;
-			Double qcyesy = 0.0;
-			Double qcyetk = 0.0;
-			Double dwdydf = 0.0;
-			Double grdydf = 0.0;
-			Double sydyjf = 0.0;
-			Double sydydwjf = 0.0;
-			Double sydygrjf = 0.0;
+			Double qcyedw = 0.0;//期初单位余额
+			Double qcyegr = 0.0;//期初个人余额
+			Double qcyesydw = 0.0;//期初支取单位余额
+			Double qcyesygr = 0.0;//期初支取个人余额
+			Double qcyetk = 0.0;//期初退款（个人）余额
+			Double dwdydf = 0.0;//当月单位贷方发生
+			Double grdydf = 0.0;//当月个人贷方发生
+//			Double sydyjf = 0.0;
+			Double sydydwjf = 0.0;//当月单位借方发生
+			Double sydygrjf = 0.0;//当月个人借方发生
 			Double tkdyjf = 0.0;
 			if(!listdw.isEmpty()){
 				for (YwpzEntity mapdw : listdw) {
@@ -864,7 +869,8 @@ public class GrwxzjServiceImpl extends ServiceImpl<GrwxzjDao, YwpzEntity> implem
 				for (YwpzEntity mapsy : listsy) {
 					if (mapsy.getXmbm() != null) {
 						if (xmbm.equals(mapsy.getXmbm())) {
-							qcyesy += mapsy.getJe();
+							qcyesydw += mapsy.getDwje();
+							qcyesygr += mapsy.getGrje();
 						}
 					}
 				}	
@@ -879,7 +885,7 @@ public class GrwxzjServiceImpl extends ServiceImpl<GrwxzjDao, YwpzEntity> implem
 				}	
 			}
 			
-			Double qcye = qcyedw + qcyegr - qcyesy - qcyetk;// 每个项目的期初
+			
 			if(!listdwdy.isEmpty()){
 				for (YwpzEntity mapdwdy : listdwdy) {
 					if (mapdwdy.getXmbm() != null) {
@@ -898,16 +904,16 @@ public class GrwxzjServiceImpl extends ServiceImpl<GrwxzjDao, YwpzEntity> implem
 					}
 				}	
 			}
-			if(!listsydy.isEmpty()){
-				for (YwpzEntity mapsydy : listsydy) {
-					if (mapsydy.getXmbm() != null) {
-						if (xmbm.equals(mapsydy.getXmbm())) {
-							sydyjf += mapsydy.getJe();// 每个项目当月使用发生额
-						}
-					}
-				}	
-			}
-			if(!listsydy.isEmpty()){
+//			if(!listsydy.isEmpty()){
+//				for (YwpzEntity mapsydy : listsydy) {
+//					if (mapsydy.getXmbm() != null) {
+//						if (xmbm.equals(mapsydy.getXmbm())) {
+//							sydyjf += mapsydy.getJe();// 每个项目当月使用发生额
+//						}
+//					}
+//				}	
+//			}
+			if(!listsydy2.isEmpty()){
 				for (YwpzEntity mapsydy2 : listsydy2) {
 					if (mapsydy2.getXmbm() != null) {
 						if (xmbm.equals(mapsydy2.getXmbm())) {
@@ -929,50 +935,30 @@ public class GrwxzjServiceImpl extends ServiceImpl<GrwxzjDao, YwpzEntity> implem
 			YwpzEntity y = new YwpzEntity();
 			y.setXmmc(xmmc);
 			y.setXmbm(xmbm);
-			y.setQcye(qcye);
-			if ("01".equals(ywpzEntity.getFzlb())) {// 查交存
+			Double qcye =0.0;
+			Double qmye = 0.0;
 				if ("D".equals(ywpzEntity.getFzkmlb())) {// 查单位发生额
+					qcye=qcyedw-qcyesydw;
+					qmye=qcye+dwdydf-sydydwjf;
+					y.setQcye(qcye);
 					y.setDffse(dwdydf);
+					y.setJffse(sydydwjf);
+					y.setQmye(qmye);
 				} else if ("Y".equals(ywpzEntity.getFzkmlb())) {// 查业主发生额
+					qcye=qcyegr-qcyesygr-qcyetk;
+					qmye=qcye+grdydf-sydygrjf-tkdyjf;
+					y.setQcye(qcye);
 					y.setDffse(grdydf);
-				} else {// 查单位和业主(交存)
-					y.setDffse(dwdydf + grdydf);
-				}
-			} else if ("02".equals(ywpzEntity.getFzlb())) {// 查结息
-
-			} else if ("03".equals(ywpzEntity.getFzlb())) {// 查使用
-				int res = ywpzEntity.getKjqj().compareTo("2020-12");
-				if ("SCBF".equals(ywpzEntity.getFzkmlb())) {// 查使用(单位)发生额
-					if(res>0){//查2021年以后的（可以区分单位个人分别缴了多少）
-						y.setJffse(sydydwjf);//单位
-					}else{
-						y.setJffse(sydyjf);//单位+个人
-					}
-				} else if ("YEBF".equals(ywpzEntity.getFzkmlb())) {// 查使用(业主)发生额
-					if(res>0){//查2021年以后的（可以区分单位个人分别缴了多少）
-						y.setJffse(sydygrjf);//个人
-					}else{
-						y.setJffse(sydyjf);//单位+个人
-					}
-					
-				} else {// 查使用
-					y.setJffse(sydyjf);
-				}
-			} else if ("04".equals(ywpzEntity.getFzlb())) {// 查退款
-				if ("D".equals(ywpzEntity.getFzkmlb())) {// 查单位发生额
-					// y.setJffse(tkdyjf);
-				} else if ("Y".equals(ywpzEntity.getFzkmlb())) {// 查业主发生额
-					y.setJffse(tkdyjf);
-				} else {// 查单位和业主(交存)
-					y.setJffse(tkdyjf);
-				}
-			} else {
-				y.setDffse(dwdydf + grdydf);
-				y.setJffse(sydyjf + tkdyjf);
-			}
-			Double qmye = 0.0;
-			qmye = qcye + dwdydf + grdydf - sydyjf - tkdyjf;
+					y.setJffse(sydygrjf+tkdyjf);
+					y.setQmye(qmye);
+				} else {// 查单位和业主
+					qcye =qcyedw + qcyegr - qcyesydw-qcyesygr - qcyetk;// 每个项目的期初
+					qmye=qcye+dwdydf+grdydf -sydydwjf-sydygrjf-tkdyjf;
+					y.setQcye(qcye);
+					y.setDffse(dwdydf+grdydf);
+					y.setJffse(sydydwjf+sydygrjf+tkdyjf);
 					y.setQmye(qmye);
+				}
 			ywpzEntitys.add(y);
 			if (ywpzEntity.getXmbm() != null && !"".equals(ywpzEntity.getXmbm())) {
 				break;

src/main/java/io/renren/modules/job/entity/ScheduleJobEntity.java

@@ -18,6 +18,7 @@ package io.renren.modules.job.entity;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -41,7 +42,7 @@ public class ScheduleJobEntity implements Serializable {
 	/**
 	 * 任务id
 	 */
-	@TableId
+    @TableId(value = "job_id",type = IdType.AUTO)
 	private Long jobId;
 
 	/**

src/main/java/io/renren/modules/job/entity/ScheduleJobLogEntity.java

@@ -18,6 +18,7 @@ package io.renren.modules.job.entity;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -35,7 +36,7 @@ public class ScheduleJobLogEntity implements Serializable {
 	/**
 	 * 日志id
 	 */
-	@TableId
+	@TableId(value = "log_id",type = IdType.AUTO)
 	private Long logId;
 	
 	/**

src/main/java/io/renren/modules/job/task/TestTask.java

@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  * @author Mark sunlightcs@gmail.com
  * @since 1.2.0 2016-11-28
  */
-@Component("testTask")
+@Component("Alarm")
 public class TestTask {
 	private Logger logger = LoggerFactory.getLogger(getClass());
 	
@@ -57,4 +57,11 @@ public class TestTask {
 	public void test2(){
 		logger.info("我是不带参数的test2方法，正在被执行");
 	}
+	
+	public void muaaa(){
+		for(int i=0;i<100;i++){
+			System.out.println(i);
+		}
+		
+	}
 }

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

@@ -539,16 +539,16 @@
 			and gjkjqj=#{kjqj}
 		</if>
 		<if test=" djlx!=null and djlx!='' ">
-			and djlx=#{djlx}
+			and (djlx=#{djlx}
 		</if>
-		<if test=" djlx2!=null and djlx2!='' ">
+		<!-- <if test=" djlx2!=null and djlx2!='' ">
 			and (djlx='01' or djlx='03')
-		</if>
-		<if test=" djlx3!=null and djlx3!='' ">
+		</if> -->
+		<!-- <if test=" djlx3!=null and djlx3!='' ">
 			and (djlx='21' or djlx='22')
-		</if>
+		</if> -->
 		<if test=" zqlx!=null and zqlx!='' ">
-			and zqlx=#{zqlx}
+			or zqlx=#{zqlx})
 		</if>
 		<if test=" mhlook!=null and mhlook!='' ">
 			and zymc like CONCAT("%",#{mhlook},"%") or jffse like
@@ -559,6 +559,7 @@
 		<!-- <if test=" je!=null and je!='' "> and jffse=#{je} or dffse=#{je} </if> 
 			<if test=" djbh!=null and djbh!='' "> and djbh like CONCAT("%",#{djbh},"%") 
 			</if> -->
+			order by djrq
 	</select>
 
 	<select id="queryByPageFZHSYE" parameterType="io.renren.modules.app.entity.YwpzEntity"
@@ -746,9 +747,9 @@
 		AND z.xmbm = x.xmbm
 		AND djlx IN
 		('01')
-		AND kjqj BETWEEN '2005-01'
+		AND y.kjqj BETWEEN '2005-01'
 		AND #{kjqj}
-		AND pzh IS NOT NULL
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>
@@ -769,17 +770,16 @@
 		AND z.xmbm = x.xmbm
 		AND djlx
 		IN ('03', '05')
-		AND kjqj BETWEEN '2005-01'
+		AND y.kjqj BETWEEN '2005-01'
 		AND #{kjqj}
-		AND pzh IS NOT
-		NULL
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>
 
 	<select id="QUERYSY" parameterType="String"
 		resultType="io.renren.modules.app.entity.YwpzEntity">
-		SELECT
+		<!-- SELECT
 		xgbm xmbm,
 		sum(je) je
 		FROM
@@ -790,7 +790,22 @@
 		AND #{kjqj}
 		AND pzh IS NOT NULL
 		GROUP BY
-		xgbm
+		xgbm -->
+		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 BETWEEN '2005-01'
+		AND #{kjqj}
+		AND y.pzh is not null
+		GROUP BY
+		y.xgbm
 	</select>
 
 	<select id="QUERYTK" parameterType="String"
@@ -809,9 +824,9 @@
 		AND z.xmbm = x.xmbm
 		AND djlx
 		IN ('13')
-		AND kjqj BETWEEN '2005-01'
+		AND y.kjqj BETWEEN '2005-01'
 		AND #{kjqj}
-		AND pzh IS NOT NULL
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>
@@ -832,8 +847,8 @@
 		AND z.xmbm = x.xmbm
 		AND djlx IN
 		('01')
-		AND kjqj=#{kjqj}
-		AND pzh IS NOT NULL
+		AND y.kjqj=#{kjqj}
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>
@@ -854,8 +869,8 @@
 		AND z.xmbm = x.xmbm
 		AND djlx
 		IN ('03', '05')
-		AND kjqj=#{kjqj}
-		AND pzh IS NOT NULL
+		AND y.kjqj=#{kjqj}
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>
@@ -869,8 +884,8 @@
 		ywpz
 		WHERE
 		djlx IN ('21', '22')
-		AND kjqj=#{kjqj}
-		AND pzh IS NOT NULL
+		AND y.kjqj=#{kjqj}
+		AND y.pzh is not null
 		GROUP BY
 		xgbm
 	</select>
@@ -888,7 +903,7 @@
 		y.djbh = m.djbh
 		AND y.djlx IN ('21', '22')
 		AND y.kjqj=#{kjqj}
-		AND y.pzh IS NOT NULL
+		AND y.pzh is not null
 		GROUP BY
 		y.xgbm
 	</select>
@@ -909,8 +924,8 @@
 		AND z.xmbm = x.xmbm
 		AND djlx
 		IN ('13')
-		AND kjqj=#{kjqj}
-		AND pzh IS NOT NULL
+		AND y.kjqj=#{kjqj}
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>

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

 #Generated by Maven Integration for Eclipse
-#Wed Feb 03 14:51:05 CST 2021
+#Sat Feb 20 15:14:02 CST 2021
 version=2.1.0
 groupId=io.renren
 m2e.projectName=renren-fast

target/classes/mapper/app/GrwxzjDao.xml

@@ -539,16 +539,16 @@
 			and gjkjqj=#{kjqj}
 		</if>
 		<if test=" djlx!=null and djlx!='' ">
-			and djlx=#{djlx}
+			and (djlx=#{djlx}
 		</if>
-		<if test=" djlx2!=null and djlx2!='' ">
+		<!-- <if test=" djlx2!=null and djlx2!='' ">
 			and (djlx='01' or djlx='03')
-		</if>
-		<if test=" djlx3!=null and djlx3!='' ">
+		</if> -->
+		<!-- <if test=" djlx3!=null and djlx3!='' ">
 			and (djlx='21' or djlx='22')
-		</if>
+		</if> -->
 		<if test=" zqlx!=null and zqlx!='' ">
-			and zqlx=#{zqlx}
+			or zqlx=#{zqlx})
 		</if>
 		<if test=" mhlook!=null and mhlook!='' ">
 			and zymc like CONCAT("%",#{mhlook},"%") or jffse like
@@ -559,6 +559,7 @@
 		<!-- <if test=" je!=null and je!='' "> and jffse=#{je} or dffse=#{je} </if> 
 			<if test=" djbh!=null and djbh!='' "> and djbh like CONCAT("%",#{djbh},"%") 
 			</if> -->
+			order by djrq
 	</select>
 
 	<select id="queryByPageFZHSYE" parameterType="io.renren.modules.app.entity.YwpzEntity"
@@ -746,9 +747,9 @@
 		AND z.xmbm = x.xmbm
 		AND djlx IN
 		('01')
-		AND kjqj BETWEEN '2005-01'
+		AND y.kjqj BETWEEN '2005-01'
 		AND #{kjqj}
-		AND pzh IS NOT NULL
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>
@@ -769,17 +770,16 @@
 		AND z.xmbm = x.xmbm
 		AND djlx
 		IN ('03', '05')
-		AND kjqj BETWEEN '2005-01'
+		AND y.kjqj BETWEEN '2005-01'
 		AND #{kjqj}
-		AND pzh IS NOT
-		NULL
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>
 
 	<select id="QUERYSY" parameterType="String"
 		resultType="io.renren.modules.app.entity.YwpzEntity">
-		SELECT
+		<!-- SELECT
 		xgbm xmbm,
 		sum(je) je
 		FROM
@@ -790,7 +790,22 @@
 		AND #{kjqj}
 		AND pzh IS NOT NULL
 		GROUP BY
-		xgbm
+		xgbm -->
+		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 BETWEEN '2005-01'
+		AND #{kjqj}
+		AND y.pzh is not null
+		GROUP BY
+		y.xgbm
 	</select>
 
 	<select id="QUERYTK" parameterType="String"
@@ -809,9 +824,9 @@
 		AND z.xmbm = x.xmbm
 		AND djlx
 		IN ('13')
-		AND kjqj BETWEEN '2005-01'
+		AND y.kjqj BETWEEN '2005-01'
 		AND #{kjqj}
-		AND pzh IS NOT NULL
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>
@@ -832,8 +847,8 @@
 		AND z.xmbm = x.xmbm
 		AND djlx IN
 		('01')
-		AND kjqj=#{kjqj}
-		AND pzh IS NOT NULL
+		AND y.kjqj=#{kjqj}
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>
@@ -854,8 +869,8 @@
 		AND z.xmbm = x.xmbm
 		AND djlx
 		IN ('03', '05')
-		AND kjqj=#{kjqj}
-		AND pzh IS NOT NULL
+		AND y.kjqj=#{kjqj}
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>
@@ -869,8 +884,8 @@
 		ywpz
 		WHERE
 		djlx IN ('21', '22')
-		AND kjqj=#{kjqj}
-		AND pzh IS NOT NULL
+		AND y.kjqj=#{kjqj}
+		AND y.pzh is not null
 		GROUP BY
 		xgbm
 	</select>
@@ -888,7 +903,7 @@
 		y.djbh = m.djbh
 		AND y.djlx IN ('21', '22')
 		AND y.kjqj=#{kjqj}
-		AND y.pzh IS NOT NULL
+		AND y.pzh is not null
 		GROUP BY
 		y.xgbm
 	</select>
@@ -909,8 +924,8 @@
 		AND z.xmbm = x.xmbm
 		AND djlx
 		IN ('13')
-		AND kjqj=#{kjqj}
-		AND pzh IS NOT NULL
+		AND y.kjqj=#{kjqj}
+		AND y.pzh is not null
 		GROUP BY
 		x.xmbm
 	</select>