更新维修资金最新代码

src/main/java/io/renren/modules/app/controller/AlarmTask.java

@@ -25,47 +25,47 @@ import io.renren.modules.app.service.WxzjyjdrService;
 //@Async
 public class AlarmTask {
 	
-	@Autowired
-	private WxzjyjdrService wxzjyjdrService;
-
-    /**第一次延迟(initialDelay)?秒后执行，之后按fixedDelay的规则每?秒执行一次*/
-	//辅助核算余额表刷数据脚本
-    @Scheduled(initialDelay = 9*60*60*1000, fixedDelay = 24*60*60*1000)
-    public void run1(){
-    	String dqsj = "";
-		Date dt = new Date();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
-		dqsj = sdf.format(dt);
-		java.util.Date date1 = null;
-		try {
-			date1 = sdf.parse(dqsj);
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} // Date格式
-		Calendar calBegin = Calendar.getInstance();
-		// 使用给定的 Date 设置此 Calendar 的时间
-		calBegin.setTime(date1);
-		calBegin.add(Calendar.MONTH, 1);
-		String datestr = sdf.format(calBegin.getTime());// String格式下一个月
-		java.util.Date dBegin = null;
-		try {
-			dBegin = sdf.parse(dqsj);
-		} catch (ParseException e1) {
-			e1.printStackTrace();
-		}
-		java.util.Date dEnd = null;
-		try {
-			dEnd = sdf.parse(dqsj);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		List<String> datas = wxzjyjdrService.findDates(dBegin, dEnd);
-		for (String kjqj : datas) {
-			wxzjyjdrService.deletefzhsmxgrdwnext(datestr);//先把下个余额的清空
-			wxzjyjdrService.deletefzhsmxgrdw(kjqj);//先将当月的01和03发生额清0，期末设置等于期初
-			wxzjyjdrService.selectfzhsmxsss(kjqj);//再重新刷当月的01和03发生，期末，和下月期初
-		}
-    }   
+//	@Autowired
+//	private WxzjyjdrService wxzjyjdrService;
+//
+//    /**第一次延迟(initialDelay)?秒后执行，之后按fixedDelay的规则每?秒执行一次*/
+//	//辅助核算余额表刷数据脚本
+//    @Scheduled(initialDelay = 10*60*60*1000, fixedDelay = 24*60*60*1000)
+//    public void run1(){
+//    	String dqsj = "";
+//		Date dt = new Date();
+//		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+//		dqsj = sdf.format(dt);
+//		java.util.Date date1 = null;
+//		try {
+//			date1 = sdf.parse(dqsj);
+//		} catch (ParseException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		} // Date格式
+//		Calendar calBegin = Calendar.getInstance();
+//		// 使用给定的 Date 设置此 Calendar 的时间
+//		calBegin.setTime(date1);
+//		calBegin.add(Calendar.MONTH, 1);
+//		String datestr = sdf.format(calBegin.getTime());// String格式下一个月
+//		java.util.Date dBegin = null;
+//		try {
+//			dBegin = sdf.parse(dqsj);
+//		} catch (ParseException e1) {
+//			e1.printStackTrace();
+//		}
+//		java.util.Date dEnd = null;
+//		try {
+//			dEnd = sdf.parse(dqsj);
+//		} catch (ParseException e) {
+//			e.printStackTrace();
+//		}
+//		List<String> datas = wxzjyjdrService.findDates(dBegin, dEnd);
+//		for (String kjqj : datas) {
+//			wxzjyjdrService.deletefzhsmxgrdwnext(datestr);//先把下个余额的清空
+//			wxzjyjdrService.deletefzhsmxgrdw(kjqj);//先将当月的01和03发生额清0，期末设置等于期初
+//			wxzjyjdrService.selectfzhsmxsss(kjqj);//再重新刷当月的01和03发生，期末，和下月期初
+//		}
+//    }   
 }
 

src/main/java/io/renren/modules/app/controller/GrwxzjController.java

@@ -428,6 +428,14 @@ public class GrwxzjController {
 		return R.ok();
 	}
 	
+	// @Login
+		@PostMapping("/yyyyy")
+		@ApiOperation(value = "djbh", notes = "马来西亚", response = R.class)
+		public R yyyy() {
+			grwxzjService.yyyy();
+			return R.ok();
+		}
+
 	// @Login
 	@GetMapping("queryByPageFZHSMX")
 	@ApiOperation(value = "辅助核算明细查询按钮", notes = "带分页、模糊查询，查询关键字：(维修资金查询)", response = YwpzEntity.class)

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

@@ -194,7 +194,7 @@ public interface FwwxdshDao extends BaseMapper<SqwxzqEntity> {
 
 	List<FtqcEntity> selectftqcsc(String id);
 	
-	List<FtqcEntity> selectftqcsc2(@Param(value = "id") String id);
+	List<YwpzmxEntity> selectftqcsc2(@Param(value = "id") String id);
 	
 	List<FtqcEntity> selectftqcye(String id);
 

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

@@ -219,4 +219,13 @@ public interface GrwxzjDao extends BaseMapper<YwpzEntity> {
     List<YwpzEntity> selectqqqqww();
 	
 	void insertqqqqww(List<YwpzEntity> list);
+	
+	List<YwpzEntity> selectghandcw();
+	
+	List<YwpzEntity> selectypz(YwpzEntity ywpzEntity);
+	
+	List<Double> selectcpz(YwpzEntity ywpzEntity);
+	
+	void inserttemp(YwpzEntity ywpzEntity);
+	
 }

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

@@ -224,4 +224,6 @@ public interface HPzDao extends BaseMapper<HPzEntity> {
 	
 	void updatekmyeqmjehtdf(HKmyeEntity hKmyeEntity);
 	
+	List<HPzEntity> selectpzfse(String id);
+
 }

src/main/java/io/renren/modules/app/entity/FwxxEntity.java

@@ -243,4 +243,16 @@ public class FwxxEntity implements Serializable {
 	
 	@ApiModelProperty("")
 	private Double sumdwje2;
+	
+	@ApiModelProperty("")
+    private Double qdwje;
+    
+    @ApiModelProperty("")
+    private Double qgrje;
+    
+    @ApiModelProperty("")
+    private Double hdwje;
+    
+    @ApiModelProperty("")
+    private Double hgrje;
 }

src/main/java/io/renren/modules/app/entity/YwpzEntity.java

@@ -486,4 +486,34 @@ public class YwpzEntity implements Serializable {
 	
 	@ApiModelProperty("")
 	private Double jzchj;
+	
+	@ApiModelProperty("")
+    private Double dwje;
+    
+    @ApiModelProperty("")
+    private Double qdwje;
+    
+    @ApiModelProperty("")
+    private Double qgrje;
+    
+    @ApiModelProperty("")
+    private Double hdwje;
+    
+    @ApiModelProperty("")
+    private Double hgrje;
+    
+    @ApiModelProperty("")
+    private String ywbh;
+    
+    @ApiModelProperty("")
+    private Double dfje;
+    
+    @ApiModelProperty("")
+    private Double ywje;
+    
+    @ApiModelProperty("")
+    private Double cwje;
+    
+    @ApiModelProperty("")
+    private Double ce;
 }

src/main/java/io/renren/modules/app/entity/YwpzmxEntity.java

@@ -58,5 +58,15 @@ public class YwpzmxEntity implements Serializable {
             @ApiModelProperty("")
             private Double grje;
             
+            @ApiModelProperty("")
+            private Double qdwje;
+            
+            @ApiModelProperty("")
+            private Double qgrje;
             
+            @ApiModelProperty("")
+            private Double hdwje;
+            
+            @ApiModelProperty("")
+            private Double hgrje;
 }

src/main/java/io/renren/modules/app/service/GrwxzjService.java

@@ -96,6 +96,8 @@ public interface GrwxzjService extends IService<YwpzEntity> {
 	
 	void djbh();
 	
+	void yyyy();
+	
 	PageInfo<YwpzEntity> queryByPageFZHSMX(Integer pageNum, Integer pageSize,YwpzEntity ywpzEntity);
 	
 	PageInfo<YwpzEntity> queryByPageFZHSYE(Integer pageNum, Integer pageSize,YwpzEntity ywpzEntity);

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

@@ -793,58 +793,14 @@ public class GrwxzjServiceImpl extends ServiceImpl<GrwxzjDao, YwpzEntity> implem
 	@Override
 	public PageInfo<YwpzEntity> queryByPageFZHSYE(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 ("D".equals(ywpzEntity.getFzkmlb())) {
-				ywpzEntity.setDjlx("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.setDjlx("21");
-				ywpzEntity.setZqlx("01");
-			} else if ("YEBF".equals(ywpzEntity.getFzkmlb())) {
-//				ywpzEntity.setDjlx("22");
-				ywpzEntity.setZqlx("03");
-			}
-		}
+		List<YwpzEntity> ywpzEntitys = new ArrayList<YwpzEntity>();
 		
-		List<YwpzEntity> ywpzEntitys = baseMapper.queryByPageFZHSYE(ywpzEntity);
-		for (YwpzEntity y : ywpzEntitys) {
-			if(!"".equals(y.getZqlx())&&y.getZqlx()!=null&&"首次拨付分摊".equals(y.getDjlx())){
-				if("01".equals(y.getZqlx())){
-					y.setZqlx("首次分摊开发商缴款");
-				}else{
-					y.setZqlx("首次分摊业主缴款");
-					y.setDwmc("业主");
-				}
-				y.setDjlx(y.getZqlx());
-			}else if(!"".equals(y.getZqlx())&&y.getZqlx()!=null&&"余额拨付分摊".equals(y.getDjlx())){
-				if("01".equals(y.getZqlx())){
-					y.setZqlx("余额分摊开发商缴款");
-				}else{
-					y.setZqlx("余额分摊业主缴款");
-					y.setDwmc("业主");
-				}
-				y.setDjlx(y.getZqlx());
-			}
-		}
 		PageInfo<YwpzEntity> pageInfo = new PageInfo<YwpzEntity>(ywpzEntitys);
 		return pageInfo;
 	}
 	
+	
+
 	@Override
 	public void wcnd() {
 		List<String> listyw = new ArrayList<String>();
@@ -944,4 +900,21 @@ public class GrwxzjServiceImpl extends ServiceImpl<GrwxzjDao, YwpzEntity> implem
 		baseMapper.insertqqqqww(list);
 	}
 
+	@Override
+	public void yyyy() {
+		List<YwpzEntity> list=baseMapper.selectghandcw();
+		for(YwpzEntity y:list){
+			List<YwpzEntity> list1=baseMapper.selectypz(y);
+			List<Double> list2=baseMapper.selectcpz(y);
+			boolean a;
+//			for(int i=0;i<list1.size();i++){
+//				a=list2.contains(list1.get(i).getJe());
+//				if(a==false){
+//					baseMapper.inserttemp(list1.get(i));
+//				}
+//			}
+			
+		}
+	}
+
 }
\ No newline at end of file

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

@@ -3567,7 +3567,7 @@ public class HPzServiceImpl extends ServiceImpl<HPzDao, HPzEntity> implements HP
 				flxh = flxh + 1;
 
 				// // 单位凭证生成的时候，将辅助核算明细中该单据的pzh和cwkjqj刷进去
-				// baseMapper.updatefzhsmxdw(hPzEntityjf);
+				 baseMapper.updatefzhsmxdw(hPzEntityjf);
 			}
 			for (int i = 0; i < ywpzEntity.getHPzEntities().size(); i++) {
 				// b.再生成贷方凭证
@@ -3736,7 +3736,7 @@ public class HPzServiceImpl extends ServiceImpl<HPzDao, HPzEntity> implements HP
 				baseMapper.updateywpzpzh(hPzEntityjf);
 				flxh = flxh + 1;
 				// // 单位凭证生成的时候，将辅助核算明细中该单据的pzh和cwkjqj刷进去
-				// baseMapper.updatefzhsmxdw(hPzEntityjf);
+				 baseMapper.updatefzhsmxdw(hPzEntityjf);
 			}
 			Double sumdfje = 0.0;
 			String zymc = "";
@@ -4835,6 +4835,64 @@ public class HPzServiceImpl extends ServiceImpl<HPzDao, HPzEntity> implements HP
 		List<HKmyeEntity> list1 = baseMapper.selectkmyexxxx(datestr + "-12");// 上年年末
 		// 查本年1月份的
 		List<HKmyeEntity> list2 = baseMapper.selectkmyexxxx(kjqj.substring(0, 4) + "-01");// 本年年初
+		//'4001','4201','4301','5001','5101','400101','4101','4102','4901','5901','3101'
+		List<HPzEntity> list3=baseMapper.selectpzfse(kjqj.substring(0, 4));
+		Double sum400102df=0.0;
+		Double sum400102jf=0.0;
+		Double sum4201df=0.0;
+		Double sum4201jf=0.0;
+		Double sum4301df=0.0;
+		Double sum4301jf=0.0;
+		Double sum5001df=0.0;
+		Double sum5001jf=0.0;
+		Double sum5101df=0.0;
+		Double sum5101jf=0.0;
+		Double sum400101df=0.0;
+		Double sum400101jf=0.0;
+		Double sum4101df=0.0;
+		Double sum4101jf=0.0;
+		Double sum4102df=0.0;
+		Double sum4102jf=0.0;
+		Double sum4901df=0.0;
+		Double sum4901jf=0.0;
+		Double sum5901df=0.0;
+		Double sum5901jf=0.0;
+		Double sum3101df=0.0;
+		for(HPzEntity pp:list3){
+			if("400101".equals(pp.getKm())){
+				sum400101df+=pp.getDfje();
+				sum400101jf+=pp.getJfje();
+			}else if("400102".equals(pp.getKm())){
+				sum400102df+=pp.getDfje();
+				sum400102jf+=pp.getJfje();
+			}else if("4201".equals(pp.getKm())){
+				sum4201df+=pp.getDfje();
+				sum4201jf+=pp.getJfje();
+			}else if("4301".equals(pp.getKm())){
+				sum4301df+=pp.getDfje();
+				sum4301jf+=pp.getJfje();
+			}else if("5001".equals(pp.getKm())){
+				sum5001df+=pp.getDfje();
+				sum5001jf+=pp.getJfje();
+			}else if("5101".equals(pp.getKm())){
+				sum5101df+=pp.getDfje();
+				sum5101jf+=pp.getJfje();
+			}else if("4101".equals(pp.getKm())){
+				sum4101df+=pp.getDfje();
+				sum4101jf+=pp.getJfje();
+			}else if("4102".equals(pp.getKm())){
+				sum4102df+=pp.getDfje();
+				sum4102jf+=pp.getJfje();
+			}else if("4901".equals(pp.getKm())){
+				sum4901df+=pp.getDfje();
+				sum4901jf+=pp.getJfje();
+			}else if("5901".equals(pp.getKm())){
+				sum5901df+=pp.getDfje();
+				sum5901jf+=pp.getJfje();
+			}else if("3101".equals(pp.getKm())){
+				sum3101df+=pp.getDfje();
+			}
+		}
 		// --------------------第四行：(一)+(二)+(三)
 		Double bm4wx = 0.0;
 		Double bm4dfp = 0.0;
@@ -4872,12 +4930,12 @@ public class HPzServiceImpl extends ServiceImpl<HPzDao, HPzEntity> implements HP
 					}
 					Double spwxzj = sumljdf - sumljjf;
 					Double dfpwxzj = sumljdf2 - sumljjf2;
-					if (spwxzj > 0) {
+					if (spwxzj != 0) {
 						y.setSpzzwxzj(spwxzj);
 					}else{
 						y.setSpzzwxzj(null);
 					}
-					if (dfpwxzj > 0) {
+					if (dfpwxzj != 0) {
 						y.setDfpljsy(dfpwxzj);
 					}else{
 						y.setDfpljsy(null);
@@ -4898,94 +4956,50 @@ public class HPzServiceImpl extends ServiceImpl<HPzDao, HPzEntity> implements HP
 						}
 					}
 				}
-				if (sumqcye > 0) {
+				if (sumqcye != 0) {
 					y.setSpzzwxzj(sumqcye);
 					bm3wx = bm3wx + sumqcye;
 				}
-				if (sumqcye2 > 0) {
+				if (sumqcye2 != 0) {
 					y.setDfpljsy(sumqcye2);
 					bm3dfp = bm3dfp + sumqcye2;
 				}
 			} else if ("5".equals(y.getBm())) {
 				Double sumje = 0.0;
 				Double sumje2 = 0.0;
-				for (HKmyeEntity p : list2) {
-					if ("400101".equals(p.getHskmdm()) || "400102".equals(p.getHskmdm()) || "4201".equals(p.getHskmdm())
-							|| "4301".equals(p.getHskmdm())) {
-						if (p.getDfje() != null) {
-							sumje += p.getDfje();
-						}
-					} else if ("5001".equals(p.getHskmdm()) || "5101".equals(p.getHskmdm())) {
-						if (p.getJfje() != null) {
-							sumje = sumje - p.getJfje();
-						}
-					} else if ("4101".equals(p.getHskmdm()) || "4102".equals(p.getHskmdm())
-							|| "4901".equals(p.getHskmdm())) {
-						if (p.getDfje() != null) {
-							sumje2 += p.getDfje();
-						}
-					} else if ("5901".equals(p.getHskmdm())) {
-						if (p.getJfje() != null) {
-							sumje2 = sumje2 - p.getJfje();
-						}
-					}
-				}
-				if (sumje > 0) {
+				sumje=sum400101df+sum400102df+sum4201df+sum4301df-sum5001jf-sum5101jf;
+				sumje2=sum4101df+sum4102df+sum4901df-sum5901jf;
+				if (sumje != 0) {
 					y.setSpzzwxzj(sumje);
 					bm4wx = bm4wx + sumje;
 				}
-				if (sumje2 > 0) {
+				if (sumje2 != 0) {
 					y.setDfpljsy(sumje2);
 					bm4dfp = bm4dfp + sumje2;
 				}
 			} else if ("6".equals(y.getBm())) {
 				Double sum1 = 0.0;
 				Double sum2 = 0.0;
-				for (HKmyeEntity p : list2) {
-					if ("3101".equals(p.getHskmdm())) {
-						if (p.getDfje() != null) {
-							sum1 += p.getDfje();
-							sum2 += p.getDfje();
-						}
-					}
-				}
-				if (sum1 > 0) {
+				sum1=sum3101df;
+//				sum2=sum3101df;
+				if (sum1 != 0) {
 					y.setSpzzwxzj(sum1);
 					bm4wx = bm4wx + sum1;
 				}
-				if (sum2 > 0) {
+				if (sum2 != 0) {
 					y.setDfpljsy(sum2);
 					bm4dfp = bm4dfp + sum2;
 				}
 			} else if ("7".equals(y.getBm())) {
 				Double sumje = 0.0;
 				Double sumje2 = 0.0;
-				for (HKmyeEntity p : list2) {
-					if ("400101".equals(p.getHskmdm()) || "4201".equals(p.getHskmdm())
-							|| "4301".equals(p.getHskmdm())) {
-						if (p.getJfje() != null) {
-							sumje += p.getJfje();
-						}
-					} else if ("5001".equals(p.getHskmdm()) || "5101".equals(p.getHskmdm())) {
-						if (p.getDfje() != null) {
-							sumje = sumje - p.getDfje();
-						}
-					} else if ("4101".equals(p.getHskmdm()) || "4102".equals(p.getHskmdm())
-							|| "4901".equals(p.getHskmdm())) {
-						if (p.getJfje() != null) {
-							sumje2 += p.getJfje();
-						}
-					} else if ("5901".equals(p.getHskmdm())) {
-						if (p.getDfje() != null) {
-							sumje2 = sumje2 - p.getDfje();
-						}
-					}
-				}
-				if (sumje > 0) {
+//				sumje=sum400101jf+sum4201jf+sum4301jf-sum5001df-sum5101df;
+//				sumje2=sum4101jf+sum4102jf+sum4901jf-sum5901df;
+				if (sumje != 0) {
 					y.setSpzzwxzj(sumje);
 					bm4wx = bm4wx + sumje;
 				}
-				if (sumje2 > 0) {
+				if (sumje2 != 0) {
 					y.setDfpljsy(sumje2);
 					bm4dfp = bm4dfp + sumje2;
 				}
@@ -4993,19 +5007,19 @@ public class HPzServiceImpl extends ServiceImpl<HPzDao, HPzEntity> implements HP
 		}
 		for (YwpzEntity y2 : list) {
 			if ("4".equals(y2.getBm())) {
-				if (bm4wx > 0) {
+				if (bm4wx != 0) {
 					y2.setSpzzwxzj(bm4wx);
 				}
-				if (bm4dfp > 0) {
+				if (bm4dfp != 0) {
 					y2.setDfpljsy(bm4dfp);
 				}
 			} else if ("8".equals(y2.getBm())) {
 				Double bm8sumwx = bm3wx + bm4wx;
 				Double bm8sumdfp = bm3dfp + bm4dfp;
-				if (bm8sumwx > 0) {
+				if (bm8sumwx != 0) {
 					y2.setSpzzwxzj(bm8sumwx);
 				}
-				if (bm8sumdfp > 0) {
+				if (bm8sumdfp != 0) {
 					y2.setDfpljsy(bm8sumdfp);
 				}
 			}

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

@@ -630,7 +630,7 @@ and m.dhbm=#{dhbm}
 		yhxx
 		WHERE h_jsfs.billcode =
 		ywpz.jsfs
-		AND ywpz.bank_code= yhxx.yhbm
+		AND ywpz.bank_code= yhxx.yhbm and ywpz.djlx in ('01','03','05')
 		<if test=" yhbm!=null and yhbm!='' ">
 			AND ywpz.bank_code= #{yhbm}
 		</if>

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

@@ -387,8 +387,8 @@
 	
 	<insert id="insertywpzmxx" parameterType="io.renren.modules.app.entity.YwpzmxEntity">
 		insert into
-		ywpzmx(djbh,dhbm,fwbm,bjje,je,jdf,dwje,grje)
-		values(#{djbh},#{dhbm},#{fwbm},#{bjje},#{je},#{jdf},#{dwje},#{grje})
+		ywpzmx(djbh,dhbm,fwbm,bjje,je,jdf,dwje,grje,qdwje,qgrje,hdwje,hgrje)
+		values(#{djbh},#{dhbm},#{fwbm},#{bjje},#{je},#{jdf},#{dwje},#{grje},#{qdwje},#{qgrje},#{hdwje},#{hgrje})
 	</insert>
 
 	<update id="updateftqc" parameterType="io.renren.modules.app.entity.FtqcEntity">
@@ -702,9 +702,9 @@
 	</select>
 	
 	<select id="selectftqcsc2" parameterType="java.lang.String"
-		resultType="io.renren.modules.app.entity.FtqcEntity">
+		resultType="io.renren.modules.app.entity.YwpzmxEntity">
 		<!-- select * from ftqc where sqdbh=#{id} and sqje!=0 -->
-		select fwbm,dhbm,je sqje from ywpzmx where djbh in ${id}
+		select * from ywpzmx where djbh in ${id}
 	</select>
 
 	<select id="selectftqcye" parameterType="java.lang.String"
@@ -882,7 +882,7 @@
 	<select id="queryByPageZQMXCX" parameterType="io.renren.modules.app.entity.YwpzEntity"
 		resultType="io.renren.modules.app.entity.FwxxEntity">
 		select
-		m.djbh,y.djrq,m.je,q.xqmc,q.xqbm,x.xmmc,x.xmbm,z.dhbm,z.dhmc,f.fwbm,f.mphm,f.xm,f.mj,f.grje,f.dwje,f.zqje,f.zqje2,f.zqdwje,f.zqdwje2,f.zqkkfs,f.zqkkfs2
+		m.djbh,y.djrq,m.je,m.dwje,m.grje,m.qdwje,m.qgrje,m.hdwje,m.hgrje,q.xqmc,q.xqbm,x.xmmc,x.xmbm,z.dhbm,z.dhmc,f.fwbm,f.mphm,f.xm,f.mj
 		from ywpzmx m,fwxx f,zhxx z,xm x,xqxx q,ywpz y where m.djbh=y.djbh and m.fwbm=f.fwbm and
 		f.dhbm=z.dhbm and z.xmbm=x.xmbm and x.xqbm=q.xqbm and SUBSTR(m.djbh
 		FROM 1 FOR 2) in('21','22')

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

@@ -675,7 +675,7 @@
 	</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 '2020-02' and '2021-01'
+		select * from fzhsye_copy where djlx in ('01','03') and gjkjqj BETWEEN '2019-01' and '2021-01'
 	</select>
 	
 	<insert id="insertqqqqww">
@@ -698,4 +698,20 @@
 		</foreach>
 	</insert>
 	
+	<select id="selectghandcw" resultType="io.renren.modules.app.entity.YwpzEntity">
+		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>
+	
+	<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>
+
 </mapper>
\ No newline at end of file

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

@@ -882,4 +882,8 @@
 	 where ztbm=#{ztbm} and kjqj=#{kjqj} and hskmdm=#{hskmdm}
 	</update>
 	
+	<select id="selectpzfse" parameterType="String" resultType="io.renren.modules.app.entity.HPzEntity">
+		select * from h_pz where SUBSTR(kjqj FROM 1 FOR 4)=#{id} and km in('4001','4201','4301','5001','5101','400101','400102','4101','4102','4901','5901','3101')
+	</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
-#Wed Jan 20 08:34:36 CST 2021
+#Thu Jan 28 08:34:58 CST 2021
 version=2.1.0
 groupId=io.renren
 m2e.projectName=renren-fast