Compare commits
6 Commits
main_koumen
...
main
| Author | SHA1 | Date |
|---|---|---|
LiuJiaNan
|
280f0e4598 | |
 zhaokai
|
42c11c2bea | |
|
zhaokai
|
7194fd818f | |
|
zhaokai
|
daca8f03f1 | |
|
zhaokai
|
47ebd5c6d7 | |
|
zhaokai
|
16c316dc36 |
|
|
@ -3,8 +3,8 @@ spring:
|
|||
import:
|
||||
# - classpath:nacos.yml
|
||||
# - classpath:sdk.yml
|
||||
# - classpath:nacos-prod.yml
|
||||
# - classpath:sdk-prod.yml
|
||||
- classpath:nacos-prod2.yml
|
||||
- classpath:sdk-prod2.yml
|
||||
- classpath:nacos-prod.yml
|
||||
- classpath:sdk-prod.yml
|
||||
# - classpath:nacos-prod2.yml
|
||||
# - classpath:sdk-prod2.yml
|
||||
- classpath:swagger.yml
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ openapi:
|
|||
tenantIds: 1838408702262321152
|
||||
smb:
|
||||
host: 39.100.115.58
|
||||
port: 22
|
||||
port: 22022
|
||||
user: root
|
||||
password: '@EwLEkf56oTYP-gU'
|
||||
basePath: /mnt/gbsfile/gwj/file/
|
||||
|
|
@ -70,4 +70,9 @@ nine:
|
|||
companyId: 2008712261453131776,2046785341004177408
|
||||
file:
|
||||
upload:
|
||||
url: https://jpfz.qhdsafety.com/gbsFileTest/
|
||||
url: https://jpfz.qhdsafety.com/gbsFileTest/
|
||||
qualifications:
|
||||
page:
|
||||
allowed-tenant-ids:
|
||||
- 1976974388809424896
|
||||
- 2008712261453131776
|
||||
|
|
@ -69,4 +69,10 @@ nine:
|
|||
companyId: 2590800828822460065,2044322367672422400
|
||||
file:
|
||||
upload:
|
||||
url: http://192.168.192.201:8992/file/uploadFiles2/
|
||||
url: http://192.168.192.201:8992/file/uploadFiles2/
|
||||
qualifications:
|
||||
page:
|
||||
allowed-tenant-ids:
|
||||
- 1746864895590143510
|
||||
- 2076831356482732032
|
||||
- 1976974388809424896
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/8/26 09:51:42) App/basicInfo"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>--</title><script>(function () {
|
||||
const APP_ENV = {
|
||||
antd: {
|
||||
'ant-prefix': 'micro-temp',
|
||||
fontFamily: 'PingFangSC-Regular',
|
||||
colorPrimary: '#1677ff',
|
||||
borderRadius: parseInt('2')
|
||||
},
|
||||
appKey: '',
|
||||
basename: 'basicInfo',
|
||||
API_HOST: ''
|
||||
};
|
||||
APP_ENV.API_HOST = sessionStorage.API_HOST || APP_ENV.API_HOST || window.location.origin;
|
||||
window.process = {
|
||||
env: { app: APP_ENV },
|
||||
NODE_ENV: 'production'
|
||||
};
|
||||
window.__JJB_ENVIRONMENT__ = {
|
||||
API_HOST: APP_ENV.API_HOST,
|
||||
redirect: '',
|
||||
FRAMEWORK: APP_ENV.antd
|
||||
};
|
||||
})();</script><script defer="defer" src="/basicInfo/static/js/55.36ee9e20b46eb55389a0.js"></script><script defer="defer" src="/basicInfo/static/js/386.6988d77ba484fb40fcdb.js"></script><script defer="defer" src="/basicInfo/static/js/848.9e47a832cb06238b4754.js"></script><script defer="defer" src="/basicInfo/static/js/485.c1b7b591b699776b6161.js"></script><script defer="defer" src="/basicInfo/static/js/main.e440451deb844344fb04.js"></script><link href="/basicInfo/static/css/main.6fa32fc45cc1ccc5d2f6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/8/26 09:51:42) App/basicInfo Version/master Java/main", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
||||
|
|
@ -0,0 +1 @@
|
|||
.micro-temp-table-cell-scrollbar{width:15px}.micro-temp-table-cell .micro-temp-btn-link{padding:0}.micro-temp-pro-table-list-toolbar-container{padding-bottom:16px;padding-top:0!important}.header-back{background-color:#fff;border-bottom:1px solid #dcdfe6;margin-bottom:0;padding:10px 20px;position:sticky;top:0;z-index:9}.header-back .action,.header-back .action .back{align-items:center;display:flex}.header-back .action .back{cursor:pointer;font-size:14px;gap:10px}.header-back .action .title{font-size:17px}.cesium-infoBox-visible,.cesium-viewer-fullscreenContainer,.cesium-viewer-toolbar{display:none!important}body,html{height:100%;width:100%}input::-ms-clear,input::-ms-reveal{display:none}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:rgba(0,0,0,0)}@-ms-viewport{width:device-width}body{margin:0}[tabindex="-1"]:focus{outline:none}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{font-weight:500;margin-bottom:.5em;margin-top:0}p{margin-bottom:1em;margin-top:0}abbr[data-original-title],abbr[title]{border-bottom:0;cursor:help;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}address{font-style:normal;line-height:inherit;margin-bottom:1em}input[type=number],input[type=password],input[type=text],textarea{-webkit-appearance:none}dl,ol,ul{margin-bottom:1em;margin-top:0}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:500}dd{margin-bottom:.5em;margin-left:0}blockquote{margin:0 0 1em}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}code,kbd,pre,samp{font-family:SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace;font-size:1em}pre{margin-bottom:1em;margin-top:0;overflow:auto}figure{margin:0 0 1em}img{border-style:none;vertical-align:middle}[role=button],a,area,button,input:not([type=range]),label,select,summary,textarea{touch-action:manipulation}table{border-collapse:collapse}caption{caption-side:bottom;padding-bottom:.3em;padding-top:.75em;text-align:left}button,input,optgroup,select,textarea{color:inherit;font-family:inherit;font-size:inherit;line-height:inherit;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{border:0;margin:0;min-width:0;padding:0}legend{color:inherit;display:block;font-size:1.5em;line-height:inherit;margin-bottom:.5em;max-width:100%;padding:0;white-space:normal;width:100%}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:none;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}output{display:inline-block}summary{display:list-item}template{display:none}[hidden]{display:none!important}mark{background-color:#feffe6;padding:.2em}.micro-temp-modal-header{border-bottom:1px solid #ccc!important;margin:0 -24px 15px!important;padding:0 24px 15px!important}.micro-temp-modal-footer{text-align:center!important}.search-layout{position:relative}.search-layout:after{background-color:#f1f1f2;bottom:-10px;content:"";height:10px;left:-20px;position:absolute;right:-20px}.search-layout+.table-layout{padding-top:26px!important}.card-layout{background-color:#fff;border-radius:6px}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
|
|
@ -0,0 +1 @@
|
|||
module.exports={compact:!1,plugins:[["@babel/plugin-proposal-decorators",{legacy:!0}]],presets:[["@babel/preset-env",{targets:{browsers:["ie >= 10"]}}],["@babel/preset-react",{runtime:"automatic"}]]};
|
||||
|
|
@ -0,0 +1 @@
|
|||
module.exports={javaGit:"http://47.92.113.182:3000/zcloud_gbs/zcloud_gbs_basic_info_gwj.git",javaGitName:"zcloud_gbs_basic_info_gwj",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"main",API_HOST:""}},appIdentifier:"basicInfo",contextInject:{appKey:"",fileUrl:""},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8888",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,54 @@
|
|||
/*!
|
||||
Copyright (c) 2018 Jed Watson.
|
||||
Licensed under the MIT License (MIT), see
|
||||
http://jedwatson.github.io/classnames
|
||||
*/
|
||||
|
||||
/*!
|
||||
* html2canvas 1.4.1 <https://html2canvas.hertzen.com>
|
||||
* Copyright (c) 2022 Niklas von Hertzen <https://hertzen.com>
|
||||
* Released under MIT License
|
||||
*/
|
||||
|
||||
/*!
|
||||
* is-plain-object <https://github.com/jonschlinkert/is-plain-object>
|
||||
*
|
||||
* Copyright (c) 2014-2017, Jon Schlinkert.
|
||||
* Released under the MIT License.
|
||||
*/
|
||||
|
||||
/*!
|
||||
* isobject <https://github.com/jonschlinkert/isobject>
|
||||
*
|
||||
* Copyright (c) 2014-2017, Jon Schlinkert.
|
||||
* Released under the MIT License.
|
||||
*/
|
||||
|
||||
/*! *****************************************************************************
|
||||
Copyright (c) Microsoft Corporation.
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted.
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
PERFORMANCE OF THIS SOFTWARE.
|
||||
***************************************************************************** */
|
||||
|
||||
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
|
||||
|
||||
/** @preserve
|
||||
* Counter block mode compatible with Dr Brian Gladman fileenc.c
|
||||
* derived from CryptoJS.mode.CTR
|
||||
* Jan Hruby jhruby.web@gmail.com
|
||||
*/
|
||||
|
||||
/** @preserve
|
||||
(c) 2012 by Cédric Mesnil. All rights reserved.
|
||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
||||
- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
||||
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,79 @@
|
|||
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
|
||||
/** */
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,85 @@
|
|||
/*!
|
||||
* screenfull
|
||||
* v5.2.0 - 2021-11-03
|
||||
* (c) Sindre Sorhus; MIT License
|
||||
*/
|
||||
|
||||
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
|
||||
|
||||
/**
|
||||
* @license React
|
||||
* react-dom.production.min.js
|
||||
*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @license React
|
||||
* react-is.production.min.js
|
||||
*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @license React
|
||||
* react-jsx-runtime.production.min.js
|
||||
*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @license React
|
||||
* react.production.min.js
|
||||
*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @license React
|
||||
* scheduler.production.min.js
|
||||
*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @license React
|
||||
* use-sync-external-store-shim.production.js
|
||||
*
|
||||
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
/** @license React v16.13.1
|
||||
* react-is.production.min.js
|
||||
*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
/** @license React v17.0.2
|
||||
* react-is.production.min.js
|
||||
*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1 @@
|
|||
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
"name": "micro-app",
|
||||
"version": "2.0.0",
|
||||
"description": "建教帮微应用模板",
|
||||
"author": "JJB",
|
||||
"license": "MIT",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js",
|
||||
"build": "node node_modules/@cqsjjb/scripts/webpack.build.js",
|
||||
"push": "zy-gbs-cmd push java production",
|
||||
"clean-cache": "rimraf node_modules/.cache/webpack",
|
||||
"serve:development": "cross-env NODE_ENV=development npm run serve",
|
||||
"serve:production": "cross-env NODE_ENV=production npm run serve",
|
||||
"build:development": "cross-env NODE_ENV=development npm run build",
|
||||
"build:production": "cross-env NODE_ENV=production npm run build",
|
||||
"code-optimization": "node node_modules/@cqsjjb/scripts/code-optimization.js",
|
||||
"lint": "eslint --ext .js,.jsx,.tsx --fix src"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ant-design/icons": "latest",
|
||||
"@ant-design/pro-components": "^2.8.10",
|
||||
"@cqsjjb/jjb-common-decorator": "latest",
|
||||
"@cqsjjb/jjb-common-lib": "latest",
|
||||
"@cqsjjb/jjb-dva-runtime": "latest",
|
||||
"@cqsjjb/jjb-react-admin-component": "latest",
|
||||
"ahooks": "^3.9.5",
|
||||
"antd": "5.27.6",
|
||||
"dayjs": "^1.11.7",
|
||||
"lodash-es": "^4.17.21",
|
||||
"qrcode.react": "^4.2.0",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"relation-graph": "^2.2.11",
|
||||
"zy-react-library": "^1.3.32"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antfu/eslint-config": "^5.4.1",
|
||||
"@babel/plugin-proposal-decorators": "^7.19.3",
|
||||
"@cqsjjb/scripts": "latest",
|
||||
"@eslint-react/eslint-plugin": "^2.2.2",
|
||||
"cross-env": "^7.0.3",
|
||||
"eslint": "^9.37.0",
|
||||
"eslint-plugin-format": "^1.0.2",
|
||||
"eslint-plugin-react-hooks": "^7.0.0",
|
||||
"eslint-plugin-react-refresh": "^0.4.23",
|
||||
"typescript": "^5.9.3"
|
||||
}
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@ package com.zcloud.basic.info.facade;
|
|||
|
||||
import com.alibaba.cola.dto.MultiResponse;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.dto.Response;
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.zcloud.basic.info.api.CorpInfoServiceI;
|
||||
import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor;
|
||||
|
|
@ -86,4 +87,9 @@ public class ZcloudCorpFacadeImpl implements ZcloudCorpFacade {
|
|||
return MultiResponse.of(CorpTypeEnum.getCodesByEnterpriseType(enterpriseType));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Response saveAdminCorp() {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,6 +104,12 @@ public class DepartmentController {
|
|||
return MultiResponse.of(departmentService.listAllTreeByCorpType(qry));
|
||||
}
|
||||
|
||||
@ApiOperation("所有企业下部门树状所有数据根据企业类型和企业id集合-其他地方不要用，只有资质申请那块用")
|
||||
@PostMapping("/listAllTreeByCorpTypeAndCorpIds")
|
||||
public MultiResponse<DepartmentTreeInfoCO> listAllTreeByCorpTypeAndCorpIds(@RequestBody DepartmentTreeCorpQry qry) {
|
||||
return MultiResponse.of(departmentService.listAllTreeByCorpTypeAndCorpIds(qry));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import com.jjb.saas.system.client.dept.facade.DeptFacade;
|
|||
import com.jjb.saas.system.client.role.facade.RoleFacade;
|
||||
import com.jjb.saas.system.client.role.response.RoleCO;
|
||||
import com.jjb.saas.system.client.user.facade.UserFacade;
|
||||
import com.zcloud.basic.info.domain.enums.UserRZFlagEnum;
|
||||
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
|
||||
import com.zcloud.basic.info.domain.gateway.PostGateway;
|
||||
import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway;
|
||||
|
|
@ -410,6 +411,7 @@ public class UserImportExe {
|
|||
user.setPhone(importEntity.getUsername());
|
||||
user.setUserType(corpFlag);
|
||||
user.setMainCorpFlag(0);
|
||||
user.setRzFlag(UserRZFlagEnum.YES.getCode());
|
||||
user.setRoleId(roleId);
|
||||
user.setDepartmentId(departmentId);
|
||||
user.setPostId(postId);
|
||||
|
|
@ -444,4 +446,4 @@ public class UserImportExe {
|
|||
return userIdCard.trim();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@ package com.zcloud.basic.info.command.query;
|
|||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import com.alibaba.cola.exception.BizException;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor;
|
||||
import com.zcloud.basic.info.domain.config.QualificationsPageConfig;
|
||||
import com.zcloud.basic.info.domain.enums.CommonFlagEnum;
|
||||
import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
|
||||
import com.zcloud.basic.info.dto.*;
|
||||
|
|
@ -41,6 +43,7 @@ public class DepartmentQueryExe {
|
|||
private final DepartmentSuperviseRepository departmentSuperviseRepository;
|
||||
private final UserRepository userRepository;
|
||||
private final CorpInfoRepository corpInfoRepository;
|
||||
private final QualificationsPageConfig qualificationsPageConfig;
|
||||
@DubboReference
|
||||
private ZcloudDepartmentFacade zcloudDepartmentFacade;
|
||||
|
||||
|
|
@ -201,6 +204,39 @@ public class DepartmentQueryExe {
|
|||
return result2;
|
||||
}
|
||||
|
||||
public Collection<DepartmentTreeInfoCO> listAllTreeByCorpTypeAndCorpIds(DepartmentTreeCorpQry qry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||
List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType(qry.getEnterpriseType());
|
||||
if (CollUtil.isNotEmpty(enterpriseType)) {
|
||||
params.put("inType", enterpriseType);
|
||||
}
|
||||
params.remove("corpinfoIdList");
|
||||
List<Long> corpinfoIdList = new ArrayList<>();
|
||||
if (CollUtil.isEmpty(qry.getInType())) {
|
||||
if (CollUtil.isEmpty(qualificationsPageConfig.getAllowedTenantIds())) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
corpinfoIdList.addAll(qualificationsPageConfig.getAllowedTenantIds());
|
||||
} else if (CollUtil.isNotEmpty(qry.getCorpinfoIdList())) {
|
||||
try {
|
||||
corpinfoIdList = qry.getCorpinfoIdList().stream()
|
||||
.map(StringUtils::trim)
|
||||
.map(Long::valueOf)
|
||||
.collect(Collectors.toList());
|
||||
} catch (NumberFormatException e) {
|
||||
throw new BizException("企业id格式错误");
|
||||
}
|
||||
}
|
||||
if (CollUtil.isNotEmpty(corpinfoIdList)) {
|
||||
params.put("corpinfoIdList", corpinfoIdList);
|
||||
}
|
||||
List<DepartmentDO> pageResponse = departmentRepository.listAllTreeByCorpTypeAndCorpIds(params);
|
||||
if (CollUtil.isEmpty(pageResponse)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return getDepartmentAllTree(pageResponse);
|
||||
}
|
||||
|
||||
|
||||
public Collection<DepartmentTreeInfoCO> listTreeNopermission(DepartmentTreeQry departmentQry) {
|
||||
if (Objects.isNull(departmentQry.getEqCorpinfoId())) {
|
||||
|
|
|
|||
|
|
@ -95,6 +95,11 @@ public class DepartmentServiceImpl implements DepartmentServiceI {
|
|||
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<DepartmentTreeInfoCO> listAllTreeByCorpTypeAndCorpIds(DepartmentTreeCorpQry qry) {
|
||||
return departmentQueryExe.listAllTreeByCorpTypeAndCorpIds(qry);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Cacheable(value = "deptAllNameCache", key="'deptId:'+#deptId")
|
||||
public String getFullNameForList(Long deptId, List<DepartmentCO> list) {
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ public interface DepartmentServiceI {
|
|||
|
||||
Collection<DepartmentTreeInfoCO> listAllTreeByCorpType(DepartmentTreeQry qry);
|
||||
|
||||
Collection<DepartmentTreeInfoCO> listAllTreeByCorpTypeAndCorpIds(DepartmentTreeCorpQry qry);
|
||||
|
||||
Long addHumanUserDept(DepartmentAddCmd cmd);
|
||||
|
||||
Collection<DepartmentTreeInfoCO> listTreeNopermission(DepartmentTreeQry qry);
|
||||
|
|
|
|||
|
|
@ -37,6 +37,10 @@ public class CorpDepartmentQry extends PageQuery {
|
|||
|
||||
@ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "eqUseFlag")
|
||||
private String eqUseFlag;
|
||||
|
||||
@ApiModelProperty(value = "企业类型，0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位", name = "eqType")
|
||||
private String eqType;
|
||||
|
||||
@ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true)
|
||||
private Integer enterpriseType;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,10 +27,15 @@ public class DepartmentPageQry extends PageQuery {
|
|||
* - `ne`: 不等比较查询，对应SQL的!=操作符
|
||||
*/
|
||||
/**
|
||||
* 名称模糊查询
|
||||
* 部门名称模糊查询
|
||||
*/
|
||||
@ApiModelProperty(value = "名称模糊查询", name = "likeName")
|
||||
@ApiModelProperty(value = "部门名称模糊查询", name = "likeName")
|
||||
private String likeName;
|
||||
/**
|
||||
* 负责人名称模糊查询
|
||||
*/
|
||||
@ApiModelProperty(value = "负责人名称模糊查询", name = "likeLeaderName")
|
||||
private String likeLeaderName;
|
||||
@ApiModelProperty(value = "企业id", name = "eqCorpInfoId")
|
||||
private Long eqCorpinfoId;
|
||||
@ApiModelProperty(value = "父id", name = "eqParentId")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
package com.zcloud.basic.info.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class DepartmentTreeCorpQry extends DepartmentTreeQry {
|
||||
|
||||
@ApiModelProperty(value = "企业id集合", name = "corpinfoIdList")
|
||||
private List<String> corpinfoIdList;
|
||||
}
|
||||
|
|
@ -34,11 +34,11 @@ public class UserPageQry extends PageQuery {
|
|||
private Long[] inDepartmentId;
|
||||
@ApiModelProperty(value = "岗位id")
|
||||
private Long eqPostId;
|
||||
@ApiModelProperty(value = "角色id")
|
||||
@ApiModelProperty(value = "用户角色id（精确查询）", name = "eqRoleId")
|
||||
private Long eqRoleId;
|
||||
@ApiModelProperty(value = "入职状态，0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核")
|
||||
private Integer eqEmploymentFlag;
|
||||
@ApiModelProperty(value = "姓名模糊搜索")
|
||||
@ApiModelProperty(value = "姓名（模糊查询）", name = "likeName")
|
||||
private String likeName;
|
||||
@ApiModelProperty(value = "账号模糊搜索")
|
||||
private String likeUsername;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ public class CorpDepartmentCO extends ClientObject {
|
|||
//主键
|
||||
@ApiModelProperty(value = "企业主键")
|
||||
private Long id;
|
||||
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")
|
||||
private Integer type;
|
||||
@ApiModelProperty(value = "企业名称")
|
||||
private String corpName;
|
||||
//行业分类
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
package com.zcloud.basic.info.domain.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Component
|
||||
@ConfigurationProperties(prefix = "qualifications.page")
|
||||
@Data
|
||||
public class QualificationsPageConfig {
|
||||
|
||||
private List<Long> allowedTenantIds = new ArrayList<>();
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ public enum CorpTypeEnum {
|
|||
share(2,"股份单位",UserTypeEnum.JG.getCode(), "Aa@12345678"),
|
||||
serviceProvider(3, "相关方企业",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
|
||||
cargoOwner(4, "货主单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
|
||||
portUnit(5, "驻港单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
|
||||
portUnit(5, "驻港单位",UserTypeEnum.QY.getCode(), "Bb@12345678"),
|
||||
materialCenter(6, "物资中心",UserTypeEnum.QY.getCode(), "Bb@12345678");
|
||||
|
||||
private static final Map<Integer, List<Integer>> ENTERPRISE_TYPE_CODE_MAP = new HashMap<>();
|
||||
|
|
|
|||
|
|
@ -18,11 +18,14 @@ import java.util.stream.Collectors;
|
|||
*/
|
||||
@Data
|
||||
public class CorpDepartmentE extends ClientObject {
|
||||
|
||||
//主键
|
||||
@ApiModelProperty(value = "企业主键")
|
||||
private Long id;
|
||||
@ApiModelProperty(value = "企业名称")
|
||||
private String corpName;
|
||||
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")
|
||||
private Integer type;
|
||||
//行业分类
|
||||
@ApiModelProperty(value = "行业分类")
|
||||
private String corpType;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import com.jjb.saas.framework.utils.DataEncryptDecryptUtil;
|
|||
import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
|
||||
import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
|
||||
import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum;
|
||||
import com.zcloud.basic.info.domain.enums.UserRZFlagEnum;
|
||||
import com.zcloud.basic.info.domain.enums.UserTypeEnum;
|
||||
import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity;
|
||||
import com.zcloud.gbscommon.utils.ExcelUtils;
|
||||
|
|
@ -187,6 +188,9 @@ public class UserE extends BaseE {
|
|||
userE.setTenantId(!ObjectUtils.isEmpty(userE.getTenantId()) ? userE.getTenantId() : tenantId);
|
||||
userE.setCorpinfoId(!ObjectUtils.isEmpty(userE.getCorpinfoId()) ? userE.getCorpinfoId() : tenantId);
|
||||
userE.setEmploymentFlag(1);
|
||||
if (userE.getRzFlag() == null) {
|
||||
userE.setRzFlag(UserRZFlagEnum.NO.getCode());
|
||||
}
|
||||
userE.setPassword(defaultPassword);
|
||||
}
|
||||
|
||||
|
|
@ -423,4 +427,4 @@ public class UserE extends BaseE {
|
|||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,5 +29,7 @@ public interface DepartmentMapper extends BaseMapper<DepartmentDO> {
|
|||
IPage<DepartmentDO> selectDeptPage(IPage<DepartmentDO> iPage, @Param("ew") QueryWrapper<DepartmentDO> queryWrapper, String menuPerms);
|
||||
|
||||
List<DepartmentDO> listAllTreeByCorpType(Map<String, Object> parmas);
|
||||
|
||||
List<DepartmentDO> listAllTreeByCorpTypeAndCorpIds(Map<String, Object> params);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@ public interface DepartmentRepository extends BaseRepository<DepartmentDO> {
|
|||
|
||||
List<DepartmentDO> listAllTreeByCorpType(Map<String, Object> parmas);
|
||||
|
||||
List<DepartmentDO> listAllTreeByCorpTypeAndCorpIds(Map<String, Object> params);
|
||||
|
||||
void deleteByCorpInfoId(Long corpInfoId);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ import com.zcloud.basic.info.utils.Query;
|
|||
import com.zcloud.gbscommon.utils.PageQueryHelper;
|
||||
import com.zcloud.gbscommon.utils.Tools;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
@ -45,8 +46,17 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
|
|||
@Override
|
||||
public PageResponse<DepartmentDO> listPage(Map<String, Object> parmas) {
|
||||
IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas);
|
||||
Map<String, Object> queryParams = new HashMap<>(parmas);
|
||||
String likeLeaderName = (String) queryParams.remove("likeLeaderName");
|
||||
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
|
||||
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, queryParams);
|
||||
if (StringUtils.isNotBlank(likeLeaderName)) {
|
||||
queryWrapper.apply("EXISTS (SELECT 1 FROM user u " +
|
||||
"WHERE u.department_id = department.id " +
|
||||
"AND u.delete_enum = 'FALSE' " +
|
||||
"AND u.department_leader_flag = '1' " +
|
||||
"AND u.name LIKE CONCAT('%', {0}, '%'))", likeLeaderName.trim());
|
||||
}
|
||||
queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
|
||||
String menuPerms = "";
|
||||
if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))){
|
||||
|
|
@ -136,6 +146,11 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
|
|||
return departmentMapper.listAllTreeByCorpType(parmas);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DepartmentDO> listAllTreeByCorpTypeAndCorpIds(Map<String, Object> params) {
|
||||
return departmentMapper.listAllTreeByCorpTypeAndCorpIds(params);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean existsByName(Long parentId,String name, Long id) {
|
||||
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
|
||||
|
|
|
|||
|
|
@ -30,5 +30,26 @@
|
|||
</if>
|
||||
order by c.corp_order, c.create_time desc,d.dep_order, d.create_time desc
|
||||
</select>
|
||||
|
||||
<select id="listAllTreeByCorpTypeAndCorpIds" resultType="com.zcloud.basic.info.persistence.dataobject.DepartmentDO">
|
||||
select d.*
|
||||
from department d
|
||||
left join corp_info c on d.corpinfo_id = c.id
|
||||
where d.delete_enum = 'FALSE'
|
||||
and c.delete_enum = 'FALSE'
|
||||
<if test="inType != null and inType.size() > 0">
|
||||
and c.type in
|
||||
<foreach collection="inType" item="item" open="(" close=")" separator=",">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="corpinfoIdList != null and corpinfoIdList.size() > 0">
|
||||
and c.id in
|
||||
<foreach collection="corpinfoIdList" item="corpinfoId" open="(" close=")" separator=",">
|
||||
#{corpinfoId}
|
||||
</foreach>
|
||||
</if>
|
||||
order by c.corp_order, c.create_time desc,d.dep_order, d.create_time desc
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue