|
@ -13,6 +13,7 @@ import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
|
|
|
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
|
|
|
import com.yihu.jw.entity.base.user.UserDO;
|
|
|
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
|
|
|
import com.yihu.jw.util.date.DateUtil;
|
|
|
import com.yihu.jw.utils.EntityUtils;
|
|
|
import com.yihu.mysql.query.BaseJpaService;
|
|
|
import org.apache.commons.collections4.IterableUtils;
|
|
@ -182,9 +183,9 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
|
|
|
jsonObject.put("launch",adminDO.getLaunch());
|
|
|
jsonObject.put("forbidden",adminDO.getForbidden());
|
|
|
jsonObject.put("title",adminDO.getTitle());
|
|
|
jsonObject.put("createTime",adminDO.getCreateTime());
|
|
|
jsonObject.put("createTime",DateUtil.dateToStrLong(adminDO.getCreateTime()));
|
|
|
jsonObject.put("createUser",adminDO.getCreateUser());
|
|
|
jsonObject.put("updateTime",adminDO.getUpdateTime());
|
|
|
jsonObject.put("updateTime",DateUtil.dateToStrLong(adminDO.getUpdateTime()));
|
|
|
jsonObject.put("updateUser",adminDO.getUpdateUser());
|
|
|
jsonObject.put("publishLocation",adminDO.getPublishLocation());
|
|
|
if (adminDO.getPublishLocation() != null) {
|
|
@ -235,6 +236,10 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
|
|
|
one.setUpdateTime(new Date());
|
|
|
one.setCategoryCode(advertisementPuttingAdminDO.getCategoryCode());
|
|
|
one.setCategoryName(advertisementPuttingAdminDO.getCategoryCode()==1?"视频":"图片");
|
|
|
if (!"0".equals(advertisementPuttingAdminDO.getPublishLocation())) {
|
|
|
one.setLinkUrl(advertisementPuttingAdminDO.getLinkUrl());
|
|
|
one.setContent(advertisementPuttingAdminDO.getContent());
|
|
|
}
|
|
|
advertisementPuttingAdminDAO.save(one);
|
|
|
return one;
|
|
|
}
|
|
@ -301,6 +306,10 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
|
|
|
stringObjectMap.put("publishLocationName","动态列表");
|
|
|
}
|
|
|
}
|
|
|
Date createTime = (Date) stringObjectMap.get("createTime");
|
|
|
stringObjectMap.put("createTime",DateUtil.dateToStrLong(createTime));
|
|
|
Date updateTime = (Date) stringObjectMap.get("updateTime");
|
|
|
stringObjectMap.put("updateTime",DateUtil.dateToStrLong(updateTime));
|
|
|
}
|
|
|
Long count = jdbcTemplate.queryForObject(countSql+from,Long.class);
|
|
|
result.put("count",count);
|