From 7582a36005ab112a80815454985f2bb9ffe17934 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 16 八月 2023 11:56:58 +0800
Subject: [PATCH] xn commit
---
product-server-web/src/main/resources/templates/webOffice.html | 16 ++--
home-server-admin/src/main/java/com/home/xining/service/SendDocumentService.java | 135 ++++++++++++++++++++++-----------------------
2 files changed, 74 insertions(+), 77 deletions(-)
diff --git a/home-server-admin/src/main/java/com/home/xining/service/SendDocumentService.java b/home-server-admin/src/main/java/com/home/xining/service/SendDocumentService.java
index 66be2b4..872ddd9 100644
--- a/home-server-admin/src/main/java/com/home/xining/service/SendDocumentService.java
+++ b/home-server-admin/src/main/java/com/home/xining/service/SendDocumentService.java
@@ -24,77 +24,74 @@
@Component
public class SendDocumentService extends AbstractBaseService implements ISendDocumentService {
- @Autowired
- public BaseDao baseDao;
- @Autowired
- PermissionService permissionService;
- @Autowired
- QueryFilterService queryFilterService;
+ @Autowired
+ public BaseDao baseDao;
+ @Autowired
+ PermissionService permissionService;
+ @Autowired
+ QueryFilterService queryFilterService;
- public DataTableEntity getSendDocList(FieldSetEntity fs) throws BaseException {
- String filter=fs.getString("filter");
- String dataFilter = "" ;
- //鍒涘缓浜哄瓧娈�
- String created_by_field = fs.getString(CmnConst.CREATED_BY_FIELD);
- if(!BaseUtil.strIsNull(created_by_field)){
- dataFilter = permissionService.getDataFilter(fs.getTableName(),created_by_field);
- }
- if(!StringUtils.isEmpty(dataFilter)){
- if(!StringUtils.isEmpty(filter)){
- filter += " and "+dataFilter;
- }else {
- filter = dataFilter;
- }
- }
- if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){
- filter = filter + " and " + queryFilterService.getQueryFilter(fs);
- }
- DataTableEntity dt = baseDao.listTable(CmnConst.FWGZ,filter,null,null,"fw13 desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
- baseDao.loadPromptData(dt);
- return dt;
- }
+ public DataTableEntity getSendDocList(FieldSetEntity fs) throws BaseException {
+ String filter = fs.getString("filter");
+ String dataFilter = "";
+ //鍒涘缓浜哄瓧娈�
+ String created_by_field = fs.getString(CmnConst.CREATED_BY_FIELD);
+ if (!BaseUtil.strIsNull(created_by_field)) {
+ dataFilter = permissionService.getDataFilter(fs.getTableName(), created_by_field);
+ }
+ if (!StringUtils.isEmpty(dataFilter)) {
+ if (!StringUtils.isEmpty(filter)) {
+ filter += " and " + dataFilter;
+ } else {
+ filter = dataFilter;
+ }
+ }
+ if (!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))) {
+ filter = filter + " and " + queryFilterService.getQueryFilter(fs);
+ }
+ DataTableEntity dt = baseDao.listTable(CmnConst.FWGZ, filter, null, null, "fw13 desc", fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
+ baseDao.loadPromptData(dt);
+ return dt;
+ }
- /**
- * 鎵归噺褰掓。
- * @param fs
- * @throws BaseException
- */
- @Override
- @Transactional
- public boolean batchFile(FieldSetEntity fs)throws BaseException{
- String uuids = fs.getString("uuid");
- String[] uuid = uuids.split(",");
- for (int i = 0; i < uuid.length; i++) {
- FieldSetEntity fieldSetEntity = new FieldSetEntity();
- fieldSetEntity.setTableName(fs.getTableName());
- fieldSetEntity.setValue("uuid", uuid[i]);
- fieldSetEntity.setValue("pigeonhole",1);
- baseDao.update(fieldSetEntity);
- }
- return true;
- }
+ /**
+ * 鎵归噺褰掓。
+ *
+ * @param fs
+ * @throws BaseException
+ */
+ @Override
+ @Transactional
+ public boolean batchFile(FieldSetEntity fs) throws BaseException {
+ String uuids = fs.getString("uuid");
+ String[] uuid = uuids.split(",");
+ for (int i = 0; i < uuid.length; i++) {
+ FieldSetEntity fieldSetEntity = new FieldSetEntity();
+ fieldSetEntity.setTableName(fs.getTableName());
+ fieldSetEntity.setValue("uuid", uuid[i]);
+ fieldSetEntity.setValue("pigeonhole", 1);
+ baseDao.update(fieldSetEntity);
+ }
+ return true;
+ }
- /**
- * 浜哄憳楂樼骇鍙傜収瑙ｆ瀽骞朵繚瀛�
- * @param fse
- * @throws BaseException
- */
- @Transactional
- @Override
- public String saveFieldSetEntity(FieldSetEntity fse) throws BaseException {
- String fw09 = fse.getString("fw09");
- String[] fw09s = fw09.split(",");
- DataTableEntity dataTableEntity = baseDao.listTable("product_sys_users", BaseUtil.buildQuestionMarkFilter("user_id",fw09s,true), new String[]{});
- String fw09_value = "";
- for (int i = 0; i < dataTableEntity.getRows(); i++) {
- String user_name = dataTableEntity.getString(i,"user_name");
- fw09_value = fw09_value + user_name + ",";
- }
- fw09_value = fw09_value.substring(0, fw09_value.length() - 1);
- fse.setValue("fw09_value", fw09_value);
- BaseUtil.createCreatorAndCreationTime(fse);
- baseDao.saveFieldSetEntity(fse);
- return fse.getUUID();
- }
+ /**
+ * 浜哄憳楂樼骇鍙傜収瑙ｆ瀽骞朵繚瀛�
+ *
+ * @param fse
+ * @throws BaseException
+ */
+ @Transactional
+ @Override
+ public String saveFieldSetEntity(FieldSetEntity fse) throws BaseException {
+ try {
+ BaseUtil.createCreatorAndCreationTime(fse);
+ baseDao.saveFieldSetEntity(fse);
+ return fse.getUUID();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ }
+ }
}
diff --git a/product-server-web/src/main/resources/templates/webOffice.html b/product-server-web/src/main/resources/templates/webOffice.html
index dd92f9b..107cb94 100644
--- a/product-server-web/src/main/resources/templates/webOffice.html
+++ b/product-server-web/src/main/resources/templates/webOffice.html
@@ -259,14 +259,17 @@
var signature = [[${signature}]];
let data = JSON.parse([[${requestParaTemp}]]);
var formData = JSON.stringify(data);
- alert(formData)
WebOffice.HttpAddPostString('signature', signature);
WebOffice.HttpAddPostString('~table~', 'product_sys_attachments');
WebOffice.HttpAddPostString('formData', formData);
WebOffice.HttpAddPostCurrFile("docfile", "");//姝ゅ彞涓哄浐瀹氳鍙ワ紝涓嶇鏄繚瀛榳ord杩樻槸excel,ppt绛夐兘杩欐牱鍐�
var strResults = WebOffice.HttpPost(strSaveUrl);
- console.log(strResults)
- if (strResults) {
+
+ if (strResults) { //灏唖trResults杞崲涓哄皬鍐� 鍒ゆ柇瀛楃涓叉槸鍚﹀寘鍚玜ctive 鍜宔vent
+ if (strResults.toLowerCase().indexOf('active') != -1 && strResults.toLowerCase().indexOf('event') != -1) {
+ //淇濆瓨鎴愬姛
+ return;
+ }
var res = JSON.parse(strResults);
if (res && res.code != 200) {
if (res.code == "90021" || res.code == '90044') {
@@ -277,14 +280,11 @@
}
alert(res.msg);
}
- // alert(strResults)
- // JSON.parse()
}
- // alert(strResults);//鐢╝lert璇彞鍙互鏄剧ず鏈嶅姟鍣ㄧ缃戦〉杩斿洖鐨勬暟鎹�
- // strResults;//濡傛灉淇濆瓨鎴愬姛锛岀紪绋嬫椂璁╂湇鍔″櫒鎺ユ敹浠ｇ爜濡倁pload.jsp,upload.aspx,upload.php绛夎繑鍥炵┖鍊兼垨OK瀛椾覆銆�
} catch (e) {
console.error(e);
- alert('鍙戠敓閿欒锛佽浣跨敤鏌ラ槄杩斿洖鍊硷紒');
+ //鑾峰彇閿欒淇℃伅
+ alert('鍙戠敓閿欒锛佽浣跨敤鏌ラ槄杩斿洖鍊硷紒' + e.message);
}
}
--
Gitblit v1.9.2