Compare commits
2 Commits
d42b51d172
...
c117fe75a3
| Author | SHA1 | Date |
|---|---|---|
liuwu
|
c117fe75a3 | |
|
liuwu
|
5da417b069 |
|
|
@ -32,6 +32,25 @@ import com.cyx.web.base.service.ITAmentPartyAffairsService;
|
|||
@RequestMapping("/base/affairs")
|
||||
public class TAmentPartyAffairsController extends BaseController
|
||||
{
|
||||
/**
|
||||
* 待办预警
|
||||
*/
|
||||
@GetMapping("/warn")
|
||||
public String warn()
|
||||
{
|
||||
return prefix + "/warn";
|
||||
}
|
||||
|
||||
@RequiresPermissions("base:affairs:list")
|
||||
@PostMapping("/warnList")
|
||||
@ResponseBody
|
||||
public TableDataInfo warnList(TAmentPartyAffairs tAmentPartyAffairs)
|
||||
{
|
||||
startPage();
|
||||
List<TAmentPartyAffairs> list = tAmentPartyAffairsService.warnList(tAmentPartyAffairs);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
private String prefix = "base/affairs";
|
||||
|
||||
@Autowired
|
||||
|
|
|
|||
|
|
@ -44,6 +44,15 @@ public class TAmentPartyAffairs extends BaseEntity
|
|||
/** 达标分 */
|
||||
@Excel(name = "达标分")
|
||||
private String score;
|
||||
private String nowScore;
|
||||
|
||||
public String getNowScore() {
|
||||
return nowScore;
|
||||
}
|
||||
|
||||
public void setNowScore(String nowScore) {
|
||||
this.nowScore = nowScore;
|
||||
}
|
||||
|
||||
/** 考核方式 */
|
||||
@Excel(name = "考核方式")
|
||||
|
|
@ -271,6 +280,7 @@ public class TAmentPartyAffairs extends BaseEntity
|
|||
.append("demand", getDemand())
|
||||
.append("detailed", getDetailed())
|
||||
.append("score", getScore())
|
||||
.append("nowScore", getNowScore())
|
||||
.append("method", getMethod())
|
||||
.append("head", getHead())
|
||||
.append("reviewed", getReviewed())
|
||||
|
|
|
|||
|
|
@ -76,4 +76,6 @@ public interface TAmentPartyAffairsMapper
|
|||
List<Map<String,Object>> finishedstaticList(TAmentPartyAffairs tAmentPartyAffairs);
|
||||
|
||||
List<TAmentPartyAffairs> selectTAmentPartyAffairsListAll(TAmentPartyAffairs tAmentPartyAffairs);
|
||||
|
||||
List<TAmentPartyAffairs> warnList(TAmentPartyAffairs tAmentPartyAffairs);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,4 +76,6 @@ public interface ITAmentPartyAffairsService
|
|||
List<Map<String,Object>> finishedstaticList(TAmentPartyAffairs tAmentPartyAffairs);
|
||||
|
||||
List<TAmentPartyAffairs> selectTAmentPartyAffairsListAll(TAmentPartyAffairs tAmentPartyAffairs);
|
||||
|
||||
List<TAmentPartyAffairs> warnList(TAmentPartyAffairs tAmentPartyAffairs);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,11 @@ public class TAmentPartyAffairsServiceImpl implements ITAmentPartyAffairsService
|
|||
return tAmentPartyAffairsMapper.selectTAmentPartyAffairsListAll(tAmentPartyAffairs);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TAmentPartyAffairs> warnList(TAmentPartyAffairs tAmentPartyAffairs){
|
||||
return tAmentPartyAffairsMapper.warnList(tAmentPartyAffairs);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增党务
|
||||
*
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ spring:
|
|||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://192.168.199.101:3306/cyx_ament?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://39.106.198.243:8100/cyx_ament?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: 123456Aa
|
||||
password: cyx@2022Aa.
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ ruoyi:
|
|||
# 版权年份
|
||||
copyrightYear: 2023
|
||||
# 实例演示开关
|
||||
demoEnabled: true
|
||||
demoEnabled: false
|
||||
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
|
||||
profile: D:/ruoyi/uploadPath
|
||||
# 获取ip地址开关
|
||||
|
|
@ -16,7 +16,7 @@ ruoyi:
|
|||
# 开发环境配置
|
||||
server:
|
||||
# 服务器的HTTP端口，默认为80
|
||||
port: 8101
|
||||
port: 8088
|
||||
servlet:
|
||||
# 应用的访问路径
|
||||
context-path: /
|
||||
|
|
|
|||
|
|
@ -0,0 +1,197 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
||||
<head>
|
||||
<th:block th:include="include :: header('党务列表')" />
|
||||
</head>
|
||||
<body class="gray-bg">
|
||||
<div class="container-div">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 search-collapse">
|
||||
<form id="formId">
|
||||
<div class="select-list">
|
||||
<ul>
|
||||
<input type="hidden" name="type" value="党务及意识形态"/>
|
||||
<!-- <li>-->
|
||||
<!-- <label>单位名称：</label>-->
|
||||
<!-- <input type="text" name="unit"/>-->
|
||||
<!-- </li>-->
|
||||
<li>
|
||||
<label>目标项：</label>
|
||||
<input type="text" name="target"/>
|
||||
</li>
|
||||
<!-- <li>-->
|
||||
<!-- <label>考核方式：</label>-->
|
||||
<!-- <input type="text" name="method"/>-->
|
||||
<!-- </li>-->
|
||||
<!-- <li>-->
|
||||
<!-- <label>负责人：</label>-->
|
||||
<!-- <input type="text" name="head"/>-->
|
||||
<!-- </li>-->
|
||||
<!-- <li>-->
|
||||
<!-- <label>审核人：</label>-->
|
||||
<!-- <input type="text" name="reviewed"/>-->
|
||||
<!-- </li>-->
|
||||
<!-- <li>-->
|
||||
<!-- <label>完成截止时间：</label>-->
|
||||
<!-- <input type="text" class="time-input" placeholder="请选择完成截止时间" name="finishDate"/>-->
|
||||
<!-- </li>-->
|
||||
<!-- <li>-->
|
||||
<!-- <label>操作人员ID：</label>-->
|
||||
<!-- <input type="text" name="perId"/>-->
|
||||
<!-- </li>-->
|
||||
<!-- <li>-->
|
||||
<!-- <label>部门ID：</label>-->
|
||||
<!-- <input type="text" name="deptId"/>-->
|
||||
<!-- </li>-->
|
||||
<!-- <li>-->
|
||||
<!-- <label>支部ID：</label>-->
|
||||
<!-- <input type="text" name="branchId"/>-->
|
||||
<!-- </li>-->
|
||||
<li>
|
||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
||||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="btn-group-sm" id="toolbar" role="group">
|
||||
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="base:affairs:add">
|
||||
<i class="fa fa-plus"></i> 添加
|
||||
</a>
|
||||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="base:affairs:edit">
|
||||
<i class="fa fa-edit"></i> 修改
|
||||
</a>
|
||||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove">
|
||||
<i class="fa fa-remove"></i> 删除
|
||||
</a>
|
||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">
|
||||
<i class="fa fa-download"></i> 导出
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
|
||||
var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
|
||||
var prefix = ctx + "base/affairs";
|
||||
|
||||
$(function() {
|
||||
var options = {
|
||||
url: prefix + "/warnList",
|
||||
createUrl: prefix + "/add",
|
||||
updateUrl: prefix + "/edit/{id}",
|
||||
removeUrl: prefix + "/remove",
|
||||
exportUrl: prefix + "/export",
|
||||
modalName: "指标",
|
||||
columns: [{
|
||||
checkbox: true
|
||||
},
|
||||
{
|
||||
field: 'id',
|
||||
title: '自增ID',
|
||||
visible: false
|
||||
},
|
||||
// {
|
||||
// field: 'type',
|
||||
// title: '作用于附件'
|
||||
// },
|
||||
// {
|
||||
// field: 'unit',
|
||||
// title: '单位名称'
|
||||
// },
|
||||
{
|
||||
field: 'type',
|
||||
title: '类型'
|
||||
},
|
||||
{
|
||||
field: 'target',
|
||||
title: '目标项'
|
||||
},
|
||||
{
|
||||
field: 'demand',
|
||||
title: '目标要求',
|
||||
width:200,
|
||||
align: 'center',
|
||||
formatter: function(value, row, index) {
|
||||
return $.table.tooltip(value);
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'detailed',
|
||||
title: '评分细则',
|
||||
width:200,
|
||||
align: 'center',
|
||||
formatter: function(value, row, index) {
|
||||
return $.table.tooltip(value);
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'score',
|
||||
title: '达标分'
|
||||
},
|
||||
{
|
||||
field: 'nowScore',
|
||||
title: '当前得分'
|
||||
},
|
||||
{
|
||||
field: 'method',
|
||||
title: '考核方式',
|
||||
width:200,
|
||||
align: 'center',
|
||||
formatter: function(value, row, index) {
|
||||
return $.table.tooltip(value);
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'header',
|
||||
title: '负责人'
|
||||
},
|
||||
{
|
||||
field: 'reviewer',
|
||||
title: '审核人'
|
||||
},
|
||||
{
|
||||
field: 'finishDate',
|
||||
title: '完成截止时间'
|
||||
},
|
||||
{
|
||||
field: 'oprator',
|
||||
title: '操作人员'
|
||||
},
|
||||
{
|
||||
field: 'deptName',
|
||||
title: '部门'
|
||||
},
|
||||
{
|
||||
field: 'branch',
|
||||
title: '支部'
|
||||
},
|
||||
{
|
||||
field: 'remark',
|
||||
title: '备注'
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
align: 'center',
|
||||
formatter: function(value, row, index) {
|
||||
var actions = [];
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.upload(\'' + row.id + '\')"><i class="fa fa-edit"></i>上传附件</a> ');
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看详情</a> ');
|
||||
|
||||
// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
return actions.join('');
|
||||
}
|
||||
}]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="demand" column="demand" />
|
||||
<result property="detailed" column="detailed" />
|
||||
<result property="score" column="score" />
|
||||
<result property="nowScore" column="now_score" />
|
||||
<result property="method" column="method" />
|
||||
<result property="head" column="head" />
|
||||
<result property="reviewed" column="reviewed" />
|
||||
|
|
@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectTAmentPartyAffairsVo">
|
||||
select id, type, files, unit, target, demand, detailed, score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs
|
||||
select id, type, files, unit, target, demand, detailed, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs
|
||||
</sql>
|
||||
|
||||
<select id="selectTAmentPartyAffairsList" parameterType="TAmentPartyAffairs" resultMap="TAmentPartyAffairsResult">
|
||||
|
|
@ -71,6 +72,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
LEFT JOIN sys_dept f ON a.dept_id = f.dept_id
|
||||
</select>
|
||||
|
||||
<select id="warnList" parameterType="TAmentPartyAffairs" resultMap="TAmentPartyAffairsResult">
|
||||
<include refid="selectTAmentPartyAffairsVo"/>
|
||||
where (now() > finish_date or datediff(finish_date,now()) <=3)
|
||||
</select>
|
||||
|
||||
<select id="selectTAmentPartyAffairsById" parameterType="Long" resultMap="TAmentPartyAffairsResult">
|
||||
<include refid="selectTAmentPartyAffairsVo"/>
|
||||
where id = #{id}
|
||||
|
|
|
|||
Loading…
Reference in New Issue