Tenlion/twoduty
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

打印页面修改

Browse Source
This commit is contained in:
ly19960718 2021-08-09 17:30:22 +08:00
parent bdb2d1de78
commit 09e126392e
19 changed files with 159 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/tenlion/twoduty/dao/indexaudit/IIndexAuditDao.java
View File

@ -22,6 +22,13 @@ import java.util.Map;
@Repository
public interface IIndexAuditDao {
/**
* 删除业务表信息
* @param params
* @throws RemoveException
*/
void removeIndexServer(Map<String, Object> params) throws RemoveException;
/**
* 新增指标审核表
*
@ -38,6 +45,7 @@ public interface IIndexAuditDao {
*/
void remove(Map<String, Object> params) throws RemoveException;
/**
* 删除指标审核表（物理）
*

31
src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java
View File

@ -1,10 +1,12 @@
package com.tenlion.twoduty.service.indexaudit.impl;
import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO;
import com.tenlion.twoduty.pojo.dtos.indextemplate.IndexTemplateDTO;
import com.tenlion.twoduty.pojo.vos.indexaudit.AuditVO;
import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO;
import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService;
import com.tenlion.twoduty.service.indexlib.IIndexLibService;
import com.tenlion.twoduty.service.indextemplate.IIndexTemplateService;
import com.tenlion.twoduty.utils.AuditStatusEnum;
import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.exceptions.SearchException;
@ -49,6 +51,8 @@ public class IndexAuditServiceImpl extends DefaultBaseService implements IIndexA
private IDepartmentUserService departmentUserService;
@Autowired
private IIndexLibService indexLibService;
@Autowired
private IIndexTemplateService indexTemplateService;
/**
* 市局角色
@ -134,6 +138,33 @@ public class IndexAuditServiceImpl extends DefaultBaseService implements IIndexA
@Override
public void remove(String token, List<String> ids) {
//删除业务表
for (String id : ids) {
IndexAuditDTO indexAuditDTO = this.get(id);
IndexLibDTO indexLibDTO = indexLibService.get(indexAuditDTO.getIndexLibId());
IndexTemplateDTO indexTemplateDTO = indexTemplateService.get(indexLibDTO.getIndexTemplateId());
String tableName = indexTemplateDTO.getIndexTemplateTableName();
Map<String,Object> remParams = new HashMap<>();
if (StringUtils.isBlank(token)) {
setUpdateInfo(remParams);
} else {
setAppUpdateInfo(token, remParams);
}
remParams.put("id",indexAuditDTO.getIndexBId());
remParams.put("tableName",tableName);
//业务主键特殊处理
if("duty_index_general".equals(tableName)){
remParams.put("tableId","index_general_id");
}else if("t_entity_res".equals(tableName)){
remParams.put("tableId","entity_res_id");
}else if("t_party_committee_meeting".equals(tableName)){
remParams.put("tableId","party_committee_meeting_id");
}else{
remParams.put("tableId","report_id");
}
indexAuditDao.removeIndexServer(remParams);
}
//删除审核表
Map<String, Object> params = getHashMap(2);
params.put("indexAuditIds", ids);
if (StringUtils.isBlank(token)) {

13
src/main/resources/mybatis/mapper/indexaudit/index-audit-mapper.xml
View File

@ -72,6 +72,19 @@
)
</insert>
<update id="removeIndexServer" parameterType="map">
UPDATE
${tableName}
SET
gmt_modified = #{gmtModified},
modifier = #{modifier},
is_delete = 1
WHERE
${tableId} = #{id}
</update>
<!-- 删除指标审核表 -->
<update id="remove" parameterType="map">
UPDATE

34
src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js vendored
View File

@ -191,23 +191,23 @@
//fontfamily
//字体设置 label留空支持多语言自动切换，若配置，则以配置值为准
//,'fontfamily':[
// { label:'',name:'songti',val:'宋体,SimSun'},
// { label:'',name:'kaiti',val:'楷体,楷体_GB2312, SimKai'},
// { label:'',name:'yahei',val:'微软雅黑,Microsoft YaHei'},
// { label:'',name:'heiti',val:'黑体, SimHei'},
// { label:'',name:'lishu',val:'隶书, SimLi'},
// { label:'',name:'andaleMono',val:'andale mono'},
// { label:'',name:'arial',val:'arial, helvetica,sans-serif'},
// { label:'',name:'arialBlack',val:'arial black,avant garde'},
// { label:'',name:'comicSansMs',val:'comic sans ms'},
// { label:'',name:'impact',val:'impact,chicago'},
// { label:'',name:'timesNewRoman',val:'times new roman'}
//]
,'fontfamily':[
{ label:'',name:'songti',val:'宋体,SimSun'},
{ label:'',name:'kaiti',val:'楷体,楷体_GB2312, SimKai'},
{ label:'',name:'yahei',val:'微软雅黑,Microsoft YaHei'},
{ label:'',name:'heiti',val:'黑体, SimHei'},
{ label:'',name:'lishu',val:'隶书, SimLi'},
{ label:'',name:'andaleMono',val:'andale mono'},
{ label:'',name:'arial',val:'arial, helvetica,sans-serif'},
{ label:'',name:'arialBlack',val:'arial black,avant garde'},
{ label:'',name:'comicSansMs',val:'comic sans ms'},
{ label:'',name:'impact',val:'impact,chicago'},
{ label:'',name:'timesNewRoman',val:'times new roman'}
]
//fontsize
//字号
//,'fontsize':[10, 11, 12, 14, 16, 18, 20, 24, 36]
,'fontsize':[10, 11, 12, 14, 16, 18, 20, 24, 36]
//paragraph
//段落格式 值留空时支持多语言自动识别，若配置，则以配置值为准
@ -215,15 +215,15 @@
//rowspacingtop
//段间距 值和显示的名字相同
//,'rowspacingtop':['5', '10', '15', '20', '25']
,'rowspacingtop':['5', '10', '15', '20', '25']
//rowspacingBottom
//段间距 值和显示的名字相同
//,'rowspacingbottom':['5', '10', '15', '20', '25']
,'rowspacingbottom':['5', '10', '15', '20', '25']
//lineheight
//行内间距 值和显示的名字相同
//,'lineheight':['1', '1.5','1.75','2', '3', '4', '5']
,'lineheight':['1', '1.5','1.75','2', '3', '4', '5']
//customstyle
//自定义样式，不支持国际化，此处配置值即可最后显示值

2
src/main/resources/static/route/basiccheckpersonaction/print.html
View File

@ -44,7 +44,7 @@
<div class="table-box">
<style >
*{margin:0;padding:0;}
.main{width: 1200px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
.title h3{font-size: 27px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
.title p{font-size: 15px;color: #333;}

2
src/main/resources/static/route/basiccheckpersoninfo/print.html
View File

@ -29,7 +29,7 @@
<div class="table-box">
<style >
*{margin:0;padding:0;}
.main{width: 1200px;margin: 0 auto;padding-top: 50px;;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;padding-top: 50px;;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
.title h3{font-size: 27px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
.title p{font-size: 15px;color: #333;}

4
src/main/resources/static/route/entityres/print.html
View File

@ -37,13 +37,13 @@
<script id="data" type="text/html">
<style>
*{margin:0;padding:0;}
.main{width: 1200px;margin: 0 auto;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
.title h3{font-size: 26px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
.title p{font-size: 16px;color: #333;}
.title p span{margin-right: 50px}
.content{min-height: 500px;margin-top: 10px;}
.content p{font-size: 16px;color: #333;line-height: 30px;}
.content p{font-size: 16px;color: #333;line-height: 40px;}
.button-box{position: fixed;top:20px;right: 40px;}
.button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
</style>

2
src/main/resources/static/route/hearttalk/print-heart-talk.html
View File

@ -27,7 +27,7 @@
<div class="table-box">
<style>
*{margin:0;padding:0;}
.main{width: 1000px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
.title h3{font-size: 27px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
.title p{font-size: 15px;color: #333;}

52
src/main/resources/static/route/indexaudit/list_1.html
View File

@ -125,7 +125,7 @@
return rowData;
}
},
{field: 'cz', width: 140, title: '操作', align:'center',fixed: 'right',
{field: 'cz', width: 180, title: '操作', align:'center',fixed: 'right',
templet: function(row) {
var buttonIsShow = row['buttonIsShow']
var rowData = '<div class="layui-btn-group">';
@ -134,6 +134,9 @@
}
rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="show">详情</button>';
rowData +='<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="log">日志</button>';
if(buttonIsShow.indexOf("1") > -1) {
rowData += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">删除</button>';
}
rowData +='</div>';
return rowData;
}
@ -182,28 +185,7 @@
format: 'yyyy-MM-dd'
});
}
// 删除
function removeData(ids) {
top.dialog.msg(top.dataMessage.delete, {
time: 0,
btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
shade: 0.3,
yes: function (index) {
top.dialog.close(index);
var layIndex;
top.restAjax.delete(top.restAjax.path('api/indexaudit/remove/{ids}', [ids]), {}, null, function (code, data) {
top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
reloadTable();
}, function (code, data) {
top.dialog.msg(data.msg);
}, function () {
layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
}, function () {
top.dialog.close(layIndex);
});
}
});
}
initTable();
initDate();
// 事件 - 页面变化
@ -260,6 +242,8 @@
}, function() {
top.dialog.close(loadLayerIndex);
});
}else if(layEvent === 'remove'){
removeData(data.indexAuditId)
}
});
@ -282,6 +266,28 @@
});
}
// 删除
function removeData(ids) {
top.dialog.msg(top.dataMessage.delete, {
time: 0,
btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
shade: 0.3,
yes: function (index) {
top.dialog.close(index);
var layIndex;
top.restAjax.delete(top.restAjax.path('api/indexaudit/remove/{ids}', [ids]), {}, null, function (code, data) {
top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
reloadTable();
}, function (code, data) {
top.dialog.msg(data.msg);
}, function () {
layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
}, function () {
top.dialog.close(layIndex);
});
}
});
}
});
</script>

8
src/main/resources/static/route/indexaudit/list_2.html
View File

@ -135,7 +135,7 @@
return rowData;
}
},
{field: 'cz', width: 140, title: '操作', align:'center',fixed: 'right',
{field: 'cz', width: 180, title: '操作', align:'center',fixed: 'right',
templet: function(row) {
var buttonIsShow = row['buttonIsShow']
var rowData = '<div class="layui-btn-group">';
@ -144,7 +144,9 @@
if(buttonIsShow.indexOf("2") > -1){
rowData +='<button type="button" class="layui-btn layui-btn-warm layui-btn-xs" lay-event="archive">归档</button>';
}
if(buttonIsShow.indexOf("1") > -1) {
rowData += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">删除</button>';
}
rowData +='</div>';
return rowData;
@ -278,6 +280,8 @@
}, function() {
top.dialog.close(loadLayerIndex);
});
}else if(layEvent === 'remove'){
removeData(data.indexAuditId)
}
});

55
src/main/resources/static/route/indexaudit/list_3.html
View File

@ -135,11 +135,15 @@
return rowData;
}
},
{field: 'cz', width: 120, title: '操作', align:'center',fixed: 'right',
{field: 'cz', width: 200, title: '操作', align:'center',fixed: 'right',
templet: function(row) {
var buttonIsShow = row['buttonIsShow']
var rowData = '<div class="layui-btn-group">';
rowData +='<button type="button" class="layui-btn layui-btn-xs" lay-event="show">查看</button>';
rowData +='<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="log">日志</button>';
if(buttonIsShow.indexOf("1") > -1) {
rowData += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">删除</button>';
}
rowData +='</div>';
return rowData;
}
@ -188,28 +192,6 @@
format: 'yyyy-MM-dd'
});
}
// 删除
function removeData(ids) {
top.dialog.msg(top.dataMessage.delete, {
time: 0,
btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
shade: 0.3,
yes: function (index) {
top.dialog.close(index);
var layIndex;
top.restAjax.delete(top.restAjax.path('api/indexaudit/remove/{ids}', [ids]), {}, null, function (code, data) {
top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
reloadTable();
}, function (code, data) {
top.dialog.msg(data.msg);
}, function () {
layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
}, function () {
top.dialog.close(layIndex);
});
}
});
}
initTable();
initDate();
// 事件 - 页面变化
@ -253,6 +235,9 @@
reloadTable();
}
});
}else if(layEvent === 'remove'){
removeData(data.indexAuditId)
}
});
@ -274,6 +259,30 @@
});
}
// 删除
function removeData(ids) {
top.dialog.msg(top.dataMessage.delete, {
time: 0,
btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
shade: 0.3,
yes: function (index) {
top.dialog.close(index);
var layIndex;
top.restAjax.delete(top.restAjax.path('api/indexaudit/remove/{ids}', [ids]), {}, null, function (code, data) {
top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
reloadTable();
}, function (code, data) {
top.dialog.msg(data.msg);
}, function () {
layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
}, function () {
top.dialog.close(layIndex);
});
}
});
}
});
</script>
</body>

7
src/main/resources/static/route/indexaudit/list_4.html
View File

@ -136,7 +136,9 @@
if(buttonIsShow.indexOf("3") > -1){
rowData +='<button type="button" class="layui-btn layui-btn-warm layui-btn-xs" lay-event="update">编辑上报</button>';
}
if(buttonIsShow.indexOf("1") > -1) {
rowData += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">删除</button>';
}
rowData +='</div>';
return rowData;
}
@ -263,6 +265,9 @@
}, function() {
top.dialog.close(loadLayerIndex);
});
}else if(layEvent === 'remove'){
removeData(data.indexAuditId)
}
});

2
src/main/resources/static/route/indexgeneral/print.html
View File

@ -35,7 +35,7 @@
<script id="data" type="text/html">
<style>
*{margin:0;padding:0;}
.main{width: 1200px;margin: 0 auto;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
.title h3{font-size: 27px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}
.title p{font-size: 15px;color: #333;}

7
src/main/resources/static/route/indexgeneraltwo/print.html
View File

@ -21,13 +21,13 @@
<script id="data" type="text/html">
<style>
*{margin:0;padding:0;}
.main{width: 1200px;margin: 0 auto;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
.title h3{font-size: 27px;color: #1f5781;margin-bottom: 10px;font-weight: bolder;}
.title p{font-size: 15px;color: #333;}
.title p span{margin-right: 50px}
.content{min-height: 500px;margin-top: 10px;}
.content p{font-size: 16px;color: #333;line-height: 30px;}
.content p{font-size: 16px;color: #333;line-height: 40px;}
.button-box{position: fixed;top:20px;right: 40px;}
.button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
</style>
@ -36,11 +36,10 @@
<p>
<span>上报时间：{{ d.gmtCreate }}</span>
<span>上报人：{{ d.creatorName }}</span>
</p>
</div>
<div class="content">
{{ d.indexGeneralContent }}
<p>{{ d.indexGeneralContent }}</p>
</div>
</script>

4
src/main/resources/static/route/partycleanmeeting/print-party-clean-meeting.html
View File

@ -45,12 +45,12 @@
<script id="data" type="text/html">
<style>
*{margin:0;padding:0;}
.main{width: 1200px;margin: 0 auto;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
.title h3{font-size: 27px;color: #1f5781;margin-bottom: 10px;font-weight: bolder;}
.title p{font-size: 15px;color: #333;}
.content{min-height: 500px;margin-top: 10px;}
.content p{font-size: 18px;color: #000;line-height:35px;}
.content p{font-size: 18px;color: #000;line-height:40px;}
.title p span{margin-right: 50px}
.button-box{position: fixed;top:20px;right: 40px;}
.button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}

5
src/main/resources/static/route/partycommitteemeeting/print.html
View File

@ -34,13 +34,13 @@
<script id="data" type="text/html">
<style>
*{margin:0;padding:0;}
.main{width: 1200px;margin: 0 auto;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
.title h3{font-size: 27px;color: #1f5781;margin-bottom: 10px;font-weight: bolder;}
.title p{font-size: 15px;color: #333;}
.title p span{margin-right: 50px}
.content{min-height: 500px;margin-top: 10px;}
.content p{font-size: 16px;color: #333;line-height: 30px;}
.content p{font-size: 16px;color: #333;line-height: 40px;}
.button-box{position: fixed;top:20px;right: 40px;}
.button-box button{border: none;outline:none;width: 60px;height: 40px;background: #004acd;cursor: pointer;color: #fff}
</style>
@ -69,7 +69,6 @@
<div class="swiper-scrollbar"></div>
</div>
{{# } }}
<p>{{ d.partyCommitteeMeetingContent }}</p>
</div>
{{# layui.each(d.filesList, function(index, item){ }}

2
src/main/resources/static/route/partypunishinfo/print.html
View File

@ -27,7 +27,7 @@
<div class="table-box">
<style>
*{margin:0;padding:0;}
.main{width: 1200px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
.title h3{font-size: 27px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}

2
src/main/resources/static/route/problemclue/print.html
View File

@ -29,7 +29,7 @@
<div class="table-box">
<style >
*{margin:0;padding:0;}
.main{width: 1200px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}
.title h3{font-size: 27px;margin-bottom: 10px;color: #1f5781;font-weight: bolder;}

2
src/main/resources/static/route/supervisecheck/print.html
View File

@ -48,7 +48,7 @@
<div class="table-box">
<style >
*{margin:0;padding:0;}
.main{width: 1200px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 30px;box-sizing: border-box;overflow: hidden}
.main{width: 1000px;margin: 0 auto;padding-top: 50px;background: #fff;padding: 0 100px;box-sizing: border-box;overflow: hidden}
.title{text-align: center;padding: 10px 0;border-bottom: 1px solid #ddd;margin-top:60px;margin-bottom: 30px;}