Tenlion/system-operator
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
Renpc-kilig 2024-05-29 16:39:32 +08:00
parent f4254053f5
commit 2605d1b157
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/com/tenlion/operator/controller/api/content/ContentController.java
View File

@ -113,7 +113,7 @@ public class ContentController extends DefaultBaseController {
@ApiImplicitParam(name = "contentId", value = "内容主体表ID", paramType = "path")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("cancel/{contentId}")
@PutMapping("cancel/{contentId}")
public SuccessResult cancel(@PathVariable("contentId") String contentId) {
contentService.cancel(contentId);
return new SuccessResult();

14
src/main/java/cn/com/tenlion/operator/service/news/impl/NewsServiceImpl.java
View File

@ -1,6 +1,7 @@
package cn.com.tenlion.operator.service.news.impl;
import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.module.dictionary.pojo.dtos.DataDTO;
import ink.wgink.module.dictionary.service.IDataService;
import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.result.SuccessResult;
@ -146,9 +147,12 @@ public class NewsServiceImpl extends DefaultBaseService implements INewsService
public List<NewsDTO> list(Map<String, Object> params) {
List<NewsDTO> list = newsDao.list(params);
for (NewsDTO newsDTO : list) {
newsDTO.setNewsTypeName(dataService.get(newsDTO.getNewsType()).getDataName());
if(StringUtils.isNotEmpty(newsDTO.getPublishTime())) {
newsDTO.setPublishTimeSub1(newsDTO.getPublishTime().substring(0,7));
DataDTO dataDTO = dataService.get(newsDTO.getNewsType());
if (null != dataDTO) {
newsDTO.setNewsTypeName(dataDTO.getDataName());
}
if (StringUtils.isNotEmpty(newsDTO.getPublishTime())) {
newsDTO.setPublishTimeSub1(newsDTO.getPublishTime().substring(0, 7));
newsDTO.setPublishTimeSub2(newsDTO.getPublishTime().substring(8));
}
}
@ -183,8 +187,8 @@ public class NewsServiceImpl extends DefaultBaseService implements INewsService
public List<NewsDTO> listTop(Map<String, Object> params) {
List<NewsDTO> newsDTOS = newsDao.listTop(params);
for (NewsDTO newsDTO : newsDTOS) {
if(StringUtils.isNotEmpty(newsDTO.getPublishTime())) {
newsDTO.setPublishTimeSub1(newsDTO.getPublishTime().substring(0,7));
if (StringUtils.isNotEmpty(newsDTO.getPublishTime())) {
newsDTO.setPublishTimeSub1(newsDTO.getPublishTime().substring(0, 7));
newsDTO.setPublishTimeSub2(newsDTO.getPublishTime().substring(8));
}
}

2
src/main/resources/templates/agreementportal/list.html
View File

@ -241,7 +241,7 @@
area: ['100%', '100%'],
shadeClose: true,
anim: 2,
content: top.restAjax.path('route/agreementportal/update?agreementportalId={agreementportalId}', [checkDatas[0].agreementportalId]),
content: top.restAjax.path('route/agreementportal/update?agreementId={agreementId}', [checkDatas[0].agreementId]),
end: function() {
reloadTable();
}

8
src/main/resources/templates/agreementportal/update.html
View File

@ -77,7 +77,7 @@
var form = layui.form;
var laytpl = layui.laytpl;
var laydate = layui.laydate;
var agreementportalId = top.restAjax.params(window.location.href).agreementportalId;
var agreementId = top.restAjax.params(window.location.href).agreementId;
var wangEditor = window.wangEditor;
var wangEditorObj = {};
@ -90,7 +90,7 @@
form.render('select', 'agreementportalTypeSelectTemplateBox');
var selectObj = {};
selectObj['agreementportalType'] = selectValue;
selectObj['agreementType'] = selectValue;
form.val('dataForm', selectObj);
}, function(code, data) {
top.dialog.msg(data.msg);
@ -137,7 +137,7 @@
// 初始化内容
function initData() {
var loadLayerIndex;
top.restAjax.get(top.restAjax.path('api/agreementportal/get/{agreementportalId}', [agreementportalId]), {}, null, function(code, data) {
top.restAjax.get(top.restAjax.path('api/agreementportal/get/{agreementId}', [agreementId]), {}, null, function(code, data) {
var dataFormData = {};
for(var i in data) {
dataFormData[i] = data[i] +'';
@ -145,7 +145,7 @@
form.val('dataForm', dataFormData);
form.render(null, 'dataForm');
initContentRichText(data['content']);
initagreementportalTypeSelect(data['agreementportalType']);
initagreementportalTypeSelect(data['agreementType']);
// 设置开关值
/*if('1' == data['isOpen']) {
$('#isOpenSwitch').prop("checked", true)

3
src/main/resources/templates/content/list.html
View File

@ -164,7 +164,8 @@
top.dialog.confirm(top.dataMessage.commit, function(index) {
top.dialog.close(index);
var loadLayerIndex;
top.restAjax.get(top.restAjax.path('api/content/cancel/{contentId}', [insertData.contentId]), null, null, function(code, data) {
top.restAjax.put(top.restAjax.path('api/content/cancel/{contentId}', [insertData.contentId]), null, null, function(code, data) {
top.dialog.msg('取消发布成功');
reloadTable();
}, function(code, data) {
top.dialog.msg(data.msg);