|
@@ -662,6 +662,38 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if(!(ws.getIsPay() != null && ws.getIsPay().intValue() == 1)){
|
|
|
|
|
+ List<JsonPayVo> payInfos = WelcomePayController.queryStudentPayInfo(ws.getAdmissNum(),TimeExchange.getYear());
|
|
|
|
|
+ if(payInfos != null && payInfos.size() > 0){
|
|
|
|
|
+ List<WelcomePaySetting> paySettings = welcomePaySettingService.queryPaySettings(ws.getSchool());
|
|
|
|
|
+ if(paySettings != null && paySettings.size() > 0){
|
|
|
|
|
+ for (WelcomePaySetting pay:paySettings) {
|
|
|
|
|
+ BigDecimal money = pay.getPayAmount();
|
|
|
|
|
+ if(pay.getMethod().equals("全部")){
|
|
|
|
|
+ BigDecimal totalSj = new BigDecimal(BigInteger.ZERO);
|
|
|
|
|
+ for (JsonPayVo jpv:payInfos){
|
|
|
|
|
+ totalSj = totalSj.add(jpv.getSJJE());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if(totalSj.compareTo(money) >= 0){
|
|
|
|
|
+ ws.setIsPay(1);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ Optional<JsonPayVo> ojpv = payInfos.stream().filter(e -> e.getSFXMMC().equals(pay.getMethod())).findFirst();
|
|
|
|
|
+ if(ojpv != null && ojpv.isPresent()){
|
|
|
|
|
+ if(ojpv.get().getSJJE().compareTo(money) >= 0){
|
|
|
|
|
+ ws.setIsPay(1);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }else{
|
|
|
|
|
+ ws.setIsPay(0);
|
|
|
|
|
+ }
|
|
|
|
|
+ }else{
|
|
|
|
|
+ ws.setIsPay(0);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
try {
|
|
try {
|
|
|
System.out.println("信息采集1");
|
|
System.out.println("信息采集1");
|
|
|
|
|
|