数据处理
This commit is contained in:
parent
03a6378a0f
commit
69f9706b7d
|
|
@ -8,7 +8,9 @@ package com.rzyc.enums;
|
|||
*/
|
||||
public enum PositionTypeEnum {
|
||||
|
||||
//部门
|
||||
UNIT(1),
|
||||
//岗位
|
||||
POST(2);
|
||||
|
||||
private Integer type;
|
||||
|
|
|
|||
|
|
@ -521,6 +521,8 @@ public class DataController extends com.rzyc.controller.BaseController {
|
|||
if(null != superPerform){
|
||||
ListPerform listPerform = listPerformMapper.findByPerformName(postName,superPerform.getListperformid(),name);
|
||||
if(null == listPerform){
|
||||
superPerform.setPositionType(PositionTypeEnum.UNIT.getType());
|
||||
listPerformMapper.changeListPerform(superPerform);
|
||||
listPerform = new ListPerform();
|
||||
listPerform.setListperformid(RandomNumber.getUUid());
|
||||
listPerform.setSyslevel(superPerform.getSyslevel()+1);
|
||||
|
|
@ -531,6 +533,10 @@ public class DataController extends com.rzyc.controller.BaseController {
|
|||
listPerform.setCompletion("0");
|
||||
listPerform.setParentPath(superPerform.getParentPath()+","+listPerform.getListperformid());
|
||||
listPerform.setParentName(superPerform.getParentName()+","+listPerform.getPerformclassname());
|
||||
listPerform.setAreaCode(superPerform.getAreaCode());
|
||||
listPerform.setAreaPath(superPerform.getAreaPath());
|
||||
listPerform.setAreaPathName(superPerform.getAreaPathName());
|
||||
listPerform.setPositionType(PositionTypeEnum.POST.getType());
|
||||
listPerform.setCreatedby("excel");
|
||||
listPerform.setModifiedby("excel");
|
||||
listPerform.setCreatedon(new Date());
|
||||
|
|
@ -540,21 +546,23 @@ public class DataController extends com.rzyc.controller.BaseController {
|
|||
|
||||
SysUnit sysUnit = sysUnitMapper.findByUnitName(unitName,"f618c8e4-c0ea-426a-8f91-5ef31cf70299");
|
||||
|
||||
String passwdStr = "Ganzi202511!";
|
||||
|
||||
SysUser user = sysUserMapper.selectAdmin(mobile);
|
||||
if(null == user){
|
||||
SysUser sysUser = new SysUser();
|
||||
sysUser.setSysuserid(RandomNumber.getUUid());
|
||||
sysUser.setUsertype("政府用户");
|
||||
sysUser.setAreaCode("513300");
|
||||
sysUser.setAreaPath("510000,513300");
|
||||
sysUser.setAreaName("四川省,甘孜藏族自治州");
|
||||
sysUser.setAreaCode(listPerform.getAreaCode());
|
||||
sysUser.setAreaPath(listPerform.getAreaPath());
|
||||
sysUser.setAreaName(listPerform.getAreaPathName());
|
||||
if(null != sysUnit){
|
||||
sysUser.setSysunitorentid(sysUnit.getSysunitid());
|
||||
sysUser.setUnitPath(sysUnit.getParentPath());
|
||||
sysUser.setUnitPathName(sysUnit.getParentName());
|
||||
}
|
||||
sysUser.setSysusername(mobile);
|
||||
sysUser.setSyspassword(PasswdFactory.encryptPasswd(sysUser.getSysuserid(),"",mobile));
|
||||
sysUser.setSyspassword(PasswdFactory.encryptPasswd(sysUser.getSysuserid(),"",passwdStr));
|
||||
sysUser.setUserroles("cc89b58e-9ab4-492e-a184-82f199c75d76");
|
||||
sysUser.setChinaname(name);
|
||||
sysUser.setSystitle(listPerform.getListperformid());
|
||||
|
|
@ -567,6 +575,8 @@ public class DataController extends com.rzyc.controller.BaseController {
|
|||
sysUser.setCreatedon(new Date());
|
||||
sysUser.setModifiedon(new Date());
|
||||
sysUserMapper.insert(sysUser);
|
||||
}else{
|
||||
sysUserMapper.changePassword(user.getSysuserid(),PasswdFactory.encryptPasswd(user.getSysuserid(),"",passwdStr));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2005,15 +2005,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
|
|||
listPerform.setSyslevel(level);
|
||||
|
||||
String areaCode = changePerformDto.getAreaCode();
|
||||
if(StringUtils.isBlank(areaCode)){
|
||||
areaCode = constantsConfigure.getSuperiorOrgCode();
|
||||
}
|
||||
SysOrg sysOrg = sysOrgMapper.selectById(areaCode);
|
||||
if(null != sysOrg){
|
||||
listPerform.setAreaCode(areaCode);
|
||||
listPerform.setAreaPath(sysOrg.getParentPath());
|
||||
listPerform.setAreaPathName(sysOrg.getParentName());
|
||||
}
|
||||
|
||||
|
||||
ListPerform perform = listPerformMapper.selectByPrimaryKey(listPerform.getListperformid());
|
||||
if(null != perform){
|
||||
|
|
@ -2024,9 +2016,16 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
|
|||
listPerform.setPositionType(PositionTypeEnum.UNIT.getType());
|
||||
}
|
||||
|
||||
//获取岗位地区
|
||||
getPerform(areaCode,listPerform);
|
||||
|
||||
//修改
|
||||
listPerformMapper.changeListPerform(listPerform);
|
||||
|
||||
//修改上级部门的部门类型
|
||||
listPerformMapper.changePositionType(listPerform.getSupclassid(),PositionTypeEnum.UNIT.getType());
|
||||
|
||||
|
||||
}else{
|
||||
|
||||
listPerform.setCompletion("0");
|
||||
|
|
@ -2039,6 +2038,9 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
|
|||
listPerform.setPositionType(PositionTypeEnum.POST.getType());
|
||||
getPerformPath(listPerform.getSupclassid(),listPerform);
|
||||
|
||||
//获取岗位地区
|
||||
getPerform(areaCode,listPerform);
|
||||
|
||||
//新增
|
||||
listPerformMapper.insert(listPerform);
|
||||
|
||||
|
|
@ -2049,6 +2051,31 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
|
|||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取岗位地区
|
||||
* @Param: [areaCode, listPerform]
|
||||
* @Author: dong
|
||||
* @Date: 2025/11/29
|
||||
* @time: 10:58
|
||||
*/
|
||||
private void getPerform(String areaCode,ListPerform listPerform){
|
||||
if(StringUtils.isBlank(areaCode)){
|
||||
ListPerform superPerform = listPerformMapper.selectByPrimaryKey(listPerform.getSupclassid());
|
||||
if(null != superPerform && StringUtils.isNotBlank(superPerform.getAreaCode())){
|
||||
areaCode = superPerform.getAreaCode();
|
||||
}else{
|
||||
areaCode = constantsConfigure.getSuperiorOrgCode();
|
||||
}
|
||||
|
||||
}
|
||||
SysOrg sysOrg = sysOrgMapper.selectById(areaCode);
|
||||
if(null != sysOrg){
|
||||
listPerform.setAreaCode(areaCode);
|
||||
listPerform.setAreaPath(sysOrg.getParentPath());
|
||||
listPerform.setAreaPathName(sysOrg.getParentName());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询层级
|
||||
* @version v1.0
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ spring:
|
|||
#数据库
|
||||
datasource:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://42.193.40.239:33063/ganzi25?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&autoReconnect=true
|
||||
username: zyjy
|
||||
password: eaNCBySJdHLb23GW
|
||||
url: jdbc:mysql://172.27.181.52:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&autoReconnect=true
|
||||
username: root
|
||||
password: gzQdz2023
|
||||
tomcat:
|
||||
max-active: 10
|
||||
min-idle: 10
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
spring:
|
||||
profiles:
|
||||
active: prod #设定打包配置文件
|
||||
active: test #设定打包配置文件
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user