rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch '惠信/develop' into develop

This commit is contained in:
曹鹏飞 2025-02-18 22:54:58 +08:00
parent 37b0b4e8f7 cc026f8aba
commit 08652de12a
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/constant/Constant.java
View File

@ -17,4 +17,13 @@ public class Constant {
* 区域编码前缀
*/
public static final String AreaCodePrefix="A";
/**
* 部门编码前缀
*/
public static final String DeptCodePrefix="DP";
/**
* 职位编码前缀
*/
public static final String JobCodePrefix="JOB";
}

9
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import com.nflg.mobilebroken.admin.annotation.ApiMark;
import com.nflg.mobilebroken.admin.constant.Constant;
import com.nflg.mobilebroken.admin.pojo.dto.DepartmentDTO;
import com.nflg.mobilebroken.admin.pojo.query.DepartmentQuery;
import com.nflg.mobilebroken.admin.pojo.vo.BaseDepartmentVO;
@ -13,6 +14,7 @@ import com.nflg.mobilebroken.common.exception.NflgException;
import com.nflg.mobilebroken.common.pojo.ApiResult;
import com.nflg.mobilebroken.common.pojo.PageData;
import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.UniqueSequenceGenerator;
import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.TBaseDepartment;
import com.nflg.mobilebroken.repository.service.ITBaseDepartmentService;
@ -74,17 +76,16 @@ public class DepartmentController extends ControllerBase {
@ApiMark(moduleName = "部门管理", apiName = "新增")
public ApiResult<Boolean> add(@Valid @RequestBody DepartmentDTO departmentDTO){
List<TBaseDepartment> checkCode = departmentService.lambdaQuery().eq(TBaseDepartment::getDeptCode, departmentDTO.getDeptCode()).list();
// List<TBaseDepartment> checkCode = departmentService.lambdaQuery().eq(TBaseDepartment::getDeptCode, departmentDTO.getDeptCode()).list();
//新增
TBaseDepartment dept = Convert.convert(TBaseDepartment.class, departmentDTO);
if(null==departmentDTO.getId() || departmentDTO.getId()==0){
VUtils.trueThrowBusinessError(CollUtil.isNotEmpty(checkCode)).throwMessage("编码已存在");
dept.setDeptCode(UniqueSequenceGenerator.generateCode(Constant.DeptCodePrefix));
dept.setDataCreateUserNo(AdminUserUtil.getUserNo());
dept.setDataCreateUserName(AdminUserUtil.getUserName());
dept.setDataCreateTime(LocalDateTime.now());
}
else {
dept.setDataModifyUserNo(AdminUserUtil.getUserNo());
dept.setDataModifyUserName(AdminUserUtil.getUserName());
dept.setDataModifyTime(LocalDateTime.now());
@ -130,7 +131,7 @@ public class DepartmentController extends ControllerBase {
@PostMapping("enable")
@MethodInfoMark(value = "启用",menuName = "部门管理")
@ApiMark(moduleName = "部门管理", apiName = "启用")
public ApiResult<Boolean> enable(@RequestBody List<Integer> ids ){
public ApiResult<Boolean> enable(@RequestBody List<Long> ids ){
VUtils.trueThrowBusinessError(CollUtil.isEmpty(ids)).throwMessage("请选择要启用的数据");
List<TBaseDepartment> tBaseDepartments = departmentService.getBaseMapper().selectByIds(ids);
tBaseDepartments.forEach(u->{

3
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java
View File

@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.mobilebroken.admin.annotation.ApiMark;
import com.nflg.mobilebroken.admin.constant.Constant;
import com.nflg.mobilebroken.admin.pojo.dto.PositionDetailDTO;
import com.nflg.mobilebroken.admin.pojo.query.PositionQuery;
import com.nflg.mobilebroken.admin.pojo.vo.PositionDetailVO;
@ -15,6 +16,7 @@ import com.nflg.mobilebroken.common.constant.STATE;
import com.nflg.mobilebroken.common.pojo.ApiResult;
import com.nflg.mobilebroken.common.pojo.PageData;
import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.UniqueSequenceGenerator;
import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.Language;
import com.nflg.mobilebroken.repository.entity.TBasePosition;
@ -112,6 +114,7 @@ public class PositionController extends ControllerBase {
public ApiResult<Boolean> add(@Valid @RequestBody PositionDetailDTO positionDetailDto) {
TBasePosition ent = Convert.convert(TBasePosition.class, positionDetailDto);
ent.setPositionLanguage(JSON.toJSONString(positionDetailDto.getLanguage()));
ent.setPositionCode(UniqueSequenceGenerator.generateCode(Constant.JobCodePrefix));
ent.setDataCreateUserNo(AdminUserUtil.getUserNo());
ent.setDataCreateUserName(AdminUserUtil.getUserName());
ent.setDataCreateTime(LocalDateTime.now());

3
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DepartmentDTO.java
View File

@ -9,9 +9,6 @@ public class DepartmentDTO {
private Long id;
@NotBlank(message = "编码不能为空")
private String deptCode;
@NotBlank(message = "名称不能为空")
private String deptName;

6
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/PositionDetailDTO.java
View File

@ -16,11 +16,7 @@ import java.util.List;
public class PositionDetailDTO {
private Integer id=0;
/**
* 职位编码
*/
@NotBlank(message = "职位编码不能为空")
private String positionCode;
/**
* 职位名称

2
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/UniqueSequenceGenerator.java
View File

@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicInteger;
public class UniqueSequenceGenerator {
private static final SimpleDateFormat sdf = new SimpleDateFormat("MMddHHmmssSSS");
private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");