设置方案查询时间

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AliPayServiceImpl.java

@@ -200,8 +200,11 @@ public class AliPayServiceImpl implements AliPayService {
         // 验证
         boolean flag = AlipaySignature.rsaCheckV1(params, ALIPAY_PUBLIC_KEY, CHARSET, "RSA2");
         // 获取支付宝的通知返回参数
-        String order_no = request.getParameter("out_trade_no"); // 获取订单号
-        String trade_status = request.getParameter("trade_status"); //获取订单状态
+        // 获取订单号
+        String order_no = request.getParameter("out_trade_no");
+
+        //获取订单状态
+        String trade_status = request.getParameter("trade_status");
         // 验证成功
         if (!flag || !"TRADE_SUCCESS".equals(trade_status)) {
             out.print("failure");

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java

@@ -62,6 +62,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
 
     @Autowired
     private VolunteerManager volunteerManager;
+
     @Override
     public R<VolunteerVo> getList(SchemeVo queryVo) {
         log.info("volunteer-service[]SchemeServiceImpl[]getList[]input.param.queryVo:" + queryVo);
@@ -350,8 +351,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         }
 
         //综合成绩,地区
-        Integer total=null==schemeVo.getTotal()?null:schemeVo.getTotal();
-        String local=null==schemeVo.getLocal()?null:schemeVo.getLocal();
+        Integer total = null == schemeVo.getTotal() ? null : schemeVo.getTotal();
+        String local = null == schemeVo.getLocal() ? null : schemeVo.getLocal();
 
         //1、根据userId获取用户信息
         User user = usersMapper.selectById(schemeVo.getUserId());
@@ -375,8 +376,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         }
 
         //(1)判断考生类型 文化课考生
-        //初始化返回数据总条数
-        int totalResult = 0;
         List<Volunteer> list = new ArrayList<>();
         VolunteerVo volunteerVo = new VolunteerVo();
         if (StudentType.CULTURE_STUDENT.getCode().equals(user.getExamType())) {
@@ -404,7 +403,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
                 return R.error("很抱歉，客户的成绩不满足报考条件，无法查询!");
             }
 
-            list = getCultureVipList( firstRule, secondRule, total,local,nameByIds,firstCulture, secondCulture);
+            list = getCultureVipList(firstRule, secondRule, total, local, nameByIds, firstCulture, secondCulture);
         }
 
         //(2)美术考生
@@ -430,9 +429,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             if (secondCulture < secondRule.getCultureMin() && secondMajor < secondRule.getProfessionMin()) {
                 return R.error("很抱歉，客户的成绩不满足报考条件，无法查询!");
             }
-
-            totalResult = firstRule.getNumber();
-            list = getArtsVipList(schemeVo, firstRule, secondRule, total, local,nameByIds);
+            list = getArtsVipList(schemeVo, firstRule, secondRule, total, local, nameByIds);
         }
 
         //(3)文学编导考生
@@ -458,9 +455,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             if (secondCulture < secondRule.getCultureMin() || secondMajor < secondRule.getProfessionMin()) {
                 return R.error("很抱歉，客户的专业成绩不满足报考条件，无法查询!");
             }
-
-            totalResult = firstRule.getNumber();
-            list = getLiteratureVipList(schemeVo, firstRule, secondRule, total,local, nameByIds);
+            list = getLiteratureVipList(schemeVo, firstRule, secondRule, total, local, nameByIds);
         }
 
         //(4)体育考生
@@ -489,8 +484,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
                 return R.error("很抱歉，客户的成绩不满足报考条件，无法查询!");
             }
 
-            totalResult = firstRule.getNumber();
-            list = getSportsVipList(totalv, firstRule, secondRule,total,local, nameByIds);
+            list = getSportsVipList(totalv, firstRule, secondRule, total, local, nameByIds);
         }
 
         //4判断是否展示全部方案
@@ -501,6 +495,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             } else {
                 result = list.subList(0, 10);
             }
+            //设置查询时间
+            SetQueryTime(result);
             volunteerVo.setUserId(user.getId());
             volunteerVo.setVolunteers(result);
             return R.ok(volunteerVo);
@@ -509,6 +505,9 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         //排序
         list.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
         volunteerVo.setUserId(user.getId());
+
+        //设置查询时间
+        SetQueryTime(list);
         volunteerVo.setVolunteers(list);
         volunteerVo.setTotal(list.size());
         return R.ok(volunteerVo);
@@ -521,9 +520,9 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
      * @param professionNames 专业名称
      * @return vip文化生志愿列表
      */
-    private List<Volunteer> getCultureVipList( AdmissionRule firstRule, AdmissionRule secondRule, Integer total,String local,
-                                               List<String> professionNames,
-                                           double firstCulture, double secondCulture) {
+    private List<Volunteer> getCultureVipList(AdmissionRule firstRule, AdmissionRule secondRule, Integer total, String local,
+                                              List<String> professionNames,
+                                              double firstCulture, double secondCulture) {
         double cultureMax = firstRule.getCultureMax();
         double cultureMin = firstRule.getCultureMin();
 
@@ -533,14 +532,14 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         map.put("professionNames", professionNames);
         if (firstCulture < cultureMax && firstCulture >= cultureMin) {
             map.put("type", SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode());
-            map.put("total",total );
-            map.put("local",local);
+            map.put("total", total);
+            map.put("local", local);
             list = volunteerMapper.getVolunteerListVip(map);
 
         } else {
             map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_MAJOR.getCode());
-            map.put("total",total );
-            map.put("local",local);
+            map.put("total", total);
+            map.put("local", local);
             list = volunteerMapper.getVolunteerListVip(map);
         }
         return list;
@@ -554,8 +553,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
      * @param professionNames 专业名称
      * @return 志愿方案列表
      */
-    private List<Volunteer> getArtsVipList(SchemeVipVo schemeVo,AdmissionRule firstRule, AdmissionRule secondRule,Integer total,String local,
-                                         List<String> professionNames) {
+    private List<Volunteer> getArtsVipList(SchemeVipVo schemeVo, AdmissionRule firstRule, AdmissionRule secondRule, Integer total, String local,
+                                           List<String> professionNames) {
         //本科类比分 = 本年录取分 -去年录取分 + 考生分数
         double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(schemeVo.getCultureGrade());
         double major = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + Double.parseDouble(schemeVo.getMajorGrade());
@@ -568,8 +567,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         List<Volunteer> list = new ArrayList<>();
         if (culture >= firstRule.getCultureMin() && major >= firstRule.getProfessionMin()) {
             map.put("type", SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode());
-            map.put("total",total );
-            map.put("local",local);
+            map.put("total", total);
+            map.put("local", local);
             list = volunteerMapper.getVolunteerListVip(map);
             return list;
         }
@@ -585,8 +584,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         if (secondCulture >= secondRule.getCultureMin() && secondMajor >= secondRule.getProfessionMin()) {
 
             map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_ARTS.getCode());
-            map.put("total",total );
-            map.put("local",local);
+            map.put("total", total);
+            map.put("local", local);
             list = volunteerMapper.getVolunteerListVip(map);
         }
         return list;
@@ -601,8 +600,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
      * @param professionNames 专业名称
      * @return 志愿方案列表
      */
-    private List<Volunteer> getLiteratureVipList(SchemeVipVo queryVo, AdmissionRule firstRule, AdmissionRule secondRule,Integer total,String local,
-                                              List<String> professionNames) {
+    private List<Volunteer> getLiteratureVipList(SchemeVipVo queryVo, AdmissionRule firstRule, AdmissionRule secondRule, Integer total, String local,
+                                                 List<String> professionNames) {
         //本科类比分 = 本年录取分 -去年录取分 + 考生分数
         double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(queryVo.getCultureGrade());
         double major = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + Double.parseDouble(queryVo.getMajorGrade());
@@ -615,8 +614,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         if (culture >= firstRule.getCultureMin() && major >= firstRule.getProfessionMin()) {
 
             map.put("type", SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode());
-            map.put("total",total );
-            map.put("local",local);
+            map.put("total", total);
+            map.put("local", local);
             list = volunteerMapper.getVolunteerListVip(map);
             return list;
         }
@@ -629,8 +628,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         //2、考生是否能报取美术专科
         if (cultureSecond >= secondRule.getCultureMin() && majorSecond >= secondRule.getProfessionMin()) {
             map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_LITERATURE.getCode());
-            map.put("total",total );
-            map.put("local",local);
+            map.put("total", total);
+            map.put("local", local);
             list = volunteerMapper.getVolunteerListVip(map);
         }
 
@@ -646,8 +645,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
      * @param professionNames 专业名称
      * @return 志愿方案列表
      */
-    private List<Volunteer> getSportsVipList(double total, AdmissionRule firstRule, AdmissionRule secondRule,Integer totalv,String local,
-                                           List<String> professionNames) {
+    private List<Volunteer> getSportsVipList(double total, AdmissionRule firstRule, AdmissionRule secondRule, Integer totalv, String local,
+                                             List<String> professionNames) {
         Map<String, Object> map = new HashMap<>(16);
         map.put("professionNames", professionNames);
 
@@ -655,8 +654,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         List<Volunteer> list = new ArrayList<>();
         if (total >= firstRule.getCultureMin()) {
             map.put("type", SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode());
-            map.put("total",totalv );
-            map.put("local",local);
+            map.put("total", totalv);
+            map.put("local", local);
             list = volunteerMapper.getVolunteerListVip(map);
             return list;
         }
@@ -664,8 +663,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         //2、考生是否能报取体育专科
         if (total >= secondRule.getCultureMin()) {
             map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode());
-            map.put("total",totalv );
-            map.put("local",local);
+            map.put("total", totalv);
+            map.put("local", local);
             list = volunteerMapper.getVolunteerListVip(map);
         }
 
@@ -782,7 +781,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         if (secondCulture > firstRule.getCultureMin() && secondMajor < firstRule.getProfessionMin()) {
             List<Volunteer> volunteers = new ArrayList<>();
             volunteers = volunteerMapper.getVolunteerByType(SchemeTypeEnums.JUNIOR_COLLEGE_LITERATURE.getCode());
-            secondRuleTotal=Double.valueOf(volunteers.get(0).getLowestMark())-secondRule.getUpMark()+1;
+            secondRuleTotal = Double.valueOf(volunteers.get(0).getLowestMark()) - secondRule.getUpMark() + 1;
         }
 
         //2、考生是否能报取美术专科
@@ -858,10 +857,10 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         double totalSecond = majorSecond * 750 / 300 * 0.3 + cultureSecond * 0.7;
 
         //判断文化成绩大于本科文化成绩最低分但专业成绩小于本科文化成绩最低分时进行文化成绩降分处理查询
-       if (cultureSecond > firstRule.getCultureMin() && majorSecond < firstRule.getProfessionMin()) {
-           List<Volunteer> volunteers = new ArrayList<>();
+        if (cultureSecond > firstRule.getCultureMin() && majorSecond < firstRule.getProfessionMin()) {
+            List<Volunteer> volunteers = new ArrayList<>();
             volunteers = volunteerMapper.getVolunteerByType(SchemeTypeEnums.JUNIOR_COLLEGE_LITERATURE.getCode());
-            totalSecond=Double.valueOf(volunteers.get(0).getLowestMark())-secondRule.getUpMark()+1;
+            totalSecond = Double.valueOf(volunteers.get(0).getLowestMark()) - secondRule.getUpMark() + 1;
         }
 
         log.info(classNames.toString());
@@ -984,7 +983,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
     }
 
 
-
     /**
      * 补充不足数量的志愿数
      *
@@ -1086,4 +1084,17 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         return result;
     }
 
+    /**
+     * 设置查询时间
+     *
+     * @param list 志愿列表
+     */
+    private void SetQueryTime(List<Volunteer> list) {
+        if (!CollectionUtils.isEmpty(list)) {
+            for (Volunteer volunteer : list) {
+                volunteer.setQueryTime(new Date());
+            }
+        }
+    }
+
 }

wisenergy-service/src/main/java/cn/wisenergy/service/common/PdfUtil.java

 package cn.wisenergy.service.common;
 
-import cn.wisenergy.model.app.SchemeQueryRecord;
 import cn.wisenergy.model.app.Volunteer;
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.BaseFont;

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeController.java

@@ -3,7 +3,6 @@ package cn.wisenergy.web.admin.controller.app;
 import cn.wisenergy.common.expection.BaseException;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.SchemeInfo;
-import cn.wisenergy.model.app.Volunteer;
 import cn.wisenergy.model.vo.SchemeQueryVo;
 import cn.wisenergy.model.vo.SchemeVo;
 import cn.wisenergy.model.vo.VolunteerVo;