diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/WorkJournalismEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/WorkJournalismEnum.java new file mode 100644 index 00000000..2c96907f --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/WorkJournalismEnum.java @@ -0,0 +1,34 @@ +package com.ruoyi.common.enums; + +/** + * 工作新闻枚举 + * @author ruoyi + */ +public enum WorkJournalismEnum { + + DFB("1", "待发布"), + YFB("2", "已发布"), + YCH("3", "已撤回"), + YZD("1", "已置顶"), + BZD("0", "不置顶"); + + private final String code; + private final String info; + + WorkJournalismEnum(String code, String info) + { + this.code = code; + this.info = info; + } + + public String getCode() + { + return code; + } + + public String getInfo() + { + return info; + } + +} diff --git a/ruoyi-ui/src/api/work/workJournalism.js b/ruoyi-ui/src/api/work/workJournalism.js index 09808f89..30a4e5e8 100644 --- a/ruoyi-ui/src/api/work/workJournalism.js +++ b/ruoyi-ui/src/api/work/workJournalism.js @@ -9,6 +9,15 @@ export function listWorkJournalism(query) { }) } +// 查询集团新闻统计 +export function findWorkJournalismGroupStatus(query) { + return request({ + url: '/work/workJournalism/findWorkJournalismGroupStatus', + method: 'get', + params: query + }) +} + // 查询集团新闻详细 export function getWorkJournalism(id) { return request({ diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 836e1931..fb75b12e 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -111,7 +111,6 @@ export default { }, }, created() { - debugger; this.getCode(); this.getCookie(); location.hash = "#/login?redirect=%2Findex"; diff --git a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue index e79443a2..14d8039e 100644 --- a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue +++ b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue @@ -525,19 +525,23 @@ export default { findGroupCount(this.queryParams).then((response) => { if (response && response.data) { let sum = 0; + this.tabs.dzg = "待整改（0）"; if (response.data.check0) { sum += response.data.check0; this.tabs.dzg = "待整改（" + response.data.check0 + "）"; } + this.tabs.dqr = "待复检（0）"; if (response.data.check1) { sum += response.data.check1; this.tabs.dqr = "待复检（" + response.data.check1 + "）"; } + this.tabs.ycl = "整改完成（0）"; if (response.data.check4) { sum += response.data.check4; this.tabs.ycl = "整改完成（" + response.data.check4 + "）"; } this.tabs.all = "全部数据（" + sum + "）"; + this.tabs.zgcs = "整改超时（0）"; if (response.data.check99) { this.tabs.zgcs = "整改超时（" + response.data.check99 + "）"; } diff --git a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue index cc603e4d..e07ac1e9 100644 --- a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue +++ b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue @@ -519,19 +519,23 @@ export default { findGroupCount(this.queryParams).then((response) => { if (response && response.data) { let sum = 0; + this.tabs.dzg = "待整改（0）"; if (response.data.check0) { sum += response.data.check0; this.tabs.dzg = "待整改（" + response.data.check0 + "）"; } + this.tabs.dqr = "待复检（0）"; if (response.data.check1) { sum += response.data.check1; this.tabs.dqr = "待复检（" + response.data.check1 + "）"; } + this.tabs.ycl = "整改完成（0）"; if (response.data.check4) { sum += response.data.check4; this.tabs.ycl = "整改完成（" + response.data.check4 + "）"; } this.tabs.all = "全部数据（" + sum + "）"; + this.tabs.zgcs = "整改超时（0）"; if (response.data.check99) { this.tabs.zgcs = "整改超时（" + response.data.check99 + "）"; } diff --git a/ruoyi-ui/src/views/work/workJournalism/index.vue b/ruoyi-ui/src/views/work/workJournalism/index.vue index b59925ae..19b739e9 100644 --- a/ruoyi-ui/src/views/work/workJournalism/index.vue +++ b/ruoyi-ui/src/views/work/workJournalism/index.vue @@ -1,51 +1,22 @@ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkJournalismController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkJournalismController.java index 0f2d57b6..2ec74ce7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkJournalismController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkJournalismController.java @@ -46,6 +46,16 @@ public class WorkJournalismController extends BaseController return getDataTable(list); } + /** + * 查询集团新闻列表 + */ + @PreAuthorize("@ss.hasPermi('work:workJournalism:list')") + @GetMapping("/findWorkJournalismGroupStatus") + public AjaxResult findWorkJournalismGroupStatus(WorkJournalism workJournalism) + { + return success(workJournalismService.findWorkJournalismGroupStatus(workJournalism)); + } + /** * 导出集团新闻列表 */ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkJournalism.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkJournalism.java index 559f19a1..ddbbf596 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkJournalism.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkJournalism.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + /** * 集团新闻对象 work_journalism * @@ -74,6 +76,8 @@ public class WorkJournalism extends BaseEntity @Excel(name = "创建用户") private String createUser; + private Date createDate; + public void setId(Long id) { this.id = id; @@ -210,6 +214,14 @@ public class WorkJournalism extends BaseEntity return createUser; } + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkJournalismMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkJournalismMapper.java index 562ac974..93ce34d3 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkJournalismMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkJournalismMapper.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.work.mapper; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.work.domain.WorkJournalism; /** @@ -27,6 +29,14 @@ public interface WorkJournalismMapper */ public List selectWorkJournalismList(WorkJournalism workJournalism); + /** + * 查询集团新闻统计 + * + * @param workJournalism 集团新闻 + * @return 集团新闻集合 + */ + public List> findWorkJournalismGroupStatus(WorkJournalism workJournalism); + /** * 新增集团新闻 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkJournalismService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkJournalismService.java index 8057113b..5306c487 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkJournalismService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkJournalismService.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.work.service; import java.util.List; +import java.util.Map; + import com.yanzhu.jh.work.domain.WorkJournalism; /** @@ -27,6 +29,14 @@ public interface IWorkJournalismService */ public List selectWorkJournalismList(WorkJournalism workJournalism); + /** + * 查询集团新闻统计 + * + * @param workJournalism 集团新闻 + * @return 集团新闻集合 + */ + public Map findWorkJournalismGroupStatus(WorkJournalism workJournalism); + /** * 新增集团新闻 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkJournalismServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkJournalismServiceImpl.java index adf4af5b..d01e6416 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkJournalismServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkJournalismServiceImpl.java @@ -1,6 +1,11 @@ package com.yanzhu.jh.work.service.impl; +import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import com.ruoyi.common.enums.WorkJournalismEnum; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -44,6 +49,22 @@ public class WorkJournalismServiceImpl implements IWorkJournalismService return workJournalismMapper.selectWorkJournalismList(workJournalism); } + /** + * 查询集团新闻统计 + * + * @param workJournalism 集团新闻 + * @return 集团新闻集合 + */ + public Map findWorkJournalismGroupStatus(WorkJournalism workJournalism){ + List> dataList = workJournalismMapper.findWorkJournalismGroupStatus(workJournalism); + Map dataMap = new HashMap<>(); + if(dataList!=null && dataList.size()>0){ + for(Map map:dataList){ + dataMap.put("status"+map.get("statusFlag"),map.get("total")); + } + } + return dataMap; + } /** * 新增集团新闻 * @@ -53,6 +74,8 @@ public class WorkJournalismServiceImpl implements IWorkJournalismService @Override public int insertWorkJournalism(WorkJournalism workJournalism) { + workJournalism.setStatusFlag(WorkJournalismEnum.DFB.getCode()); + workJournalism.setTopFlag(WorkJournalismEnum.BZD.getCode()); workJournalism.setCreateBy(SecurityUtils.getUsername()); workJournalism.setCreateTime(DateUtils.getNowDate()); return workJournalismMapper.insertWorkJournalism(workJournalism); @@ -67,6 +90,10 @@ public class WorkJournalismServiceImpl implements IWorkJournalismService @Override public int updateWorkJournalism(WorkJournalism workJournalism) { + if(WorkJournalismEnum.YFB.getCode().equals(workJournalism.getStatusFlag())){ + workJournalism.setCreateUser(SecurityUtils.getLoginUser().getUser().getNickName()); + workJournalism.setCreateDate(new Date()); + } workJournalism.setUpdateBy(SecurityUtils.getUsername()); workJournalism.setUpdateTime(DateUtils.getNowDate()); return workJournalismMapper.updateWorkJournalism(workJournalism); diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkJournalismMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkJournalismMapper.xml index d7c46b5c..7715e664 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkJournalismMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkJournalismMapper.xml @@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -28,19 +29,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, title, main_image, intro, content, type, source, open_url, read_num, status_flag, top_flag, files, sort_num, is_del, create_user, create_by, create_time, update_by, update_time, remark from work_journalism + select id, title, main_image, intro, content, type, source, open_url, read_num, status_flag, top_flag, files, sort_num, is_del, create_user, create_date, create_by, create_time, update_by, update_time, remark from work_journalism + +