From fb8c159d1b035fbc8fc1656da27a197bdb2f9c01 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 24 十二月 2024 19:50:02 +0800
Subject: [PATCH] 维保人员资质
---
src/main/java/com/product/file/service/DocumentDirectoryService.java | 398 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 327 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentDirectoryService.java b/src/main/java/com/product/file/service/DocumentDirectoryService.java
index 7d9dd21..bc2de3b 100644
--- a/src/main/java/com/product/file/service/DocumentDirectoryService.java
+++ b/src/main/java/com/product/file/service/DocumentDirectoryService.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.product.common.collect.ListUtils;
-import com.product.common.lang.DateUtils;
+import com.product.core.config.CoreConst;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -16,11 +16,14 @@
import com.product.file.config.DocumentCode;
import com.product.file.service.ide.IDocumentDirectoryService;
import com.product.module.sys.entity.SystemUser;
+import com.product.quartz.service.impl.SysJobService;
import com.product.util.BaseUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -39,9 +42,11 @@
public BaseDao baseDao;
@Autowired
public DocumentDirectoryService documentDirectoryService;
-
+ @Autowired
+ SysJobService sysJobService;
/**
- * 鍗曚綅鏂囦欢澶规爲
+ * 鍗曚綅鏂囦欢澶规爲
+ *
* @return
*/
public DataTableEntity allDirectoryTree() {
@@ -52,68 +57,288 @@
return dtTree;
}
- @Override
+ /**
+ * 鏂囨。鐩綍淇濆瓨
+ *
+ * @param fse
+ * @return
+ */
@Transactional
- public String addDocumentDirectory(FieldSetEntity fieldSetEntity) throws BaseException {
-
- String triCode = CodeUtil.getNewCodeByTemp(CmnConst.PRODUCT_OA_DIRECTORY, CmnConst.TRICODE,
- !StringUtils.isEmpty(fieldSetEntity.getString(CmnConst.TRICODE_PARENT))
- ? fieldSetEntity.getString(CmnConst.TRICODE_PARENT)
- : "");
- fieldSetEntity.setValue(CmnConst.TRICODE, triCode);
- String[] codes = triCode.split("-");
- String org_level_uuid = SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid();
- fieldSetEntity.setValue(CmnConst.ORG_LEVEL_UUID, org_level_uuid);
- fieldSetEntity.setValue(CmnConst.DIRECTORY_TIER, codes.length);
- fieldSetEntity.setValue(CmnConst.CREATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());// 鑾峰彇鐧诲綍甯愬彿
- fieldSetEntity.setValue(CmnConst.CREATED_UTC_DATETIME, DateUtils.getDateTime());// 鍒涘缓鏃堕棿
- return baseDao.add(fieldSetEntity);
- }
-
- @Override
- @Transactional
- public boolean upDocumentDirectory(FieldSetEntity fieldSetEntity) throws BaseException {
- String uuid = fieldSetEntity.getString(CmnConst.UUID);
- FieldSetEntity fieldSet = baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_DIRECTORY, uuid, false);
- String tricode_parent1 = fieldSetEntity.getString(CmnConst.TRICODE_PARENT);
- String tricode_parent2 = fieldSet.getString(CmnConst.TRICODE_PARENT);
- boolean flag;
- // 涓婄骇鐩綍tricode濡傛灉涓嶇浉绛�
- if (!StringUtils.isEmpty(tricode_parent1) || !StringUtils.isEmpty(tricode_parent2)) {
- if (!StringUtils.isEmpty(tricode_parent1) && !StringUtils.isEmpty(tricode_parent2)
- && !tricode_parent1.equals(tricode_parent2)) {
- flag = true;
- } else if (!StringUtils.isEmpty(tricode_parent1) && !StringUtils.isEmpty(tricode_parent2)
- && tricode_parent1.equals(tricode_parent2)) {
- flag = false;
- } else if (!StringUtils.isEmpty(tricode_parent1) && StringUtils.isEmpty(tricode_parent2)) {
- tricode_parent2 = "";
- flag = true;
- } else if (!StringUtils.isEmpty(tricode_parent2) && StringUtils.isEmpty(tricode_parent1)) {
- tricode_parent1 = "";
- flag = true;
- } else {
- flag = false;
- }
+ public boolean saveDocumentDireactory(FieldSetEntity fse) {
+ BaseUtil.createCreatorAndCreationTime(fse);
+ String tricode = null;
+ String tricodeParent = BaseUtil.strIsNull(fse.getString(CmnConst.TRICODE_PARENT)) ? "" : fse.getString(CmnConst.TRICODE_PARENT);
+ if (BaseUtil.strIsNull(fse.getUUID())) {
+ tricode = CodeUtil.getNewCodeByTemp(CmnConst.PRODUCT_OA_DIRECTORY, CmnConst.TRICODE, tricodeParent);
} else {
- flag = false;
+ FieldSetEntity fseOrigin = baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_DIRECTORY, fse.getUUID(), false);
+ if (fseOrigin == null) {
+ fse.remove(CoreConst.UUID);
+ }
+ String originParent = BaseUtil.strIsNull(fseOrigin.getString(CmnConst.TRICODE_PARENT)) ? "" : fseOrigin.getString(CmnConst.TRICODE_PARENT);
+ if (!originParent.equals(tricodeParent)) {
+ String originTricode = BaseUtil.strIsNull(fseOrigin.getString(CmnConst.TRICODE)) ? "" : fseOrigin.getString(CmnConst.TRICODE);
+ tricode = CodeUtil.getNewCodeByTemp(CmnConst.PRODUCT_OA_DIRECTORY, CmnConst.TRICODE, tricodeParent);
+ // 鍒锋柊code
+ StringBuilder sql = new StringBuilder();
+ sql.append("update product_oa_directory ");
+ sql.append("set tricode=concat(replace(substring(tricode,1,locate(?,tricode)+length(?)),?,?),substring(tricode,locate(?,tricode)+length(?)+1)), ");
+ sql.append("tricode_parent=concat(replace(substring(tricode_parent,1,locate(?,tricode_parent)+length(?)),?,?),substring(tricode_parent,locate(?,tricode_parent)+length(?)+1)) ");
+ sql.append("where tricode like ? ");
+ baseDao.executeUpdate(sql.toString(), new Object[]{originTricode, originTricode, originTricode, tricode, originTricode, originTricode,
+ originTricode, originTricode, originTricode, tricode, originTricode, originTricode, originTricode + "-%"});
+ // 鍒锋柊灞傜骇
+ StringBuilder sb = new StringBuilder();
+ sb.append("UPDATE product_oa_directory \n");
+ sb.append("SET directory_tier = ( \n");
+ sb.append(" (LENGTH(tricode) - LENGTH(REPLACE(tricode, '-', '')) + 1) \n");
+ sb.append(") \n");
+ sb.append("WHERE tricode LIKE ? \n");
+ baseDao.executeUpdate(sb.toString(), new Object[] {tricode + "%"});
+ }else {
+ tricode = fseOrigin.getString(CmnConst.TRICODE);
+ }
}
-
- if (flag) {
- StringBuffer sql = new StringBuffer();
- sql.append(" update PRODUCT_OA_directory set tricode=replace(");
- sql.append(" tricode,concat(?,'-'),concat(?,'-')),");
- sql.append(" tricode_parent=(case when tricode_parent=? then replace(tricode_parent,?,?) else ");
- sql.append(" replace (tricode_parent,concat(?,'-'),concat(?,'-')) end )");
- sql.append(" where tricode like ?");
- baseDao.executeUpdate(sql.toString(), new String[] { tricode_parent1, tricode_parent2, tricode_parent1,
- tricode_parent1, tricode_parent2, tricode_parent1, tricode_parent2, tricode_parent1 + "-%", });
- }
-
- fieldSetEntity.setValue(CmnConst.UPDATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());// 鑾峰彇鐧诲綍甯愬彿
- fieldSetEntity.setValue(CmnConst.UPDATED_UTC_DATETIME, DateUtils.getDateTime());// 鍒涘缓鏃堕棿
- return baseDao.update(fieldSetEntity);
+ fse.setValue(CmnConst.TRICODE, tricode);
+ fse.setValue(CmnConst.DIRECTORY_TIER, tricode.split("-").length);
+ return baseDao.saveFieldSetEntity(fse);
}
+ @Transactional
+ @Override
+ public boolean saveFileConfig(FieldSetEntity fse) {
+ //鑾峰彇鍔熻兘琛ㄥ悕
+ FieldSetEntity functionUuid = baseDao.getFieldSet(CmnConst.PRODUCT_SYS_FUNCTIONS, fse.getString("function_uuid"), false);
+
+ DataTableEntity field = baseDao.listTable(CmnConst.PRODUCT_SYS_DATAMODEL_FIELD, "table_uuid=? and field_name=?", new String[]{functionUuid.getString("table_uuid"), "archive_flag"});
+ if (field.getRows()==0){
+ FieldSetEntity fs = new FieldSetEntity();
+ fs.setTableName(CmnConst.PRODUCT_SYS_DATAMODEL_FIELD);
+ fs.setValue("table_uuid",functionUuid.getString("table_uuid"));
+ fs.setValue("field_name","archive_flag");
+ fs.setValue("field_type","int");
+ fs.setValue("field_show_name","褰掓。鏍囪瘑");
+ fs.setValue("field_description","褰掓。鏍囪瘑");
+ fs.setValue("field_length",10);
+ fs.setValue("field_unit",0);
+ fs.setValue("is_required",0);
+ fs.setValue("is_unique",0);
+ fs.setValue("is_filter",0);
+ fs.setValue("field_sequence",0);
+ fs.setValue("created_by",SpringMVCContextHolder.getCurrentUser().getUser_id());
+ fs.setValue("created_utc_datetime",new Date());
+ baseDao.saveFieldSetEntity(fs);
+ FieldSetEntity table = baseDao.getFieldSet(CmnConst.PRODUCT_SYS_DATAMODEL_TABLE, functionUuid.getString("table_uuid"), false);
+ baseDao.executeUpdate("ALTER TABLE "+table.getString("table_name")+" ADD COLUMN archive_flag INT(4) COMMENT '褰掓。鏍囪瘑';");
+ }
+
+
+ FieldSetEntity timedTask = baseDao.getFieldSetByFilter("product_sys_timed_task", "job_name=? and invoke_target like concat('%',?,'%') ", new String[]{fse.getString("filing_name") + "瀹氭椂", fse.getString("uuid")}, false);
+ String timeTaskUuid=null;
+ if (!FieldSetEntity.isEmpty(timedTask)){
+ timeTaskUuid=timedTask.getUUID();
+ }
+ boolean re = baseDao.saveFieldSetEntity(fse);
+ createdTimeTask(fse.getString("filing_name"),fse.getString("cron"),fse.getUUID(),timeTaskUuid);
+ return re;
+ }
+ private FieldSetEntity createdTimeTask(String target_table, String execute_time, String task_uuid, String timeTaskUuid) throws BaseException {
+ //
+ FieldSetEntity fse = new FieldSetEntity();
+ try {
+ fse.setTableName("product_sys_timed_task");
+ fse.setValue("uuid", timeTaskUuid);
+ fse.setValue("job_name", target_table + "瀹氭椂");//浠诲姟鍚嶇О
+ fse.setValue("job_group", "system");//鍒嗙粍
+ fse.setValue("invoke_target", "documentDirectoryService.fileTime('" + task_uuid + "')");//璋冪敤鐩爣瀛楃涓�
+ fse.setValue("cron_expression", execute_time);//cron琛ㄨ揪寮�
+ fse.setValue("misfire_policy", "3");//閿欒鎵ц绛栫暐 鍙墽琛屼竴娆�
+ fse.setValue("concurrent", 0);//涓嶅厑璁稿苟鍙戞墽琛�
+ fse.setValue("remark", target_table + "瀹氭椂");
+ fse.setValue("created_by", SpringMVCContextHolder.getCurrentUser().getUser_id());
+ fse.setValue("created_utc_datetime", new Date());
+ fse.setValue("status", 1);
+ fse.setValue("is_conceal", 1);
+ if (!com.product.common.lang.StringUtils.isEmpty(timeTaskUuid)) {
+ sysJobService.updateJob(fse);
+ } else {
+ sysJobService.insertJob(fse);
+ }
+ return fse;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new BaseException(DocumentCode.CRATED_TIMED_TASK_FAIL);
+ }
+//
+ }
+ /**
+ * 褰掓。瀹氭椂浠诲姟
+ */
+ @Transactional
+ public void fileTime(String uuid){
+ FieldSetEntity fs = baseDao.getFieldSet(CmnConst.PRODUCT_AO_FILING_CONFIG,uuid,false);
+ FieldSetEntity functionUuid = baseDao.getFieldSet(CmnConst.PRODUCT_SYS_FUNCTIONS, fs.getString("function_uuid"), false);
+ DataTableEntity fieldTable = baseDao.listTable(CmnConst.PRODUCT_SYS_DATAMODEL_FIELD, "table_uuid=? and (field_type='file' or field_name='flow_flag')", new String[]{functionUuid.getString("table_uuid")}," field_type ");
+
+ FieldSetEntity table = baseDao.getFieldSet(CmnConst.PRODUCT_SYS_DATAMODEL_TABLE, functionUuid.getString("table_uuid"), false);
+ StringBuilder sb = new StringBuilder();
+ sb.append("select concat(");
+ String flow_flag="";
+ for (int i = 0; i <fieldTable.getRows() ; i++) {
+ if (i==0&&!fieldTable.getString(i, "field_name").equals("flow_flag")){
+ sb.append("a.").append(fieldTable.getString(i, "field_name"));
+ }else if (i!=0&&!fieldTable.getString(i, "field_name").equals("flow_flag")){
+ sb.append(",',',").append("a.").append(fieldTable.getString(i, "field_name"));
+
+ }else if (fieldTable.getString(i,"field_name").equals("flow_flag")){
+ flow_flag=" and a.flow_flag=2";
+ }
+ }
+ sb.append(") file,a.uuid,b.uuid directory_uuid,");
+ sb.append("a.").append(fs.getString("field_title"));
+ sb.append(",a.").append(fs.getString("field_send_time")).append(" send_time");
+ sb.append(",c.user_name ");
+ sb.append(" from ");
+ sb.append(table.getString("table_name")).append(" a ");
+ sb.append(" LEFT JOIN (SELECT uuid,directory_name,filing_config_field_uuid FROM product_oa_directory where filing_config_table=? and tricode_parent='").append(fs.getString("filing_catalog")).append("') b ");
+ sb.append("on a.").append(fs.getString("field_title")).append("=b.directory_name and a.uuid=b.filing_config_field_uuid ");
+
+ sb.append(" LEFT JOIN product_sys_users c on a.").append(fs.getString("field_send_user")).append("=c.user_id");
+ sb.append(" where (a.archive_flag!=1 or a.archive_flag is null) ");
+ sb.append(flow_flag);
+ sb.append(" ORDER BY a.id LIMIT 1000 ");
+
+ //鑾峰彇娴佺▼閲岄潰鐨勯檮浠秙ql
+ StringBuffer nodeSal = new StringBuffer();
+ nodeSal.append(" select a.uuid,b.flow_attachment from ");
+ nodeSal.append(table.getString("table_name")).append(" a ");
+ nodeSal.append(" LEFT JOIN product_sys_flow_detail b on a.uuid=b.record_uuid ");
+ nodeSal.append(" where (a.archive_flag!=1 or a.archive_flag is null) and b.flow_attachment is not null");
+ nodeSal.append(flow_flag);
+ nodeSal.append(" ORDER BY a.id LIMIT 1000 ");
+
+ fieldLimit(sb.toString(),nodeSal.toString(),fs.getString("field_title"),fs.getString("filing_catalog"),fs.getString("turn_button"),table.getString("table_name"));
+
+
+ }
+
+ /**
+ *
+ * @param sql
+ * @param field_title 鏍囬瀛楁
+ * @param filing_catalog 鐖剁骇褰掓。鐩綍
+ */
+ private void fieldLimit(String sql,String nodeSal,String field_title,String filing_catalog,String turn_button,String table){
+
+ //鑾峰彇鐖剁被鏂囨。淇℃伅
+ FieldSetEntity parentDirectory = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY, "tricode=?", new String[]{filing_catalog}, false);
+ DataTableEntity fieldDt = baseDao.listTable(sql, new String[]{table});
+ //鑾峰彇娴佺▼闄勪欢骞跺姞鍏ュ埌file閲�
+ DataTableEntity nodeDt = baseDao.listTable(nodeSal, new String[]{});
+ for (int i = 0; i <nodeDt.getRows() ; i++) {
+ FieldSetEntity fieldfs = fieldDt.getFieldSetEntity(nodeDt.getString(i, "uuid")).get(0);
+ if (!FieldSetEntity.isEmpty(fieldfs)){
+ if (StringUtils.isEmpty(fieldfs.getString("file"))){
+ fieldfs.setValue("file",nodeDt.getString(i,"flow_attachment"));
+ }else {
+ fieldfs.setValue("file",fieldfs.getString("file")+","+nodeDt.getString(i,"flow_attachment"));
+ }
+ }
+ }
+
+ ArrayList<String> fileList = new ArrayList<>();
+ for (int i = 0; i <fieldDt.getRows() ; i++) {
+ String file = fieldDt.getString(i, "file");
+ if (!StringUtils.isEmpty(file)){
+ for (int j = 0; j < file.split(",").length; j++) {
+ fileList.add(file.split(",")[j]);
+ }
+ }
+ }
+ DataTableEntity attachments = baseDao.listTable(CmnConst.PRODUCT_SYS_ATTACHMENTS, BaseUtil.buildQuestionMarkFilter("uuid", fileList.size(), true), fileList.toArray(new String[0]));
+ if (fieldDt.getRows()>0) {
+ for (int i = 0; i < fieldDt.getRows(); i++) {
+ FieldSetEntity fs = fieldDt.getFieldSetEntity(i);
+ String directoryUUID=null;
+ if (StringUtils.isEmpty(fs.getString("directory_uuid"))){
+ //鏍规嵁涓婄骇鐩綍鑾峰彇鐩綍缂栧彿
+ String tricode = CodeUtil.getNewCodeByTemp(CmnConst.PRODUCT_OA_DIRECTORY, CmnConst.TRICODE, filing_catalog);
+ //鑾峰彇鐩綍鍚嶇О
+ String title = fs.getString(field_title);
+ directoryUUID = addDirectory(title, tricode, filing_catalog, parentDirectory.getInteger("directory_tier") + 1,fs.getUUID(),table);
+
+ }else {
+ directoryUUID=fs.getString("directory_uuid");
+ }
+ String file = fs.getString("file");
+ if (!StringUtils.isEmpty(file)){
+ for (int j = 0; j <file.split(",").length ; j++) {
+ //鍒涘缓鏂囦欢
+ String f = file.split(",")[j];
+ if (StringUtils.isEmpty(file.split(",")[j])||DataTableEntity.isEmpty(attachments)){
+ continue;
+ }
+ FieldSetEntity attachmentsFs = attachments.getFieldSetEntity(f).get(0);
+ FieldSetEntity document = new FieldSetEntity();
+ document.setTableName(CmnConst.PRODUCT_OA_DOCUMENT);
+ document.setValue("directory_uuid",directoryUUID);
+ document.setValue("file_name",attachmentsFs.getString("file_name"));
+ document.setValue("attachments_uuid",f);
+ String[] type = f.split("\\.");
+ document.setValue("file_type",type[type.length-1]);
+ document.setValue("created_by", 1);
+ document.setValue("created_utc_datetime", new Date());
+ document.setValue("file_size", attachmentsFs.getString("attachment_size"));
+ baseDao.saveFieldSetEntity(document);
+ }
+ }
+ FieldSetEntity document = new FieldSetEntity();
+ document.setTableName(CmnConst.PRODUCT_OA_DOCUMENT);
+ document.setValue("directory_uuid",directoryUUID);
+ document.setValue("file_name",fs.getString(field_title)+" "+fs.getString("user_name")+" "+fs.getString("send_time"));
+ document.setValue("created_by", 1);
+ document.setValue("created_utc_datetime", new Date());
+ document.setValue("turn_button", turn_button);
+ document.setValue("file_size", 0);
+ document.setValue("file_type","铏氭嫙鏂囨。");
+
+ baseDao.saveFieldSetEntity(document);
+ baseDao.executeUpdate("UPDATE "+table+" set archive_flag =1 where uuid=?",new String[]{fs.getUUID()});
+ }
+ fieldLimit(sql,nodeSal,field_title,filing_catalog,turn_button,table);
+ }
+ }
+
+ /**
+ *
+ * @param field_title 鐩綍鏍囬
+ * @param tricode 缂栧彿
+ * @param tricode_parent 鐖剁骇缂栧彿
+ * @param directory_tier 鐩綍灞傜骇
+ */
+
+ private String addDirectory(String field_title,String tricode,String tricode_parent,Integer directory_tier,String filing_config_field_uuid,String table){
+ //鏂板缓鐩綍
+ FieldSetEntity fsDirectory = new FieldSetEntity();
+ fsDirectory.setTableName(CmnConst.PRODUCT_OA_DIRECTORY);
+ fsDirectory.setValue("created_by", 1);
+ fsDirectory.setValue("created_utc_datetime", new Date());
+ fsDirectory.setValue("org_level_uuid", "00000000-0000-0000-0000-000000000000");
+ fsDirectory.setValue("directory_name", field_title);
+ fsDirectory.setValue("directory_tier", directory_tier);
+ fsDirectory.setValue("directory_type", 1);
+ fsDirectory.setValue("tricode", tricode);
+ fsDirectory.setValue("tricode_parent", tricode_parent);
+ fsDirectory.setValue("filing_config_field_uuid", filing_config_field_uuid);
+ fsDirectory.setValue("filing_config_table", table);
+
+ baseDao.saveFieldSetEntity(fsDirectory);
+ return fsDirectory.getUUID();
+ }
+
+
+
+
+
@Override
@Transactional
@@ -127,10 +352,10 @@
DataTableEntity dataTableEntity = baseDao.listTable(
"SELECT * FROM PRODUCT_OA_directory WHERE directory_type = ? AND tricode_parent = (SELECT tricode FROM PRODUCT_OA_directory where uuid = ?)"
+ filter,
- new String[] { directory_type, uuid });
+ new String[]{directory_type, uuid});
if (BaseUtil.dataTableIsEmpty(dataTableEntity)) {
- baseDao.delete(CmnConst.PRODUCT_OA_DOCUMENT, "directory_uuid = ?", new String[] { uuid });
- return baseDao.delete(CmnConst.PRODUCT_OA_DIRECTORY, new String[] { uuid });
+ baseDao.delete(CmnConst.PRODUCT_OA_DOCUMENT, "directory_uuid = ?", new String[]{uuid});
+ return baseDao.delete(CmnConst.PRODUCT_OA_DIRECTORY, new String[]{uuid});
} else {
throw new BaseException(DocumentCode.DOCUMENT_CATALOG_DELETE_FAIL.getValue(),
DocumentCode.DOCUMENT_CATALOG_DELETE_FAIL.getText(), this.getClass(),
@@ -140,7 +365,7 @@
/**
* 鑾峰彇褰撳墠鏂囦欢璺緞
- *
+ *
* @param fieldSetEntity
* @return
* @throws BaseException
@@ -198,32 +423,63 @@
if ("1".equals(directory_type)) {
String org_level_uuid = user.getOrg_level_uuid();
sql.append("where directory_type = 1 AND org_level_uuid = ? ");
- data = baseDao.listTable(sql.toString(), new Object[] { org_level_uuid });
+ data = baseDao.listTable(sql.toString(), new Object[]{org_level_uuid});
// data = baseDao.listTable(CmnConst.PRODUCT_OA_DIRECTORY, " directory_type = 1 AND org_level_uuid = ?", new String[]{org_level_uuid}, "tricode");
// 涓汉鏂囦欢澶�
} else {
Integer userId = user.getUser_id();
sql.append("where directory_type = 2 AND created_by = ? ");
- data = baseDao.listTable(sql.toString(), new Object[] { userId });
+ data = baseDao.listTable(sql.toString(), new Object[]{userId});
// data = baseDao.listTable(CmnConst.PRODUCT_OA_DIRECTORY, " directory_type = 2 AND created_by = ?", new Object[]{userId}, "tricode");
}
+
+
baseDao.listInternationDataTable(data, null);
JSONArray menus = this.encapsulationTree(data);
// 鑾峰彇褰撳墠鍏徃
JSONObject orgLevelInfo = new JSONObject();
- orgLevelInfo.put("directory_name", user.getOrg_level_name());
+ String orgLevelName = user.getOrg_level_name();
+
+ orgLevelInfo.put("directory_name", orgLevelName);
orgLevelInfo.put("tricode", "");
orgLevelInfo.put("org_level_uuid", user.getOrg_level_uuid());
orgLevelInfo.put("children", menus);
JSONArray array = new JSONArray();
+ if (!"1".equals(directory_type)) {
+// 鏌ヨ鏁伴噺
+ sql.setLength(0);
+ sql.append(" SELECT\n");
+ sql.append(" ( SELECT count(*) FROM product_oa_document_collection WHERE document_collector = ? ) collection_count,\n");
+ sql.append(" ( SELECT count(distinct sub_uuid ) FROM product_oa_document_borrow_sub WHERE borrow_uuid IN ( SELECT uuid FROM product_oa_document_borrow WHERE borrower = ? and flow_flag=2) ) borrow_count\n");
+ sql.append(" FROM\n");
+ sql.append("DUAL\n");
+ FieldSetEntity fieldSetBySQL = baseDao.getFieldSetBySQL(sql.toString(), new Object[]{user.getUser_id(), user.getUser_id()}, false);
+ int collectionCount = 0;
+ int borrowCount = 0;
+ if (fieldSetBySQL != null) {
+ collectionCount = BaseUtil.ifNull(fieldSetBySQL.getInteger("collection_count"), 0);
+ borrowCount = BaseUtil.ifNull(fieldSetBySQL.getInteger("borrow_count"), 0);
+ }
+ //娣诲姞鏀惰棌澶瑰拰鍊熼槄鏂囦欢澶�
+ JSONObject favorite = new JSONObject();
+ favorite.put("directory_name", "鏀惰棌澶�");
+ favorite.put("uuid", "!favorite");
+ favorite.put("number", collectionCount);
+ menus.add(0, favorite);
+ JSONObject borrow = new JSONObject();
+ borrow.put("directory_name", "鍊熼槄鏂囦欢");
+ borrow.put("uuid", "!borrow");
+ borrow.put("number", borrowCount);
+ menus.add(1, borrow);
+ }
array.add(orgLevelInfo);
return array;
}
/**
* 灏佽鏍戞柟娉�
- *
+ *
* @param
* @return
* @throws BaseException
@@ -265,7 +521,7 @@
/**
* 绉诲姩鍒扮洰褰曞垪琛紙鏍规嵁褰撳墠鐢ㄦ埛杩囨护灞曠ず鐩綍鍒楄〃锛� 鑾峰彇鐢ㄦ埛鏈夋柊澧烇紙涓婁紶锛夋潈闄愮殑鍒楄〃
- *
+ *
* @param
* @return
* @throws BaseException
@@ -287,7 +543,7 @@
param.append(userId);
sql.append("SELECT * FROM PRODUCT_OA_directory ").append(" WHERE directory_type = 2 AND created_by = ? ");
}
- DataTableEntity dataTableEntity = baseDao.listTable(sql.toString(), new String[] { param.toString() });
+ DataTableEntity dataTableEntity = baseDao.listTable(sql.toString(), new String[]{param.toString()});
baseDao.listInternationDataTable(dataTableEntity, null);
return dataTableEntity;
}
--
Gitblit v1.9.2