diff --git a/src/main/java/com/tenlion/twoduty/dao/indexaudit/IIndexAuditDao.java b/src/main/java/com/tenlion/twoduty/dao/indexaudit/IIndexAuditDao.java index 5862004..a515e31 100644 --- a/src/main/java/com/tenlion/twoduty/dao/indexaudit/IIndexAuditDao.java +++ b/src/main/java/com/tenlion/twoduty/dao/indexaudit/IIndexAuditDao.java @@ -22,6 +22,13 @@ import java.util.Map; @Repository public interface IIndexAuditDao { + /** + * 删除业务表信息 + * @param params + * @throws RemoveException + */ + void removeIndexServer(Map params) throws RemoveException; + /** * 新增指标审核表 * @@ -38,6 +45,7 @@ public interface IIndexAuditDao { */ void remove(Map params) throws RemoveException; + /** * 删除指标审核表(物理) * diff --git a/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java index ecc13d3..b845be8 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexaudit/impl/IndexAuditServiceImpl.java @@ -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 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 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 params = getHashMap(2); params.put("indexAuditIds", ids); if (StringUtils.isBlank(token)) { diff --git a/src/main/resources/mybatis/mapper/indexaudit/index-audit-mapper.xml b/src/main/resources/mybatis/mapper/indexaudit/index-audit-mapper.xml index f7bf2a5..3055305 100644 --- a/src/main/resources/mybatis/mapper/indexaudit/index-audit-mapper.xml +++ b/src/main/resources/mybatis/mapper/indexaudit/index-audit-mapper.xml @@ -71,7 +71,20 @@ #{isDelete} ) - + + + UPDATE + ${tableName} + SET + gmt_modified = #{gmtModified}, + modifier = #{modifier}, + is_delete = 1 + WHERE + ${tableId} = #{id} + + + + UPDATE diff --git a/src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js b/src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js index ff3b49a..5fe4de0 100644 --- a/src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js +++ b/src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js @@ -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 //自定义样式,不支持国际化,此处配置值即可最后显示值 diff --git a/src/main/resources/static/route/basiccheckpersonaction/print.html b/src/main/resources/static/route/basiccheckpersonaction/print.html index 8b37560..5b2f670 100644 --- a/src/main/resources/static/route/basiccheckpersonaction/print.html +++ b/src/main/resources/static/route/basiccheckpersonaction/print.html @@ -44,7 +44,7 @@
diff --git a/src/main/resources/static/route/hearttalk/print-heart-talk.html b/src/main/resources/static/route/hearttalk/print-heart-talk.html index 1001c17..c861be2 100644 --- a/src/main/resources/static/route/hearttalk/print-heart-talk.html +++ b/src/main/resources/static/route/hearttalk/print-heart-talk.html @@ -27,7 +27,7 @@
@@ -36,11 +36,10 @@

上报时间:{{ d.gmtCreate }} 上报人:{{ d.creatorName }} -

- {{ d.indexGeneralContent }} +

{{ d.indexGeneralContent }}

diff --git a/src/main/resources/static/route/partycleanmeeting/print-party-clean-meeting.html b/src/main/resources/static/route/partycleanmeeting/print-party-clean-meeting.html index 016ed22..8912e40 100644 --- a/src/main/resources/static/route/partycleanmeeting/print-party-clean-meeting.html +++ b/src/main/resources/static/route/partycleanmeeting/print-party-clean-meeting.html @@ -45,12 +45,12 @@