Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -407,15 +407,16 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
            //上线
            String ruleJson=null!=activityRuleDO?activityRuleDO.getValue2():"";
            JSONObject obj=JSONObject.parseObject(ruleJson);
            SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm");
            SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
            SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
            //报名截止时间
            Date registrationTime=null!=obj.get("registrationTime")? sdf.parse(obj.get("registrationTime").toString()):null;
            Date registrationTime=(null!=obj.get("registrationTime")? DateUtil.strToDate(sdf2.format(sdf1.parse(obj.get("registrationTime").toString())),"yyyy-MM-dd HH:mm"):null);
            //参与截止时间
            Date deadLine=null!=obj.get("deadLine")? sdf.parse(obj.get("deadLine").toString()):null;
            Date deadLine=(null!=obj.get("deadLine")? DateUtil.strToDate(sdf2.format(sdf1.parse(obj.get("deadLine").toString())),"yyyy-MM-dd HH:mm"):null);
            //活动下线时间
            Date activityOfflineTime=null!=obj.get("activityOfflineTime")? sdf.parse(obj.get("activityOfflineTime").toString()):null;
            Date activityOfflineTime=(null!=obj.get("activityOfflineTime")? DateUtil.strToDate(sdf2.format(sdf1.parse(obj.get("activityOfflineTime").toString())),"yyyy-MM-dd HH:mm"):null);
            //获取当前时间
            Date now = DateUtil.strToDate(sdf.format(new Date()),"yyyy-MM-dd HH:mm");
            Date now = DateUtil.strToDate(sdf2.format(new Date()),"yyyy-MM-dd HH:mm");
            if(activityOfflineTime.compareTo(now)<=0){
                //活动下线
                activityDO.setStatus(2);
@@ -451,9 +452,9 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
            activityRuleDO= activityRuleDao.selectByActivityId(id);
            activityDO.setActivityRuleDO(activityRuleDO);
        }
        obj.put("value1",activityRuleDO.getValue1());
        obj.put("value2",activityRuleDO.getValue2());
        obj.put("value3",activityRuleDO.getValue3());
        obj.put("value1", null == activityRuleDO ? null : activityRuleDO.getValue1());
        obj.put("value2", null == activityRuleDO ? null : activityRuleDO.getValue2());
        obj.put("value3", null == activityRuleDO ? null : activityRuleDO.getValue3());
        return obj;
    }