优化

src/cn/hmsoft/art/data/dao/std/StdWishDao.java

@@ -22,9 +22,9 @@ public class StdWishDao extends PlatformDaoSupport<StdWish> {
 	}
 
 	/**
-	 * 删除aspectid
-	 * @param std_id
-	 * @param aspect_id
+	 * 根据aspect_id 删除考生志愿
+	 * @param std_id 考生ID
+	 * @param aspect_id 招考方向ID
 	 */
 	public void deleteByAspectId(Integer std_id, Integer aspect_id) {
 		String sql = "delete from std_wish where std_id = ? ";

src/cn/hmsoft/art/enrol/control/std/StdWishControl.java

@@ -21,7 +21,6 @@ public class StdWishControl extends EnrolStdAbstractControl {
 	private StdWishDao daoStdWish;
 
 	/**
-	 * @param std_id
 	 * @param wish_ids: 志愿ID数组
 	 * @param adjust：是否服从调剂：1：服从;2:不服从
 	 */

src/cn/hmsoft/art/enrol/service/EnrolStdEnrolService.java

@@ -844,8 +844,8 @@ public class EnrolStdEnrolService {
 
 	/**
 	 * @Description: 更新考生报考曲目
-	 * @param stdEnrol
-	 * @param se
+	 * @param stdEnrol 考生报考信息
+	 * @param distEnrol 需要更新的报考信息
 	 * @date 2023-11-15 05:37:55 
 	 */  
 	private void updateStdEnrolTracks(StdEnrol stdEnrol, StdEnrol distEnrol) {
@@ -1090,13 +1090,13 @@ public class EnrolStdEnrolService {
 
 	/**
 	 * @Description: 更新报考科目表中的品种
-	 * @param dist
+	 * @param dist 待更新的报考信息
 	 * @date 2023-11-15 03:42:50 
 	 */  
 	private void setStdEnrol(StdEnrol dist) {
 		List<StdEnrolSubject> distList = daoEnrol.listSubject(dist.getEnrol_id());
 		List<StdEnrolSubject> resultList = distList.stream().filter(ses -> StringHelper.isNotEmpty(ses.getVariety_id())).collect(Collectors.toList());
-		if(resultList != null && resultList.size() > 0) {
+		if(!resultList.isEmpty()) {
 			dist.setVariety_id(resultList.get(0).getVariety_id());
 			dist.setVariety_name(resultList.get(0).getVariety_name());
 			dist.setEnrol_time(LocalDateTime.now());

src/cn/hmsoft/art/enrol/service/EnrolStdOnlineService.java

@@ -124,22 +124,22 @@ public class EnrolStdOnlineService {
 			}
 			
 			//向评分系统服务器推送
-			if(FrameStatus.Active.toString().equals(ArtParamHelper.getParamValue("PushToScore", FrameStatus.InActive.toString()))) {
-				 params = new HashMap<String, Object>();
-				 List<Map<String,Object>> tracksMap = daoEnrol.mapStdTracks(enrol.getEnrol_id(), enrol.getStd_batch());
-				 dataUrl = ArtParamHelper.getParamValue(ArtParamName.JudgeScoreUrl, "https://art.hmsoft.cn/s/") + "signle/std/syn.htm";
-				 try {
-					 enrol.setPay_status("Active");
-					 params.put("request_key", SecureHelper.md5("hm2022").toUpperCase());
-					 params.put("school_code", ArtParamHelper.SchoolCode);
-					 params.put("agent_code", agent.getAgent_code()+group.getExam_batch()); //批次代码(考点代码+批次)
-					 params.put("std_json", JsonHelper.fromObject(reg));
-					 params.put("enrol_subject_json", JsonHelper.fromObject(enrolMap));
-					 params.put("std_tracks_json", JsonHelper.fromObject(tracksMap));
+			if (FrameStatus.Active.toString().equals(ArtParamHelper.getParamValue("PushToScore", FrameStatus.InActive.toString()))) {
+				params = new HashMap<String, Object>();
+				List<Map<String, Object>> tracksMap = daoEnrol.mapStdTracks(enrol.getEnrol_id(), enrol.getStd_batch());
+				dataUrl = ArtParamHelper.getParamValue(ArtParamName.JudgeScoreUrl, "https://art.hmsoft.cn/s/") + "signle/std/syn.htm";
+				try {
+					enrol.setPay_status("Active");
+					params.put("request_key", SecureHelper.md5("hm2022").toUpperCase());
+					params.put("school_code", ArtParamHelper.SchoolCode);
+					params.put("agent_code", agent.getAgent_code() + group.getExam_batch()); //批次代码(考点代码+批次)
+					params.put("std_json", JsonHelper.fromObject(reg));
+					params.put("enrol_subject_json", JsonHelper.fromObject(enrolMap));
+					params.put("std_tracks_json", JsonHelper.fromObject(tracksMap));
 					LogHelper.info(HttpClientHelper.post(dataUrl, params));
-				 } catch(IOException e) {
-					 LogHelper.error(e);
-				 }
+				} catch (IOException e) {
+					LogHelper.error(e);
+				}
 			}
 		}
 	}

src/cn/hmsoft/art/enrol/service/PayCmService.java

@@ -66,8 +66,8 @@ public class PayCmService {
 	}
 	
 	private Integer getAmount(String amount) {
-		Double f = Double.parseDouble(amount);
-		double result = f*100;
+		double f = Double.parseDouble(amount);
+		double result = f * 100;
 		return Integer.parseInt(ArtScoreHelper.toScoreString(result, 0));
 	}
 	

src/cn/hmsoft/art/enrol/service/PayXyService.java

@@ -254,7 +254,7 @@ public class PayXyService {
 		for (StdEnrol enrol : enrolArr) {
 			List<PayBill> billArr = this.daoBill.listPayBill(enrol.getEnrol_id(), enrol.getStd_id(),
 					enrol.getEnrol_fee_total());
-			if(billArr != null && billArr.size() > 0) {
+			if(billArr != null && !billArr.isEmpty()) {
 				PayBill bill = billArr.get(0);
 				if (bill.getBill_status().equals(PayXyUrl.Complete)) {
 					logger.error("数据出现问题，请检查！考生ID:" + bill.getCustomer_id() + ",报考ID:" + bill.getBusiness_id());

src/cn/hmsoft/art/enrol/service/StdWishService.java

@@ -23,7 +23,7 @@ public class StdWishService {
 	private CfAspectWishDao daoAspectWish;
 
 	public void saveStdWish(Integer std_id, Integer[] wish_ids, Integer adjust) {
-		this.checkConditon(wish_ids, adjust);
+		this.checkCondition(wish_ids, adjust);
 		CfAspectWish cfwish = daoAspectWish.find(wish_ids[0]);
 		this.deleteStdWish(std_id, cfwish.getAspect_id());
 		Integer seq = 0;
@@ -41,47 +41,46 @@ public class StdWishService {
 	
 	/**
 	 *  删除志愿
-	 * @param std_id
-	 * @param wish_ids
+	 * @param std_id 考生ID
+	 * @param aspect_id 专业ID
 	 */
 	private void deleteStdWish(Integer std_id,Integer aspect_id) {
 		daoStdWish.deleteByAspectId(std_id, aspect_id);
 	}
 
 
-	private void checkConditon(Integer[] wish_ids, Integer adjust) {
+	private void checkCondition(Integer[] wish_ids, Integer adjust) {
 		FrameAssertUtil.isNotNull(adjust, "必须选择是否服从调剂");
-		for(Integer i = 0;i<wish_ids.length;i++) {
-			for(Integer j=i+1;j<wish_ids.length;j++) {
-				if(wish_ids[i].equals(wish_ids[j])) {
+		for (int i = 0; i < wish_ids.length; i++) {
+			for (int j = i + 1; j < wish_ids.length; j++) {
+				if (wish_ids[i].equals(wish_ids[j])) {
 					throw new BusinessException("不能选择重复的志愿");
 				}
 			}
 		}
-		List<CfAspectWish> awArr = new ArrayList<CfAspectWish>();
-		for(Integer wish_id : wish_ids) {
+		List<CfAspectWish> awArr = new ArrayList<>();
+		for (Integer wish_id : wish_ids) {
 			awArr.add(this.daoAspectWish.find(wish_id));
 		}
 		boolean flag = false;
 		Integer index = 0;
-		for(int i = 0;i<awArr.size(); i++) {
-			CfAspectWish aw = awArr.get(i);
-			if(StringHelper.isNotEmpty(aw.getWish_group())) {
-				flag = true;
-				index ++;
-			}
-		}
-		if(flag && !index.equals(3)) {
+        for (CfAspectWish aw : awArr) {
+            if (StringHelper.isNotEmpty(aw.getWish_group())) {
+                flag = true;
+                index++;
+            }
+        }
+		if (flag && !index.equals(3)) {
 			throw new BusinessException("绘画（水彩画）、绘画（油画）、绘画（版画）三个志愿需一起填报或都不填报！");
 		}
-		
-		for(int i=0; i<awArr.size(); i++) {
+
+		for (int i = 0; i < awArr.size(); i++) {
 			CfAspectWish aw = awArr.get(i);
-			if(StringHelper.isNotEmpty(aw.getWish_group())) {
-				if(i+1<awArr.size() && StringHelper.isEmpty(awArr.get(i+1).getWish_group())) {
+			if (StringHelper.isNotEmpty(aw.getWish_group())) {
+				if (i + 1 < awArr.size() && StringHelper.isEmpty(awArr.get(i + 1).getWish_group())) {
 					throw new BusinessException("绘画（水彩画）、绘画（油画）、绘画（版画）三个志愿须连续填报");
 				}
-				if(i+2<awArr.size() && StringHelper.isEmpty(awArr.get(i+2).getWish_group())) {
+				if (i + 2 < awArr.size() && StringHelper.isEmpty(awArr.get(i + 2).getWish_group())) {
 					throw new BusinessException("绘画（水彩画）、绘画（油画）、绘画（版画）三个志愿须连续填报");
 				}
 				break;