Skip to content

C
cloud-platform
Commit 841b3509 authored by zuoyh's avatar zuoyh
Browse files
Options

股東表插入、查詢

parent 72966d6b
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 28 deletions
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionChangeRecordDTO.java
View file @ 841b3509
......@@ -19,7 +19,7 @@ public class AppUserPositionChangeRecordDTO implements Serializable {
private Integer id;
/**
* 用户id
* 用户手机号
*/
private String phone;
......@@ -109,4 +109,9 @@ public class AppUserPositionChangeRecordDTO implements Serializable {
* 员工职位、所属公司、离职、入职等的实际上任时间
*/
private Timestamp relTime;
/**
* 用户id
*/
private Integer userId;
}
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionChangeRecord.java
View file @ 841b3509
package com.github.wxiaoqi.security.admin.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -25,6 +24,10 @@ public class AppUserPositionChangeRecord implements Serializable {
private Integer id;
@ApiModelProperty("用户id")
@Column(name = "user_id")
private Integer userId;
@ApiModelProperty("员工手机号")
@Column(name = "phone")
private String phone;
......@@ -96,5 +99,6 @@ public class AppUserPositionChangeRecord implements Serializable {
@Column(name = "old_job_name")
private String oldJobName;
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionChangeRecordBiz.java
View file @ 841b3509
......@@ -77,6 +77,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
appUserPositionChangeRecord.setJobRemark(COMPANY_CHANGE);
}
appUserPositionChangeRecord.setUserId(userPositionTemp.getId());
appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
appUserPositionChangeRecord.setRelTime(relTime);
appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
......@@ -99,9 +100,30 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
appUserPositionChangeRecord.setJobRemark(USER_ADD_COMPANY);
appUserPositionChangeRecord.setOperatorId(updUserId);
appUserPositionChangeRecord.setUserId(userPositionTemp.getId());
mapper.insert(appUserPositionChangeRecord);
}
/**
* 批量插入记录表
*
* @param userPositionTemp
* @param updUserId
*/
public void addJoinJobRecord(AppUserPositionTemp userPositionTemp, Integer updUserId) {
AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
appUserPositionChangeRecord.setRelTime(new Timestamp(System.currentTimeMillis()));
appUserPositionChangeRecord.setJobRemark(USER_ADD_COMPANY);
appUserPositionChangeRecord.setOperatorId(updUserId);
appUserPositionChangeRecord.setUserId(userPositionTemp.getId());
mapper.insert(appUserPositionChangeRecord);
}
/**
* 员工复职
*
......@@ -176,6 +198,9 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
public List<AppUserPositionChangeRecordDTO> findPositionChangeRecord(AppUserPositionTemp userPositionTemp) {
Example example = new Example(AppUserPositionChangeRecord.class);
example.createCriteria().andEqualTo("phone", userPositionTemp.getPhone());
if (userPositionTemp.getId() != null) {
example.createCriteria().andEqualTo("userId", userPositionTemp.getId());
}
List<AppUserPositionChangeRecord> list = selectByExample(example);
List<AppUserPositionChangeRecordDTO> listAppUserPositionChangeRecordDTO = new ArrayList<>();
list.stream().forEach(x -> {
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
View file @ 841b3509
......@@ -105,8 +105,10 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
userPositionTemp.setCompanyName(companyName);
//编辑
if (id == null || id == 0) {
insertSelective(userPositionTemp);
int ids = addUserFindId(userPositionTemp).getId();
appUserPositionTempDTO.setId(ids);
//记录表插入
// appUserPositionTempDTO.setId();
appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempDTO, updUserId);
} else {
updateSelectiveById(userPositionTemp);
......@@ -118,6 +120,15 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
return ObjectRestResponse.succ();
}
//新增员工表时，获取自增长主键ID，插入变动记录表对应user_id字段
public AppUserPositionTemp addUserFindId(AppUserPositionTemp userPositionTemp) {
AppUserPositionTemp newAppUserPositionTemp = new AppUserPositionTemp();
insertSelective(userPositionTemp);
BeanUtils.copyProperties(userPositionTemp, newAppUserPositionTemp);
return newAppUserPositionTemp;
}
public void updateAppuserPostionStatusById(Integer id, int status) {
AppUserPositionTemp appUserPositionTemp = new AppUserPositionTemp();
appUserPositionTemp.setId(id);
......@@ -185,7 +196,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
return dataVO;
}
public Map<String, Object> importUserPostion(List<String[]> userPostionData) {
public Map<String, Object> importUserPostion(List<String[]> userPostionData, Integer operatorId) {
Map<String, Object> result = new HashMap<>(2);
List<Map<String, Object>> errorResult = Lists.newArrayList();
Map<String, Object> errorResultMap;
......@@ -266,7 +277,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
appUserPositionTemp.setId(id);
updateSelectiveById(appUserPositionTemp);
} else {
insertSelective(appUserPositionTemp);
// insertSelective(appUserPositionTemp);
AppUserPositionTemp appUserPositionTempNew = new AppUserPositionTemp();
BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempNew);
appUserPositionTempNew = addUserFindId(appUserPositionTemp);
//记录表插入
appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempNew, operatorId);
}
} catch (BaseException ex) {
......@@ -426,12 +442,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
}
//身份变更
if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
//不是离职状态下
if(Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit()!=1){
postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
//更改为股东身份
loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
}
//不是离职状态下
if (Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit() != 1) {
postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
//更改为股东身份
loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
}
}
}
}
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java
View file @ 841b3509
......@@ -53,7 +53,7 @@ public class AppUserPositionController {
@GetMapping("/jobs")
public ObjectRestResponse findAllJobs() {
public ObjectRestResponse findAllJobs() {
return ObjectRestResponse.succ(jobLevelBiz.selectListAll());
}
......@@ -114,7 +114,7 @@ public class AppUserPositionController {
try {
IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
Integer operatorId = Integer.valueOf(infoFromToken.getId());
return ObjectRestResponse.succ(appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId)) ;
return ObjectRestResponse.succ(appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId));
} catch (Exception e) {
log.error("修改失败【{}】", e);
throw new BaseException("修改失败");
......@@ -148,41 +148,49 @@ public class AppUserPositionController {
/**
* 批量导入
*
* @param userPostionExcel
* @return
*/
@PostMapping("/excel/import")
public ObjectRestResponse<Map<String,Object>> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel) {
List<String[]> userPostionData = ExcelImport.getExcelData(userPostionExcel);
if (userPostionData.size() < 2) {
return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
public ObjectRestResponse<Map<String, Object>> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel, HttpServletRequest request) {
try {
IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
Integer operatorId = Integer.valueOf(infoFromToken.getId());
List<String[]> userPostionData = ExcelImport.getExcelData(userPostionExcel);
if (userPostionData.size() < 2) {
return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
}
userPostionData.remove(0);
Map<String, Object> result = appUserPositionTempBiz.importUserPostion(userPostionData,operatorId);
return ObjectRestResponse.succ(result);
} catch (Exception e) {
throw new BaseException(e);
}
userPostionData.remove(0);
Map<String,Object> result = appUserPositionTempBiz.importUserPostion(userPostionData);
return ObjectRestResponse.succ(result);
}
/**
* 删除
*
* @param id
* @return
*/
@DeleteMapping("/{id}")
public ObjectRestResponse<Void> deleteUserPostion(@PathVariable(value = "id") Integer id){
appUserPositionTempBiz.updateAppuserPostionStatusById(id,1);
public ObjectRestResponse<Void> deleteUserPostion(@PathVariable(value = "id") Integer id) {
appUserPositionTempBiz.updateAppuserPostionStatusById(id, 1);
return ObjectRestResponse.succ();
}
@PostMapping("/page")
public ObjectRestResponse<PageDataVO<AppUserPositionTempVo>> findWithPage(@RequestBody AppUserPositionTempFindDTO appUserPositionTempFindDTO){
PageDataVO<AppUserPositionTempVo> dataVO = appUserPositionTempBiz.findWithPage(appUserPositionTempFindDTO);
return ObjectRestResponse.succ(dataVO);
public ObjectRestResponse<PageDataVO<AppUserPositionTempVo>> findWithPage(@RequestBody AppUserPositionTempFindDTO appUserPositionTempFindDTO) {
PageDataVO<AppUserPositionTempVo> dataVO = appUserPositionTempBiz.findWithPage(appUserPositionTempFindDTO);
return ObjectRestResponse.succ(dataVO);
}
@GetMapping("/userid")
public List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId){
return appUserPositionTempBiz.getUserIdByParentCompany(parentCompanyId);
public List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId) {
return appUserPositionTempBiz.getUserIdByParentCompany(parentCompanyId);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment