feat：补充查询分公司里的人授权范围
parent
f4037f3f8b
commit
be85e4c374
|
|
@ -1,4 +1,4 @@
|
|||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2025/10/17 11:07:53) App/risk"><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"><title>--</title><script>(function () {
|
||||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0 Env/production (2026/3/23 13:52:31) App/primeport"><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"><title>--</title><script>(function () {
|
||||
const APP_ENV = {
|
||||
antd: {
|
||||
'ant-prefix': 'micro-temp',
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
borderRadius: parseInt('2')
|
||||
},
|
||||
appKey: '',
|
||||
basename: 'risk',
|
||||
basename: 'primeport',
|
||||
API_HOST: ''
|
||||
};
|
||||
APP_ENV.API_HOST = sessionStorage.API_HOST || APP_ENV.API_HOST || window.location.origin;
|
||||
|
|
@ -20,4 +20,4 @@
|
|||
redirect: '',
|
||||
FRAMEWORK: APP_ENV.antd
|
||||
};
|
||||
})();</script><script defer="defer" src="/risk/static/js/295.21df88c875577274cecb.js"></script><script defer="defer" src="/risk/static/js/main.4c0885586ad9a06ab444.js"></script><link href="/risk/static/css/main.40fc518bb0818fe8b8ea.css" rel="stylesheet"></head><body style="overflow: hidden"><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2025/10/17 11:07:53) App/risk Version/master Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
||||
})();</script><script defer="defer" src="/primeport/static/js/972.3da77f225242367aa99d.js"></script><script defer="defer" src="/primeport/static/js/590.e6ed735caeff8acd0b98.js"></script><script defer="defer" src="/primeport/static/js/main.177a7f0b3244a0b46297.js"></script><link href="/primeport/static/css/main.e61cf8eb7be5d4b59b73.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 Env/production (2026/3/23 13:52:31) App/primeport Version/master Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
||||
|
|
@ -1 +0,0 @@
|
|||
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}
|
||||
|
|
@ -1 +1 @@
|
|||
module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"http://192.168.20.100:30140/demo2"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"risk",contextInject:{appKey:""},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8080",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
|
||||
module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"primeport",contextInject:{appKey:"",fileUrl:"https://jpfz.qhdsafety.com/gbsFileTest/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8082",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
|
|
@ -1,135 +0,0 @@
|
|||
/*!
|
||||
Copyright (c) 2018 Jed Watson.
|
||||
Licensed under the MIT License (MIT), see
|
||||
http://jedwatson.github.io/classnames
|
||||
*/
|
||||
|
||||
/*!
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/*! 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 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.
|
||||
*/
|
||||
|
||||
/** @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
|
|
@ -1 +0,0 @@
|
|||
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
|
||||
|
|
@ -18,16 +18,23 @@
|
|||
"lint": "eslint --ext .js,.jsx,.tsx --fix src"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ant-design/icons": "latest",
|
||||
"@ahooksjs/use-url-state": "^3.5.1",
|
||||
"@ant-design/icons": "^5.6.1",
|
||||
"@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": "latest",
|
||||
"antd": "^5.27.6",
|
||||
"antd-mobile": "^5.42.3",
|
||||
"antd-mobile-icons": "^0.3.0",
|
||||
"dayjs": "^1.11.7",
|
||||
"lodash-es": "^4.17.21",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
"react-dom": "^18.2.0",
|
||||
"react-signature-canvas": "^1.1.0-alpha.2",
|
||||
"zy-react-library": "^1.2.8"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antfu/eslint-config": "^5.4.1",
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ public class VehicleApplyController {
|
|||
}
|
||||
|
||||
@ApiOperation("跟据车辆归属查询车辆分页")
|
||||
@GetMapping("/getCarByVehicleBelongIype")
|
||||
@GetMapping("/getCarByVehicleBelongType")
|
||||
public PageResponse<VehicleApplyCO> getCarByVehicleBelongType(VehicleApplyPageQry qry) {
|
||||
return vehicleApplyService.getCarByVehicleBelongType(qry);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,12 @@ import java.util.ArrayList;
|
|||
public class ClosedAreaPersonApplyController {
|
||||
private final ClosedAreaPersonApplyServiceI closedAreaPersonApplyService;
|
||||
|
||||
@ApiOperation("查询分公司里的人授权范围")
|
||||
@GetMapping("/getAuthorizationPersonInfo/{id}")
|
||||
public SingleResponse<ClosedAreaPersonApplyCO> getAuthorizationPersonInfo(@PathVariable("id") Long id) {
|
||||
return closedAreaPersonApplyService.getAuthorizationPersonInfo(id);
|
||||
}
|
||||
|
||||
@ApiOperation("给分公司里的人授权二级门禁")
|
||||
@PostMapping("/authorizationPerson")
|
||||
public Response authPerson(@RequestBody ClosedAreaPersonApplyAuthCmd cmd) {
|
||||
|
|
|
|||
|
|
@ -62,14 +62,14 @@ public class ClosedAreaPersonApplyUpdateExe {
|
|||
closedAreaFgsPersonAuthE.setMkmjPermission(cmd.getMkmjPermission());
|
||||
closedAreaFgsPersonAuthE.setDepartmentId(cmd.getDepartmentId());
|
||||
areaFgsPersonAuthGateway.addOrUpdate(closedAreaFgsPersonAuthE);
|
||||
areaFgsPersonAreaGateway.removeByFgspersonAuthId(closedAreaFgsPersonAuthE.getId());
|
||||
areaFgsPersonAreaGateway.removeByFgspersonAuthId(cmd.getUserId());
|
||||
ArrayList<ClosedAreaFgsPersonAreaE> objects = new ArrayList<>();
|
||||
List<ClosedAreaPersonApplyAuthCmd.FgsPersonArea> areaList = cmd.getAreaList();
|
||||
for (ClosedAreaPersonApplyAuthCmd.FgsPersonArea fgsPersonArea : areaList) {
|
||||
ClosedAreaFgsPersonAreaE closedAreaFgsPersonAreaE = new ClosedAreaFgsPersonAreaE();
|
||||
closedAreaFgsPersonAreaE.setClosedAreaId(fgsPersonArea.getClosedAreaId());
|
||||
closedAreaFgsPersonAreaE.setClosedAreaName(fgsPersonArea.getClosedAreaName());
|
||||
closedAreaFgsPersonAreaE.setFgsPersonAuthId(closedAreaFgsPersonAuthE.getId());
|
||||
closedAreaFgsPersonAreaE.setFgsPersonAuthId(fgsPersonArea.getFgsPersonAuthId());
|
||||
objects.add(closedAreaFgsPersonAreaE);
|
||||
}
|
||||
areaFgsPersonAreaGateway.saveBatch(objects);
|
||||
|
|
|
|||
|
|
@ -1,18 +1,26 @@
|
|||
package com.zcloud.primeport.command.query;
|
||||
|
||||
import com.alibaba.cola.dto.SingleResponse;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||
import com.zcloud.primeport.command.convertor.ClosedAreaPersonApplyCoConvertor;
|
||||
import com.zcloud.primeport.dto.ClosedAreaPersonApplyAuthCmd;
|
||||
import com.zcloud.primeport.dto.ClosedAreaPersonApplyPageQry;
|
||||
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO;
|
||||
import com.zcloud.primeport.dto.clientobject.UserCo;
|
||||
import com.zcloud.primeport.persistence.dataobject.ClosedAreaFgsPersonAreaDO;
|
||||
import com.zcloud.primeport.persistence.dataobject.ClosedAreaFgsPersonAuthDO;
|
||||
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
|
||||
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
||||
import com.zcloud.primeport.persistence.repository.ClosedAreaFgsPersonAreaRepository;
|
||||
import com.zcloud.primeport.persistence.repository.ClosedAreaFgsPersonAuthRepository;
|
||||
import com.zcloud.primeport.persistence.repository.ClosedAreaPersonApplyRepository;
|
||||
import com.zcloud.gbscommon.utils.PageQueryHelper;
|
||||
import com.alibaba.cola.dto.PageResponse;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -27,6 +35,8 @@ import java.util.Map;
|
|||
@AllArgsConstructor
|
||||
public class ClosedAreaPersonApplyQueryExe {
|
||||
private final ClosedAreaPersonApplyRepository closedAreaPersonApplyRepository;
|
||||
private final ClosedAreaFgsPersonAuthRepository closedAreaFgsPersonAuthRepository;
|
||||
private final ClosedAreaFgsPersonAreaRepository closedAreaFgsPersonAreaRepository;
|
||||
private final ClosedAreaPersonApplyCoConvertor closedAreaPersonApplyCoConvertor;
|
||||
|
||||
/**
|
||||
|
|
@ -76,5 +86,27 @@ public class ClosedAreaPersonApplyQueryExe {
|
|||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
|
||||
}
|
||||
|
||||
public SingleResponse<ClosedAreaPersonApplyCO> getAuthorizationPersonInfo(Long id) {
|
||||
ClosedAreaFgsPersonAuthDO closedAreaFgsPersonAuthDO = closedAreaFgsPersonAuthRepository.getAuthorizationPersonInfo(id);
|
||||
QueryWrapper<ClosedAreaFgsPersonAreaDO> closedAreaFgsPersonAreaDOQueryWrapper = new QueryWrapper<>();
|
||||
closedAreaFgsPersonAreaDOQueryWrapper.eq("fgs_person_auth_id",id);
|
||||
List<ClosedAreaFgsPersonAreaDO> list = closedAreaFgsPersonAreaRepository.list(closedAreaFgsPersonAreaDOQueryWrapper);
|
||||
ClosedAreaPersonApplyCO closedAreaPersonApplyCO = new ClosedAreaPersonApplyCO();
|
||||
closedAreaPersonApplyCO.setApplyPersonUserId(id);
|
||||
if (closedAreaFgsPersonAuthDO != null) {
|
||||
ArrayList<ClosedAreaPersonApplyAuthCmd.FgsPersonArea> fgsPersonAreas = new ArrayList<>();
|
||||
closedAreaPersonApplyCO.setMkmjPermission(closedAreaFgsPersonAuthDO.getMkmjPermission());
|
||||
for (ClosedAreaFgsPersonAreaDO closedAreaFgsPersonAreaDO : list) {
|
||||
ClosedAreaPersonApplyAuthCmd.FgsPersonArea fgsPersonArea = new ClosedAreaPersonApplyAuthCmd.FgsPersonArea();
|
||||
fgsPersonArea.setFgsPersonAuthId(closedAreaFgsPersonAreaDO.getFgsPersonAuthId());
|
||||
fgsPersonArea.setClosedAreaId(closedAreaFgsPersonAreaDO.getClosedAreaId());
|
||||
fgsPersonArea.setClosedAreaName(closedAreaFgsPersonAreaDO.getClosedAreaName());
|
||||
fgsPersonAreas.add(fgsPersonArea);
|
||||
}
|
||||
closedAreaPersonApplyCO.setAreaList(fgsPersonAreas);
|
||||
}
|
||||
return SingleResponse.of(closedAreaPersonApplyCO);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,5 +84,10 @@ public class ClosedAreaPersonApplyServiceImpl implements ClosedAreaPersonApplySe
|
|||
personApplyAddCmd.setPersonBelongType(CloseCarBelongTypeEnum.TEMPORARY_VEHICLES.getCode());
|
||||
return closedAreaPersonApplyAddExe.execute(personApplyAddCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SingleResponse<ClosedAreaPersonApplyCO> getAuthorizationPersonInfo(Long id) {
|
||||
return closedAreaPersonApplyQueryExe.getAuthorizationPersonInfo(id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,5 +32,7 @@ public interface ClosedAreaPersonApplyServiceI {
|
|||
void authPerson(ClosedAreaPersonApplyAuthCmd cmd);
|
||||
|
||||
Long saveTmpPersonApply(ClosedTmpApplyAddCmd cmd);
|
||||
|
||||
SingleResponse<ClosedAreaPersonApplyCO> getAuthorizationPersonInfo(Long id);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -87,6 +87,12 @@ public class ClosedAreaCarApplyAddCmd extends Command {
|
|||
@NotEmpty(message = "告知签字不能为空")
|
||||
private String informSignId;
|
||||
|
||||
@ApiModelProperty(value = "驾驶人ID", name = "drivingUserId", required = true)
|
||||
// @NotEmpty(message = "行驶证照片不能为空")
|
||||
private String drivingUserId;
|
||||
@ApiModelProperty(value = "驾驶人名称", name = "drivingUserName", required = true)
|
||||
private String drivingUserName;
|
||||
|
||||
@ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true)
|
||||
@NotEmpty(message = "行驶证照片不能为空")
|
||||
private String drivingLicenseId;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.zcloud.primeport.dto.clientobject;
|
|||
|
||||
import com.alibaba.cola.dto.ClientObject;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.zcloud.primeport.dto.ClosedAreaPersonApplyAuthCmd;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -126,5 +127,10 @@ public class ClosedAreaPersonApplyCO extends ClientObject {
|
|||
private List<HashMap> personInOutRecord;
|
||||
private String levelOneMkmjName;
|
||||
private String levelTwoMkmjName;
|
||||
|
||||
@ApiModelProperty(value = "进出港权限(1:有 2：无)")
|
||||
private Integer mkmjPermission;
|
||||
@ApiModelProperty(value = "授权范围", name = "areaList")
|
||||
private List<ClosedAreaPersonApplyAuthCmd.FgsPersonArea> areaList;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -138,6 +138,9 @@ public class ClosedAreaCarApplyDO extends BaseDO {
|
|||
//驳回原因
|
||||
@ApiModelProperty(value = "驳回原因")
|
||||
private String refusalReason;
|
||||
|
||||
@ApiModelProperty(value = "驾驶人ID")
|
||||
private String drivingUserId;
|
||||
@ApiModelProperty(value = "驾驶人名称")
|
||||
private String drivingUserName;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,5 @@ public class ClosedAreaFgsPersonAreaDO extends BaseDO {
|
|||
private Long fgsPersonAuthId;
|
||||
private Long closedAreaId;
|
||||
private String closedAreaName;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
|
|||
@Mapper
|
||||
public interface ClosedAreaFgsPersonAuthMapper extends BaseMapper<ClosedAreaFgsPersonAuthDO> {
|
||||
|
||||
}
|
||||
ClosedAreaFgsPersonAuthDO getAuthorizationPersonInfo(Long id);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,5 +12,7 @@ import java.util.Map;
|
|||
*/
|
||||
public interface ClosedAreaFgsPersonAuthRepository extends BaseRepository<ClosedAreaFgsPersonAuthDO> {
|
||||
PageResponse<ClosedAreaFgsPersonAuthDO> listPage(Map<String,Object> params);
|
||||
|
||||
ClosedAreaFgsPersonAuthDO getAuthorizationPersonInfo(Long id);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -33,5 +33,10 @@ public class ClosedAreaFgsPersonAuthRepositoryImpl extends BaseRepositoryImpl<Cl
|
|||
IPage<ClosedAreaFgsPersonAuthDO> result = closedAreaFgsPersonAuthMapper.selectPage(iPage, queryWrapper);
|
||||
return PageHelper.pageToResponse(result, result.getRecords());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ClosedAreaFgsPersonAuthDO getAuthorizationPersonInfo(Long id) {
|
||||
return closedAreaFgsPersonAuthMapper.getAuthorizationPersonInfo(id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl<VehicleApplyM
|
|||
queryWrapper.eq("vehicle_belong_type", params.get("vehicleBelongType"));
|
||||
queryWrapper.eq("audit_flag", AuditEnum.APPROVED.getCode());
|
||||
queryWrapper.eq("mkmj_permission", 1);
|
||||
queryWrapper.like(Tools.notEmpty(params.get("licenceNo").toString()),"mkmj_permission", params.get("licenceNo"));
|
||||
queryWrapper.like(Tools.notEmpty(params.get("licenceNo").toString()),"licence_no", params.get("licenceNo"));
|
||||
String vehicleBelongType = params.get("vehicleBelongType").toString();
|
||||
if (VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode().equals(vehicleBelongType) ||VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode().equals(vehicleBelongType)) {
|
||||
// 分公司、股份个人车，查询当前登录用户车辆
|
||||
|
|
|
|||
|
|
@ -4,5 +4,9 @@
|
|||
|
||||
<mapper namespace="com.zcloud.primeport.persistence.mapper.ClosedAreaFgsPersonAuthMapper">
|
||||
|
||||
<select id="getAuthorizationPersonInfo"
|
||||
resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaFgsPersonAuthDO">
|
||||
select * from closed_area_fgs_person_auth c where c.delete_enum = 'FALSE' and c.user_id = #{id}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
select * from mkmj_approval_user g
|
||||
where g.delete_enum = 'FALSE'
|
||||
and g.corp_id = #{params.corpId}
|
||||
<if test="params.dept_id != null">
|
||||
<if test="params.deptId != null">
|
||||
AND g.dept_id = #{params.deptId}
|
||||
</if>
|
||||
<if test="params.userName != null and params.userName != ''">
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@
|
|||
<if test="params.hgAuthArea != null and params.hgAuthArea != ''">
|
||||
AND m.hg_auth_area = #{params.hgAuthArea}
|
||||
</if>
|
||||
<if test="params.mkmjName != null and params.mkmjName != ''">
|
||||
AND m.mkmj_name LIKE CONCAT('%', #{params.mkmjName}, '%')
|
||||
<if test="params.likeMkmjName != null and params.likeMkmjName != ''">
|
||||
AND m.mkmj_name LIKE CONCAT('%', #{params.likeMkmjName}, '%')
|
||||
</if>
|
||||
<if test="params.mkmjLevel != null">
|
||||
AND m.mkmj_level = #{params.mkmjLevel}
|
||||
|
|
|
|||
Loading…
Reference in New Issue