public/cyx-ament-pc
public
/
cyx-ament-pc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改页面样式，删除多余字段，增加微信接口

This commit is contained in:
liuwu 2023-08-30 09:14:26 +08:00
parent f65d54d161
commit eb60f6ffec
19 changed files with 499 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java
View File

@ -78,4 +78,6 @@ public interface TAmentPartyAffairsMapper
List<TAmentPartyAffairs> selectTAmentPartyAffairsListAll(TAmentPartyAffairs tAmentPartyAffairs);
List<TAmentPartyAffairs> warnList(TAmentPartyAffairs tAmentPartyAffairs);
List<TAmentPartyAffairs> approveList(TAmentPartyAffairs tAmentPartyAffairs);
}

2
cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java
View File

@ -78,4 +78,6 @@ public interface ITAmentPartyAffairsService
List<TAmentPartyAffairs> selectTAmentPartyAffairsListAll(TAmentPartyAffairs tAmentPartyAffairs);
List<TAmentPartyAffairs> warnList(TAmentPartyAffairs tAmentPartyAffairs);
List<TAmentPartyAffairs> approveList(TAmentPartyAffairs tAmentPartyAffairs);
}

5
cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java
View File

@ -57,6 +57,11 @@ public class TAmentPartyAffairsServiceImpl implements ITAmentPartyAffairsService
return tAmentPartyAffairsMapper.warnList(tAmentPartyAffairs);
}
@Override
public List<TAmentPartyAffairs> approveList(TAmentPartyAffairs tAmentPartyAffairs){
return tAmentPartyAffairsMapper.approveList(tAmentPartyAffairs);
}
/**
* 新增党务
*

137
cyx-admin/src/main/java/com/cyx/wechat/WechatController.java Normal file
View File

@ -0,0 +1,137 @@
package com.cyx.wechat;
import com.cyx.common.annotation.Log;
import com.cyx.common.core.controller.BaseController;
import com.cyx.common.core.domain.AjaxResult;
import com.cyx.common.core.domain.entity.SysUser;
import com.cyx.common.core.page.TableDataInfo;
import com.cyx.common.enums.BusinessType;
import com.cyx.web.base.domain.*;
import com.cyx.web.base.service.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Controller
@RequestMapping("/wx/index")
public class WechatController extends BaseController {
@Resource
private ITAmentPartyAffairsService partyAffairsService;
@Autowired
private ITAmentCommitHisService commitHisService;
@Autowired
private ITAmentReviewedHisService reviewedHisService;
/**
* 任务预警
*/
@RequiresPermissions("base:affairs:list")
@PostMapping("/queryList")
@ResponseBody
public TableDataInfo queryList(TAmentPartyAffairs tAmentPartyAffairs)
{
startPage(tAmentPartyAffairs.getPageNum(),tAmentPartyAffairs.getPageSize());
List<TAmentPartyAffairs> list = partyAffairsService.selectTAmentPartyAffairsList(tAmentPartyAffairs);
return getDataTable(list);
}
/**
* 提交附件
*/
@RequiresPermissions("base:affairs:edit")
@Log(title = "党务", businessType = BusinessType.UPDATE)
@PostMapping("/commit")
@ResponseBody
public AjaxResult commit(TAmentPartyAffairs tAmentPartyAffairs)
{
TAmentCommitHis his = new TAmentCommitHis();
his.setPer(tAmentPartyAffairs.getHeader());
his.setDept(tAmentPartyAffairs.getDeptName());
his.setTarget(tAmentPartyAffairs.getShotName());
his.setCommitTime(new Date());
his.setDept(tAmentPartyAffairs.getDeptName());
his.setRemark(tAmentPartyAffairs.getRemark());
his.setFiles(tAmentPartyAffairs.getFiles());
tAmentPartyAffairs.setStatus("2");
commitHisService.insertTAmentCommitHis(his);
tAmentPartyAffairs.setCommitId(his.getId());
return toAjax(partyAffairsService.updateTAmentPartyAffairs(tAmentPartyAffairs));
}
/**
* 审核
*/
@RequiresPermissions("base:affairs:edit")
@Log(title = "党务", businessType = BusinessType.UPDATE)
@GetMapping("/reviewedSave")
@ResponseBody
public AjaxResult reviewedSave(TAmentPartyAffairs tAmentPartyAffairs)
{
TAmentPartyAffairs one = partyAffairsService.selectTAmentPartyAffairsById(tAmentPartyAffairs.getId());
TAmentReviewedHis his = new TAmentReviewedHis();
his.setPer(tAmentPartyAffairs.getReviewer());
his.setReviewedTime(new Date());
int before = 0;
if (null != one && null != one.getNowScore()){
before = Integer.parseInt(one.getNowScore());
}
int reviewScore = Integer.parseInt(tAmentPartyAffairs.getNowScore());
his.setScore(tAmentPartyAffairs.getNowScore());
his.setRemark(tAmentPartyAffairs.getRemark());
reviewedHisService.insertTAmentReviewedHis(his);
tAmentPartyAffairs.setReviewedId(his.getId());
tAmentPartyAffairs.setStatus("4");
tAmentPartyAffairs.setNowScore(String.valueOf(reviewScore+before));
return toAjax(partyAffairsService.updateTAmentPartyAffairs(tAmentPartyAffairs));
}
/**
* 驳回
* @param tAmentPartyAffairs
* @return
*/
@GetMapping("/reback")
@ResponseBody
public AjaxResult reback(TAmentPartyAffairs tAmentPartyAffairs)
{
tAmentPartyAffairs.setStatus("3");
return toAjax(partyAffairsService.updateTAmentPartyAffairs(tAmentPartyAffairs));
}
/**
* 任务预警
*/
@RequiresPermissions("base:affairs:list")
@PostMapping("/warnList")
@ResponseBody
public TableDataInfo warnList(TAmentPartyAffairs tAmentPartyAffairs)
{
startPage(tAmentPartyAffairs.getPageNum(),tAmentPartyAffairs.getPageSize());
tAmentPartyAffairs.setStatus("1");
List<TAmentPartyAffairs> list = partyAffairsService.warnList(tAmentPartyAffairs);
return getDataTable(list);
}
/**
* 审批预警
*/
@RequiresPermissions("base:affairs:list")
@PostMapping("/approveList")
@ResponseBody
public TableDataInfo approveList(TAmentPartyAffairs tAmentPartyAffairs)
{
startPage(tAmentPartyAffairs.getPageNum(),tAmentPartyAffairs.getPageSize());
tAmentPartyAffairs.setStatus("2");
List<TAmentPartyAffairs> list = partyAffairsService.approveList(tAmentPartyAffairs);
return getDataTable(list);
}
}

52
cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html
View File

@ -78,31 +78,7 @@
},
{
field: 'dept',
title: '部门'
},
{
field: 'commit',
title: '评选人'
},
{
field: 'time',
title: '评选时间'
},
{
field: 'confirm',
title: '审核人'
},
{
field: 'show',
title: '是否显示'
},
{
field: 'events',
title: '主要事迹附件上传'
},
{
field: 'remark',
title: '备注'
title: '先进部门'
},
{
field: 'score',
@ -110,12 +86,36 @@
},
{
field: 'process',
title: '完成进度'
title: '指标完成进度'
},
{
field: 'sort',
title: '综合排名'
},
// {
// field: 'commit',
// title: '评选人'
// },
{
field: 'time',
title: '评选时间'
},
// {
// field: 'confirm',
// title: '审核人'
// },
{
field: 'show',
title: '是否显示'
},
// {
// field: 'events',
// title: '主要事迹附件上传'
// },
{
field: 'remark',
title: '备注'
},
{
title: '操作',
align: 'center',

8
cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html
View File

@ -92,10 +92,10 @@
field: 'show',
title: '是否显示'
},
{
field: 'events',
title: '主要事迹附件上传'
},
// {
// field: 'events',
// title: '主要事迹附件上传'
// },
{
field: 'remark',
title: '备注'

8
cyx-admin/src/main/resources/templates/base/affairs/affairs.html
View File

@ -164,18 +164,10 @@
field: 'finishDate',
title: '完成截止时间'
},
{
field: 'oprator',
title: '操作人员'
},
{
field: 'deptName',
title: '部门'
},
{
field: 'branch',
title: '支部'
},
{
field: 'remark',
title: '备注'

8
cyx-admin/src/main/resources/templates/base/affairs/day.html
View File

@ -168,18 +168,10 @@
field: 'finishDate',
title: '完成截止时间'
},
{
field: 'oprator',
title: '操作人员'
},
{
field: 'deptName',
title: '部门'
},
{
field: 'branch',
title: '支部'
},
{
field: 'remark',
title: '备注'

12
cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
View File

@ -144,6 +144,10 @@
field: 'score',
title: '总分值'
},
{
field: 'nowScore',
title: '当前得分'
},
{
field: 'method',
title: '考核要求',
@ -165,18 +169,10 @@
field: 'finishDate',
title: '完成截止时间'
},
{
field: 'oprator',
title: '操作人员'
},
{
field: 'deptName',
title: '部门'
},
{
field: 'branch',
title: '支部'
},
{
field: 'remark',
title: '备注'

226
cyx-admin/src/main/resources/templates/base/affairs/warn.html
View File

@ -10,43 +10,26 @@
<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"/>
<label>考核类型：</label>
<input type="text" name="type"/>
</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>-->
<li>
<label>部门：</label>
<select name="deptId" id="deptId">
</select>
<!-- <input type="text" name="deptId"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>支部ID：</label>-->
<!-- <input type="text" name="branchId"/>-->
<!-- </li>-->
</li>
<li>
<label>审批人：</label>
<select name="reviewed" id="reviewed">
</select>
<!-- <input type="text" name="reviewed"/>-->
</li>
<li>
<label>提交时间：</label>
<input type="text" class="time-input" placeholder="提交时间" name="finishDate"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@ -81,6 +64,36 @@
var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
var prefix = ctx + "base/affairs";
$(document).ready(function () {
$.ajax({
type: "post",
url: ctx + "base/personnel/personnelList",
data: {
},
success: function(data) {
var opt = '<option value="">请选择</option>';
data.data.forEach(d=>{
opt += '<option value="'+d.id+'">'+d.name+'</option>';
})
$("#reviewed")[0].innerHTML=opt;
}
});
$.ajax({
type: "post",
url: ctx + "base/personnel/deptList",
data: {
},
success: function(data) {
var opt = '<option value="">请选择</option>';
data.data.forEach(d=>{
opt += '<option value="'+d.deptId+'">'+d.deptName+'</option>';
})
$("#deptId")[0].innerHTML=opt;
}
});
})
$(function() {
var options = {
url: prefix + "/warnList",
@ -97,84 +110,50 @@
title: '自增ID',
visible: false
},
// {
// field: 'type',
// title: '作用于附件'
// },
// {
// field: 'unit',
// title: '单位名称'
// },
{
field: 'header',
title: '提交人'
},
{
field: 'type',
title: '类型'
title: '考核类型'
},
{
field: 'target',
title: '目标项'
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: 'commitTime',
title: '提交时间'
},
{
field: 'finishDate',
title: '完成截止时间'
},
{
field: 'oprator',
title: '操作人员'
title: '截止时间'
},
{
field: 'deptName',
title: '部门'
},
{
field: 'branch',
title: '支部'
field: 'reviewer',
title: '审批人'
},
{
field: 'remark',
title: '备注'
field: 'status',
title: '审批状态',
formatter: function(value, row, index) {
var actions = [];
if (row.status === '1'){
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)">待提交</a> ');
}else if (row.status === '2'){
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)">待审核</a> ');
}else if (row.status === '3'){
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)">已驳回</a> ');
}else if (row.status === '4'){
actions.push('<a class="btn btn-default btn-xs" href="javascript:void(0)">已完成</a> ');
}
return actions.join('');
}
},
{
title: '操作',
@ -189,11 +168,11 @@
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)">已驳回</a> ');
actions.push('<a class="btn btn-primary 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-default 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('');
if (row.files && row.status !=='3'){
actions.push('<a data-files="'+row.files+'" data-type="1" class="viewFiles0828 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>查看图片</a> ');
actions.push('<a data-files="'+row.files+'" data-type="2" class="viewFiles0828 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-download"></i>下载附件</a> ');
}
return actions.join('');
}
}]
};
@ -226,8 +205,57 @@
}
})
})
$("#bootstrap-table").on("click",".viewFiles0828",function () {
let _files = $(this)[0].dataset.files.split(',');
let _type = $(this)[0].dataset.type;
let _dataImg = [];
let _downData = [];
_files.forEach((item,index) => {
if(item.indexOf(".jpg")>-1 || item.indexOf(".png")>-1){
_dataImg.push({
"alt": "",
"pid": index, //图片id
"src": window.location.origin+item, //原图地址
"thumb": window.location.origin+item //缩略图地址
})
}else if(item.indexOf(".docx")> -1 || item.indexOf(".doc") > -1 || item.indexOf(".xlsx") > -1 || item.indexOf(".xls") > -1 || item.indexOf(".pdf") > -1){
_downData.push(item);
}
})
if(_type === '1'){ //查看图片
let json = {
"title": "查看图片", //相册标题
"id": 123, //相册id
"start": 0, //初始显示的图片序号，默认0
"data": _dataImg
};
layer.photos({
photos: json,
closeBtn: 0, //右上角按钮，可通过配置1和2来展示，如果不显示，则closeBtn: 0
anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
});
}else{ //下载附件
if(_downData.length === 0){
$.modal.msgError('暂无文件!')
return false;
}
_downData.forEach(item => {
let _lastNum = item.lastIndexOf('/')+1;
let _title = item.substr(_lastNum,item.length-1);
const a = document.createElement('a');
a.style.display = 'none';
a.download = _title;
a.href = window.location.origin+item;
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
})
}
});
});
</script>
</body>
</html>

8
cyx-admin/src/main/resources/templates/base/affairs/year.html
View File

@ -144,18 +144,10 @@
field: 'finishDate',
title: '完成截止时间'
},
{
field: 'oprator',
title: '操作人员'
},
{
field: 'deptName',
title: '部门'
},
{
field: 'branch',
title: '支部'
},
{
field: 'remark',
title: '备注'

41
cyx-admin/src/main/resources/templates/base/branch/branch.html
View File

@ -63,42 +63,29 @@
columns: [{
checkbox: true
},
{
field: 'branchId',
title: '支部id',
visible: false
},
{
field: 'parentId',
title: '父支部id'
},
{
field: 'ancestors',
title: '祖级列表'
},
{
field: 'branchName',
title: '支部名称'
},
{
field: 'orderNum',
title: '显示顺序'
},
{
field: 'leader',
title: '负责人'
},
{
field: 'phone',
title: '联系电话'
},
{
field: 'email',
title: '邮箱'
title: '排序'
},
{
field: 'status',
title: '支部状态'
title: '状态'
},
{
field: 'createTime',
title: '创建时间'
},
{
field: 'createBy',
title: '创建人'
},
{
field: 'persons ',
title: '支部人数'
},
{
title: '操作',

5
cyx-admin/src/main/resources/templates/base/dept/dept.html
View File

@ -89,6 +89,11 @@
title: '创建时间',
align: "left"
},
{
field: 'createBy',
title: '创建人',
align: "left"
},
{
title: '操作',
align: 'left',

156
cyx-admin/src/main/resources/templates/base/personnel/add.html
View File

@ -7,106 +7,96 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-personnel-add">
<div class="form-group">
<label class="col-sm-3 control-label">单位名称：</label>
<div class="col-sm-8">
<input name="unit" class="form-control" type="text">
<div class="row">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">单位名称：</label>
<div class="col-sm-8">
<input name="unit" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">人员姓名：</label>
<div class="col-sm-8">
<input name="name" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">人员姓名：</label>
<div class="col-sm-8">
<input name="name" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">民族：</label>
<div class="col-sm-8">
<input name="nation" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">民族：</label>
<div class="col-sm-8">
<input name="nation" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门ID：</label>
<div class="col-sm-8">
<input name="deptId" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">部门ID：</label>
<div class="col-sm-8">
<input name="deptId" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">手机号码：</label>
<div class="col-sm-8">
<input name="mphone" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">手机号码：</label>
<div class="col-sm-8">
<input name="mphone" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">邮箱：</label>
<div class="col-sm-8">
<input name="email" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">邮箱：</label>
<div class="col-sm-8">
<input name="email" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">籍贯：</label>
<div class="col-sm-8">
<input name="nativePlace" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">籍贯：</label>
<div class="col-sm-8">
<input name="nativePlace" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">岗位：</label>
<div class="col-sm-8">
<input name="post" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">岗位：</label>
<div class="col-sm-8">
<input name="post" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">职务：</label>
<div class="col-sm-8">
<input name="duties" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">职务：</label>
<div class="col-sm-8">
<input name="duties" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">职称：</label>
<div class="col-sm-8">
<input name="title" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">职称：</label>
<div class="col-sm-8">
<input name="title" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">参加工作时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">参加工作时间</label>
<div class="col-sm-8">
<input name="workDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">支部ID：</label>
<div class="col-sm-8">
<input name="branchId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入党时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<!-- <div class="form-group col-sm-6 col-md-6">-->
<!-- <label class="col-sm-4 control-label">支部ID：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="branchId" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">入党时间：</label>
<div class="col-sm-8">
<input name="partyDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">党内职务：</label>
<div class="col-sm-8">
<input name="partyDuties" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">党内职务：</label>
<div class="col-sm-8">
<input name="partyDuties" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">删除标志：</label>
<div class="col-sm-8">
<input name="delFlag" class="form-control" type="text">
<div class="form-group col-sm-6 col-md-6">
<label class="col-sm-4 control-label">备注：</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control"></textarea>
</div>
</div>
</div>
</form>

18
cyx-admin/src/main/resources/templates/base/personnel/personnel.html
View File

@ -70,15 +70,15 @@
},
{
field: 'unit',
title: '单位名称'
title: '单位'
},
{
field: 'name',
title: '人员姓名'
title: '姓名'
},
{
field: 'sex',
title: '人员性别'
title: '性别'
},
{
field: 'nation',
@ -86,11 +86,11 @@
},
{
field: 'deptId',
title: '部门ID'
title: '部门'
},
{
field: 'mphone',
title: '手机号码'
title: '手机号'
},
{
field: 'email',
@ -116,10 +116,10 @@
field: 'workDate',
title: '参加工作时间'
},
{
field: 'branchId',
title: '支部ID'
},
// {
// field: 'branchId',
// title: '支部ID'
// },
{
field: 'partyDate',
title: '入党时间'

5
cyx-common/src/main/java/com/cyx/common/core/controller/BaseController.java
View File

@ -59,6 +59,11 @@ public class BaseController
PageUtils.startPage();
}
protected void startPage(Integer pageNum,Integer pageSize)
{
PageUtils.startPage(pageNum,pageSize);
}
/**
* 设置请求排序数据
*/

19
cyx-common/src/main/java/com/cyx/common/core/domain/BaseEntity.java
View File

@ -21,6 +21,25 @@ public class BaseEntity implements Serializable
@JsonIgnore
private String searchValue;
private Integer pageNum;
private Integer pageSize;
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
/** 创建者 */
private String createBy;

11
cyx-common/src/main/java/com/cyx/common/utils/PageUtils.java
View File

@ -25,6 +25,17 @@ public class PageUtils extends PageHelper
PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
}
/**
* 设置请求分页数据
*/
public static void startPage(Integer pageNum,Integer pageSize)
{
PageDomain pageDomain = TableSupport.buildPageRequest();
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
Boolean reasonable = pageDomain.getReasonable();
PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
}
/**
* 清理分页的线程变量
*/

56
cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
View File

@ -108,6 +108,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN t_ament_branch e ON a.branch_id = e.branch_id
LEFT JOIN sys_dept f ON a.dept_id = f.dept_id
where (now() > a.finish_date or datediff(a.finish_date,now()) &lt;=3)
<if test="type != null and type != ''"> and a.type = #{type}</if>
<if test="unit != null and unit != ''"> and a.unit = #{unit}</if>
<if test="target != null and target != ''">
AND a.target like concat('%', #{target}, '%')
</if>
<if test="demand != null and demand != ''">
AND a.demand like concat('%', #{demand}, '%')
</if>
<if test="detailed != null and detailed != ''"> and a.detailed = #{detailed}</if>
<if test="score != null and score != ''"> and a.score = #{score}</if>
<if test="method != null and method != ''"> and a.method = #{method}</if>
<if test="head != null and head != ''"> and a.head = #{head}</if>
<if test="reviewed != null and reviewed != ''"> and a.reviewed = #{reviewed}</if>
<if test="finishDate != null "> and a.finish_date = #{finishDate}</if>
<if test="perId != null "> and a.per_id = #{perId}</if>
<if test="deptId != null "> and a.dept_id = #{deptId}</if>
<if test="branchId != null "> and a.branch_id = #{branchId}</if>
</select>
<select id="approveList" parameterType="TAmentPartyAffairs" resultMap="TAmentPartyAffairsResult">
SELECT
a.*,
ROUND( a.now_score / a.score * 100 ) percent,
a.shot_name shotName,
a.now_score nowScore,
b.`name` oprator,
c.`name` reviewer,
d.`name` header,
e.branch_name branch,
f.dept_name deptName
FROM
t_ament_party_affairs a
LEFT JOIN t_ament_personnel b ON a.per_id = b.id
LEFT JOIN t_ament_personnel c ON a.reviewed = c.id
LEFT JOIN t_ament_personnel d ON a.head = d.id
LEFT JOIN t_ament_branch e ON a.branch_id = e.branch_id
LEFT JOIN sys_dept f ON a.dept_id = f.dept_id
where (now() > a.finish_date or datediff(a.finish_date,now()) &lt;=3)
<if test="type != null and type != ''"> and a.type = #{type}</if>
<if test="unit != null and unit != ''"> and a.unit = #{unit}</if>
<if test="target != null and target != ''">
AND a.target like concat('%', #{target}, '%')
</if>
<if test="demand != null and demand != ''">
AND a.demand like concat('%', #{demand}, '%')
</if>
<if test="detailed != null and detailed != ''"> and a.detailed = #{detailed}</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
<if test="score != null and score != ''"> and a.score = #{score}</if>
<if test="method != null and method != ''"> and a.method = #{method}</if>
<if test="head != null and head != ''"> and a.head = #{head}</if>
<if test="reviewed != null and reviewed != ''"> and a.reviewed = #{reviewed}</if>
<if test="finishDate != null "> and a.finish_date = #{finishDate}</if>
<if test="perId != null "> and a.per_id = #{perId}</if>
<if test="deptId != null "> and a.dept_id = #{deptId}</if>
<if test="branchId != null "> and a.branch_id = #{branchId}</if>
</select>
<select id="selectTAmentPartyAffairsById" parameterType="Long" resultMap="TAmentPartyAffairsResult">