[CMT]提交

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

@@ -364,6 +364,8 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                count2 = (Long) rstotal2.get(0).get("total1");
            }
            activityDO1.setTotal(count2);
            ActivityRuleDO activityRuleDO  = activityRuleDao.selectByActivityId(activityDO1.getId());
            activityDO1.setActivityRuleDO(activityRuleDO);
        }
        String sqlcount = "SELECT count(1) AS total" +
                " FROM wlyy_health_bank_activity " +
@@ -1159,13 +1161,16 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        for (ActivityDO activityDO:activityDOList){
            ActivityRuleDO activityRuleDO = activityRuleDao.selectByActivityId(activityDO.getId());
            JSONObject object = JSONObject.parseObject(activityRuleDO.getValue2());
            String activityOfflineTime = object.getString("activityOfflineTime");
            String activityOfflineTime = object.getString("deadLine");
            List<String> idList = Arrays.asList(activityOfflineTime.split(","));
            if (idList !=null && idList.size()!=0){
                String startTime = idList.get(0);
                Date startDate = DateUtil.strToDateLong(startTime);
                String endTime = idList.get(1);
                Date endDate = DateUtil.strToDateLong(endTime);
                String nowTime =  DateUtil.dateToStrLong(DateUtil.getNowDate());
                if((startTime.compareTo(nowTime)==-1&&endTime.compareTo(nowTime)==1)||startTime.compareTo(nowTime)==0||endTime.compareTo(nowTime)==0){
                Date nowDate = DateUtil.strToDateLong(nowTime);
                if(startDate.getTime()<=nowDate.getTime()&&endDate.getTime()>=nowDate.getTime()){
                    activityDO.setFlag(1);
                }else {
                    activityDO.setFlag(0);
@@ -1189,6 +1194,14 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
            }
        }
        List<ActivityDO> activityDOList1 = new ArrayList<>();
        for (ActivityDO activityDO :activityDOList){
            if(activityDO.getFlag()==1){
                activityDOList1.add(0,activityDO);
            }else {
                activityDOList1.add(activityDO);
            }
        }
        String sqlCount ="select count(1) AS total from wlyy_health_bank_activity hba right join wlyy_health_bank_task_patient_detail htpd on htpd.activity_id=hba.id " +
                "where hba.del_flag=1 and hba.type='竞走' order by hba.create_time desc ";
        List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sqlCount);
@@ -1196,7 +1209,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        if(rstotal!=null&&rstotal.size()>0){
            count = (Long) rstotal.get(0).get("total");
        }
        return MixEnvelop.getSuccessListWithPage(HealthBankMapping.api_success,activityDOList,page,size,count);
        return MixEnvelop.getSuccessListWithPage(HealthBankMapping.api_success,activityDOList1,page,size,count);
    }