Skip to content

8
8timerapiv200
Commit a3215fb8 by 邓实川 Committed by 284718418@qq.com
Options

员工列表优化,电子合同创建个人账户身份类型更新

parent 487bae9a
Showing with 201 additions and 202 deletions
src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java
...@@ -10,7 +10,6 @@ import org.springframework.context.annotation.Configuration; ...@@ -10,7 +10,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
......
src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
...@@ -210,10 +210,10 @@ public class DzhtController2 { ...@@ -210,10 +210,10 @@ public class DzhtController2 {
// List<Integer> orgCodeList = Lists.transform(list, newList -> newList.getOrgCode()); // List<Integer> orgCodeList = Lists.transform(list, newList -> newList.getOrgCode());
List<String> orgIds = new ArrayList<String>(); List<String> orgIds = new ArrayList<String>();
// for (Integer orgCode : orgCodeList) { // for (Integer orgCode : orgCodeList) {
DzhtAssoQyzc qyzc = DzhtAssoQyzc.builder().build().selectOne(new QueryWrapper<DzhtAssoQyzc>().lambda() DzhtAssoQyzc qyzc = DzhtAssoQyzc.builder().build().selectOne(new QueryWrapper<DzhtAssoQyzc>().lambda()
.eq(DzhtAssoQyzc::getOrgCode, userBean.getOrgCode()).select(DzhtAssoQyzc::getOrgId)); .eq(DzhtAssoQyzc::getOrgCode, userBean.getOrgCode()).select(DzhtAssoQyzc::getOrgId));
if (qyzc != null) if (qyzc != null)
orgIds.add(qyzc.getOrgId()); orgIds.add(qyzc.getOrgId());
// } // }
JSONObject j = null; JSONObject j = null;
List<JSONObject> result = new ArrayList<JSONObject>(); List<JSONObject> result = new ArrayList<JSONObject>();
...@@ -276,7 +276,7 @@ public class DzhtController2 { ...@@ -276,7 +276,7 @@ public class DzhtController2 {
@GetMapping("/qryOrgSeal") @GetMapping("/qryOrgSeal")
@ApiOperation(value = "查询机构模板印章", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "查询机构模板印章", httpMethod = "GET", notes = "接口发布说明")
public Result<Object> qryOrgSeal(@CurrentUser UserBean userBean, @RequestParam Integer offset, public Result<Object> qryOrgSeal(@CurrentUser UserBean userBean, @RequestParam Integer offset,
@RequestParam Integer size) { @RequestParam Integer size) {
JSONObject a = null; JSONObject a = null;
try { try {
TokenHelper.getTokenData();// 获取鉴权 TokenHelper.getTokenData();// 获取鉴权
...@@ -298,7 +298,7 @@ public class DzhtController2 { ...@@ -298,7 +298,7 @@ public class DzhtController2 {
@PostMapping("/addComponents/{templateId}") @PostMapping("/addComponents/{templateId}")
@ApiOperation(value = "添加输入项组件", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加输入项组件", httpMethod = "POST", notes = "接口发布说明")
public Result<Object> addComponents(@PathVariable String templateId, public Result<Object> addComponents(@PathVariable String templateId,
@RequestBody List<StructComponent> structComponents) { @RequestBody List<StructComponent> structComponents) {
List<String> l = new ArrayList<String>(); List<String> l = new ArrayList<String>();
for (StructComponent structComponent : structComponents) { for (StructComponent structComponent : structComponents) {
...@@ -867,7 +867,7 @@ public class DzhtController2 { ...@@ -867,7 +867,7 @@ public class DzhtController2 {
@GetMapping("/qrySignArea") @GetMapping("/qrySignArea")
@ApiOperation(value = "查询签署区列表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "查询签署区列表", httpMethod = "GET", notes = "接口发布说明")
public Result<Object> qrySignArea(@RequestParam String flowId, @RequestParam(required = false) String accountId, public Result<Object> qrySignArea(@RequestParam String flowId, @RequestParam(required = false) String accountId,
@RequestParam(required = false) String signfieldIds) { @RequestParam(required = false) String signfieldIds) {
JSONObject json = null; JSONObject json = null;
try { try {
TokenHelper.getTokenData();// 获取鉴权 TokenHelper.getTokenData();// 获取鉴权
...@@ -932,7 +932,7 @@ public class DzhtController2 { ...@@ -932,7 +932,7 @@ public class DzhtController2 {
@GetMapping("/qrySignUrl") @GetMapping("/qrySignUrl")
@ApiOperation(value = "获取签署地址", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取签署地址", httpMethod = "GET", notes = "接口发布说明")
public Result<Object> qrySignUrl(@CurrentUser UserBean userBean, @RequestParam String flowId, public Result<Object> qrySignUrl(@CurrentUser UserBean userBean, @RequestParam String flowId,
@RequestParam(required = false) String organizeId, @RequestParam(required = false) String urlType) { @RequestParam(required = false) String organizeId, @RequestParam(required = false) String urlType) {
JSONObject json = null; JSONObject json = null;
try { try {
QueryWrapper<DzhtAssoGrzc> queryWrapper = new QueryWrapper<DzhtAssoGrzc>(); QueryWrapper<DzhtAssoGrzc> queryWrapper = new QueryWrapper<DzhtAssoGrzc>();
...@@ -954,8 +954,8 @@ public class DzhtController2 { ...@@ -954,8 +954,8 @@ public class DzhtController2 {
@PutMapping("/rushsign") @PutMapping("/rushsign")
@ApiOperation(value = "流程签署人催签", httpMethod = "PUT", notes = "接口发布说明") @ApiOperation(value = "流程签署人催签", httpMethod = "PUT", notes = "接口发布说明")
public Result<Object> rushsign(@CurrentUser UserBean userBean, @RequestParam String flowId, public Result<Object> rushsign(@CurrentUser UserBean userBean, @RequestParam String flowId,
@RequestParam(required = false) String noticeTypes, @RequestParam(required = false) String noticeTypes,
@RequestParam(required = false) String rushsignAccountId) { @RequestParam(required = false) String rushsignAccountId) {
try { try {
TokenHelper.getTokenData();// 获取鉴权 TokenHelper.getTokenData();// 获取鉴权
...@@ -974,7 +974,7 @@ public class DzhtController2 { ...@@ -974,7 +974,7 @@ public class DzhtController2 {
@PutMapping("/revoke") @PutMapping("/revoke")
@ApiOperation(value = "撤回签署流程", httpMethod = "PUT", notes = "接口发布说明") @ApiOperation(value = "撤回签署流程", httpMethod = "PUT", notes = "接口发布说明")
public Result<Object> revoke(@CurrentUser UserBean userBean, @RequestParam String flowId, public Result<Object> revoke(@CurrentUser UserBean userBean, @RequestParam String flowId,
@RequestParam(required = false) String revokeReason) { @RequestParam(required = false) String revokeReason) {
String operatorId = null; String operatorId = null;
try { try {
TokenHelper.getTokenData();// 获取鉴权 TokenHelper.getTokenData();// 获取鉴权
...@@ -1027,16 +1027,16 @@ public class DzhtController2 { ...@@ -1027,16 +1027,16 @@ public class DzhtController2 {
/** /**
* 获取当前用户发起的签署流程 * 获取当前用户发起的签署流程
* *
* @param flowId * @param flowId
* @return * @return
*/ */
@GetMapping("/getFqlc") @GetMapping("/getFqlc")
@ApiOperation(value = "当前用户发起的签署流程", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "当前用户发起的签署流程", httpMethod = "GET", notes = "接口发布说明")
public Result<Object> getFqlc(@CurrentUser UserBean userBean, public Result<Object> getFqlc(@CurrentUser UserBean userBean,
@RequestParam(required = false, defaultValue = "1") Integer currPage, @RequestParam(required = false, defaultValue = "1") Integer currPage,
@RequestParam(required = false, defaultValue = "10") Integer pageSize, @RequestParam(required = false, defaultValue = "10") Integer pageSize,
@RequestParam(required = false) String query) { @RequestParam(required = false) String query) {
com.github.pagehelper.Page<Object> page = PageHelper.startPage(currPage, pageSize); com.github.pagehelper.Page<Object> page = PageHelper.startPage(currPage, pageSize);
List<DzhtAssoCjlc> cjlcs = DzhtAssoCjlc.builder().build() List<DzhtAssoCjlc> cjlcs = DzhtAssoCjlc.builder().build()
.selectList(new QueryWrapper<DzhtAssoCjlc>().like(query != null, "business_scene", query) .selectList(new QueryWrapper<DzhtAssoCjlc>().like(query != null, "business_scene", query)
...@@ -1089,18 +1089,18 @@ public class DzhtController2 { ...@@ -1089,18 +1089,18 @@ public class DzhtController2 {
/** /**
* 获取当前用户收到的签署流程 * 获取当前用户收到的签署流程
* *
* @param currPage * @param currPage
* *
* @param flowId * @param flowId
* @return * @return
*/ */
@GetMapping("/getSdlc") @GetMapping("/getSdlc")
@ApiOperation(value = "当前用户收到的签署流程", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "当前用户收到的签署流程", httpMethod = "GET", notes = "接口发布说明")
public Result<Object> getSdlc(@CurrentUser UserBean userBean, public Result<Object> getSdlc(@CurrentUser UserBean userBean,
@RequestParam(required = false, defaultValue = "1") Integer currPage, @RequestParam(required = false, defaultValue = "1") Integer currPage,
@RequestParam(required = false, defaultValue = "10") Integer pageSize, @RequestParam(required = false, defaultValue = "10") Integer pageSize,
@RequestParam(required = false) String query) { @RequestParam(required = false) String query) {
List<JSONObject> json = new ArrayList<JSONObject>(); List<JSONObject> json = new ArrayList<JSONObject>();
com.github.pagehelper.Page<Object> page = PageHelper.startPage(currPage, pageSize); com.github.pagehelper.Page<Object> page = PageHelper.startPage(currPage, pageSize);
......
src/main/java/cn/timer/api/controller/yggl/YgglController.java
/** /**
* @date 2019年11月15日 * @date 2019年11月15日
* @author 翁东州 * @author 翁东州
* @方法中文名称: * @方法中文名称:
*/ */
...@@ -179,7 +179,7 @@ public class YgglController { ...@@ -179,7 +179,7 @@ public class YgglController {
/** /**
* 获取员工档案 * 获取员工档案
* *
* @param * @param
* @return * @return
*/ */
...@@ -215,7 +215,7 @@ public class YgglController { ...@@ -215,7 +215,7 @@ public class YgglController {
/** /**
* 根据岗位id获取员工档案部门岗位名称 * 根据岗位id获取员工档案部门岗位名称
* *
* @param * @param
* @return * @return
*/ */
...@@ -245,20 +245,20 @@ public class YgglController { ...@@ -245,20 +245,20 @@ public class YgglController {
return ResultUtil.data(bmgw); return ResultUtil.data(bmgw);
} }
@Autowired @Autowired
private RealTimeUpdate realtimeupdate; private RealTimeUpdate realtimeupdate;
@Autowired @Autowired
private KqglAssoKqzdkfsMapper kqglassokqzdkfsmapper; private KqglAssoKqzdkfsMapper kqglassokqzdkfsmapper;
@Value("${config-8timer.machine8timerUrl}") @Value("${config-8timer.machine8timerUrl}")
public String mac_command; // 回调地址 public String mac_command; // 回调地址
@Autowired @Autowired
private UserEquiRelationMapper userequirelationmapper; private UserEquiRelationMapper userequirelationmapper;
/** /**
* 添加员工档案 * 添加员工档案
* *
* @param userBean * @param userBean
* @param addygdaDto * @param addygdaDto
* @return * @return
...@@ -277,26 +277,26 @@ public class YgglController { ...@@ -277,26 +277,26 @@ public class YgglController {
Integer attgroupid = addygdaDto.getAttgroupid();//考勤组id Integer attgroupid = addygdaDto.getAttgroupid();//考勤组id
boolean isvalid = true; boolean isvalid = true;
switch (zjType) { switch (zjType) {
case 0: case 0:
isvalid = IdcardUtil.isValidCard15(zjNum) || IdcardUtil.isValidCard18(zjNum); isvalid = IdcardUtil.isValidCard15(zjNum) || IdcardUtil.isValidCard18(zjNum);
break; break;
case 1: case 1:
String[] strs = IdcardUtil.isValidCard10(zjNum); String[] strs = IdcardUtil.isValidCard10(zjNum);
if (strs == null) { if (strs == null) {
isvalid = false; isvalid = false;
break;
}
String str2 = strs != null && strs.length > 2 ? strs[2] : "false";
isvalid = "澳门/香港".contains(strs[0]) && "true".equals(str2);
break;
case 2:
isvalid = IdcardUtil.isValidTWCard(zjNum);
break;
case 3:
isvalid = ReUtil.isMatch(Regular.PASSPORT1, zjNum) || ReUtil.isMatch(Regular.PASSPORT2, zjNum);
break;
default:
break; break;
}
String str2 = strs != null && strs.length > 2 ? strs[2] : "false";
isvalid = "澳门/香港".contains(strs[0]) && "true".equals(str2);
break;
case 2:
isvalid = IdcardUtil.isValidTWCard(zjNum);
break;
case 3:
isvalid = ReUtil.isMatch(Regular.PASSPORT1, zjNum) || ReUtil.isMatch(Regular.PASSPORT2, zjNum);
break;
default:
break;
} }
// if (!isvalid) { // if (!isvalid) {
// return ResultUtil.error("证件格式不对!"); // return ResultUtil.error("证件格式不对!");
...@@ -307,7 +307,7 @@ public class YgglController { ...@@ -307,7 +307,7 @@ public class YgglController {
Integer syq = addygdaDto.getSyq(); Integer syq = addygdaDto.getSyq();
Integer sex = addygdaDto.getSex(); Integer sex = addygdaDto.getSex();
Integer bmgwId = addygdaDto.getBmgwId(); Integer bmgwId = addygdaDto.getBmgwId();
QyzxEmpLogin login = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper) QyzxEmpLogin login = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
.eq(!StrUtil.hasBlank(phone), QyzxEmpLogin::getPhone, phone).one(); .eq(!StrUtil.hasBlank(phone), QyzxEmpLogin::getPhone, phone).one();
...@@ -330,58 +330,58 @@ public class YgglController { ...@@ -330,58 +330,58 @@ public class YgglController {
ygglMainEmp = YgglMainEmp.builder().name(name).phone(phone).zjType(zjType).zjNum(zjNum).jobType(jobType) ygglMainEmp = YgglMainEmp.builder().name(name).phone(phone).zjType(zjType).zjNum(zjNum).jobType(jobType)
.jobStatus(jobStatus.SHIYONG.getType()).rzTime(rzTime).syq(syq).sex(sex) .jobStatus(jobStatus.SHIYONG.getType()).rzTime(rzTime).syq(syq).sex(sex)
.empNum(login.getId()).orgCode(orgCode).bmgwId(bmgwId).customNum(customNum).build(); .empNum(login.getId()).orgCode(orgCode).bmgwId(bmgwId).customNum(customNum).build();
if(addygdaDto.getAttgroupid() != null) { if(addygdaDto.getAttgroupid() != null) {
KqglAssoYhkqz.builder().kqzid(attgroupid).userid(login.getId()).qyid(userBean.getOrgCode()).build().insert(); KqglAssoYhkqz.builder().kqzid(attgroupid).userid(login.getId()).qyid(userBean.getOrgCode()).build().insert();
List<KqglAssoKqzdkfs> kqjs = kqglassokqzdkfsmapper.selectList(new QueryWrapper<KqglAssoKqzdkfs>().lambda().eq(KqglAssoKqzdkfs::getKqzId, addygdaDto.getAttgroupid()).eq(KqglAssoKqzdkfs::getType, 1)); List<KqglAssoKqzdkfs> kqjs = kqglassokqzdkfsmapper.selectList(new QueryWrapper<KqglAssoKqzdkfs>().lambda().eq(KqglAssoKqzdkfs::getKqzId, addygdaDto.getAttgroupid()).eq(KqglAssoKqzdkfs::getType, 1));
for(KqglAssoKqzdkfs abp:kqjs) { for(KqglAssoKqzdkfs abp:kqjs) {
KqglAssoKqj kqj = KqglAssoKqj.builder().id(abp.getDkfsid()).build().selectById(); KqglAssoKqj kqj = KqglAssoKqj.builder().id(abp.getDkfsid()).build().selectById();
KqglAssoYhsb kqjry = KqglAssoYhsb.builder().build().selectOne(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, login.getId()).eq(KqglAssoYhsb::getKqjid, kqj.getId())); KqglAssoYhsb kqjry = KqglAssoYhsb.builder().build().selectOne(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, login.getId()).eq(KqglAssoYhsb::getKqjid, kqj.getId()));
if(kqjry == null) { if(kqjry == null) {
// YgglMainEmp yggluser = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).eq(YgglMainEmp::getEmpNum, login.getId())); // YgglMainEmp yggluser = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).eq(YgglMainEmp::getEmpNum, login.getId()));
String url = mac_command+"/addUserName"; String url = mac_command+"/addUserName";
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
MultiValueMap<String, Object> params = new LinkedMultiValueMap<>(); MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
params.add("devId", kqj.getCode()); params.add("devId", kqj.getCode());
params.add("userId", login.getId()); params.add("userId", login.getId());
params.add("userName", ygglMainEmp.getName()); params.add("userName", ygglMainEmp.getName());
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
HttpEntity httpEntity = new HttpEntity(params, headers); HttpEntity httpEntity = new HttpEntity(params, headers);
ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class); ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class);
KqglAssoYhsb.builder().build().delete(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, login.getId()).eq(KqglAssoYhsb::getKqjid, kqj.getId())); KqglAssoYhsb.builder().build().delete(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, login.getId()).eq(KqglAssoYhsb::getKqjid, kqj.getId()));
KqglAssoYhsb uskqj = KqglAssoYhsb.builder().userId(login.getId()).kqjid(kqj.getId()).type(1).build(); KqglAssoYhsb uskqj = KqglAssoYhsb.builder().userId(login.getId()).kqjid(kqj.getId()).type(1).build();
UserEquiRelation isgly = userequirelationmapper.selectByuserId(login.getId()); UserEquiRelation isgly = userequirelationmapper.selectByuserId(login.getId());
if(isgly != null) { if(isgly != null) {
uskqj.setIsGly(isgly.getIsGly()); uskqj.setIsGly(isgly.getIsGly());
}else { }else {
uskqj.setIsGly(0); uskqj.setIsGly(0);
} }
if (!uskqj.insert()) if (!uskqj.insert())
return ResultUtil.error("操作失败--新增用户与设备关系"); return ResultUtil.error("操作失败--新增用户与设备关系");
} }
} }
} }
if(syq == 0) { if(syq == 0) {
ygglMainEmp.setZzTime(rzTime); ygglMainEmp.setZzTime(rzTime);
}else { }else {
String sdf = new SimpleDateFormat("yyyy-MM-dd").format(rzTime); String sdf = new SimpleDateFormat("yyyy-MM-dd").format(rzTime);
String zztime = ClockInTool.requires_extra_times(sdf, syq, 4, 1); String zztime = ClockInTool.requires_extra_times(sdf, syq, 4, 1);
ygglMainEmp.setZzTime(ClockInTool.strToDateLong(zztime)); ygglMainEmp.setZzTime(ClockInTool.strToDateLong(zztime));
} }
ygglMainEmp.insert(); ygglMainEmp.insert();
//假期规则初始化 //假期规则初始化
String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, orgCode)); List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, orgCode));
...@@ -392,14 +392,14 @@ public class YgglController { ...@@ -392,14 +392,14 @@ public class YgglController {
KqglAssoLeaveEmployeeBalance.builder().leaveRulesId(r.getId()).userid(ygglMainEmp.getEmpNum()).balanceDays(0.0).modifyUserid(userBean.getEmpNum()).modifyTimer(current_time).orgCode(userBean.getOrgCode()).build().insert(); KqglAssoLeaveEmployeeBalance.builder().leaveRulesId(r.getId()).userid(ygglMainEmp.getEmpNum()).balanceDays(0.0).modifyUserid(userBean.getEmpNum()).modifyTimer(current_time).orgCode(userBean.getOrgCode()).build().insert();
} }
} }
try { try {
realtimeupdate.AttendanceTask(userBean.getOrgCode(), ygglMainEmp.getEmpNum(), 2,null); realtimeupdate.AttendanceTask(userBean.getOrgCode(), ygglMainEmp.getEmpNum(), 2,null);
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }
return ResultUtil.data(ygglMainEmp, "添加员工成功!"); return ResultUtil.data(ygglMainEmp, "添加员工成功!");
} else { } else {
return ResultUtil.error("该手机号已被使用,请输入正确手机号"); return ResultUtil.error("该手机号已被使用,请输入正确手机号");
...@@ -409,7 +409,7 @@ public class YgglController { ...@@ -409,7 +409,7 @@ public class YgglController {
/** /**
* 修改员工档案 * 修改员工档案
* *
* @param * @param
* @return * @return
*/ */
...@@ -436,7 +436,7 @@ public class YgglController { ...@@ -436,7 +436,7 @@ public class YgglController {
/** /**
* 员工搜索 * 员工搜索
* *
* @param * @param
* @return * @return
*/ */
...@@ -469,13 +469,13 @@ public class YgglController { ...@@ -469,13 +469,13 @@ public class YgglController {
return ResultUtil.data(ygglMainEmpPage); return ResultUtil.data(ygglMainEmpPage);
} }
@Autowired @Autowired
private ZzglBmgwMService zzglBmgwMService; private ZzglBmgwMService zzglBmgwMService;
/** /**
* 员工列表-分页 * 员工列表-分页
* *
* @param * @param
* @return * @return
*/ */
...@@ -487,7 +487,7 @@ public class YgglController { ...@@ -487,7 +487,7 @@ public class YgglController {
Integer bmgwId = empQuery.getBmgwid(); Integer bmgwId = empQuery.getBmgwid();
Page<YgglMainEmp> page = new Page<YgglMainEmp>(empQuery.getCurrentPage(), empQuery.getTotalPage()); Page<YgglMainEmp> page = new Page<YgglMainEmp>(empQuery.getCurrentPage(), empQuery.getTotalPage());
List<Integer> empNums = CollUtil.toList(); List<Integer> empNums = CollUtil.toList();
if (bmgwId != null) { if (bmgwId != null) {
List<YgglMainEmp> usersQuery = zzglBmgwMService.selectOtherlistent(userBean.getOrgCode(), bmgwId); List<YgglMainEmp> usersQuery = zzglBmgwMService.selectOtherlistent(userBean.getOrgCode(), bmgwId);
if (CollectionUtil.isNotEmpty(usersQuery)) { if (CollectionUtil.isNotEmpty(usersQuery)) {
...@@ -495,7 +495,7 @@ public class YgglController { ...@@ -495,7 +495,7 @@ public class YgglController {
}else { }else {
return ResultUtil.data(null); return ResultUtil.data(null);
} }
if (CollectionUtil.isEmpty(empNums)) { if (CollectionUtil.isEmpty(empNums)) {
return ResultUtil.data(null); return ResultUtil.data(null);
} }
...@@ -505,7 +505,7 @@ public class YgglController { ...@@ -505,7 +505,7 @@ public class YgglController {
IPage<YgglMainEmp> ygglMainEmpPage = ygglMainEmpMapper.selectME(page, empQuery); IPage<YgglMainEmp> ygglMainEmpPage = ygglMainEmpMapper.selectME(page, empQuery);
List<YgglMainEmp> ygglMainEmps = ygglMainEmpPage.getRecords(); List<YgglMainEmp> ygglMainEmps = ygglMainEmpPage.getRecords();
return ResultUtil.data(page, ygglMainEmps); return ResultUtil.data(page, ygglMainEmps);
} }
...@@ -516,7 +516,7 @@ public class YgglController { ...@@ -516,7 +516,7 @@ public class YgglController {
@ApiOperation(value = "7.导入员工档案", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "7.导入员工档案", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
public Result<JSONObject> importEmpRecord(@CurrentUser UserBean userBean, public Result<JSONObject> importEmpRecord(@CurrentUser UserBean userBean,
@Validated @RequestBody ValidList<AddygdaDto> listAddygdaDto) throws Exception { @Validated @RequestBody ValidList<AddygdaDto> listAddygdaDto) throws Exception {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
// 查询所有员工手机号 // 查询所有员工手机号
...@@ -542,7 +542,7 @@ public class YgglController { ...@@ -542,7 +542,7 @@ public class YgglController {
// List<AddygdaDto> list = listAddygdaDto.stream() // List<AddygdaDto> list = listAddygdaDto.stream()
// .filter(o -> o != null && !listPhone.contains(o.getPhone()) && !listzjNum.contains(o.getZjNum())) // .filter(o -> o != null && !listPhone.contains(o.getPhone()) && !listzjNum.contains(o.getZjNum()))
// .collect(Collectors.toList()); // .collect(Collectors.toList());
// 过滤掉 导入数据中, listPhone已存在 的 phone 的对象集合 // 过滤掉 导入数据中, listPhone已存在 的 phone 的对象集合
List<AddygdaDto> list = listAddygdaDto.stream() List<AddygdaDto> list = listAddygdaDto.stream()
.filter(o -> o != null && !listPhone.contains(o.getPhone())).collect(Collectors.toList()); .filter(o -> o != null && !listPhone.contains(o.getPhone())).collect(Collectors.toList());
...@@ -566,26 +566,26 @@ public class YgglController { ...@@ -566,26 +566,26 @@ public class YgglController {
String zjNum = ad.getZjNum(); String zjNum = ad.getZjNum();
boolean isvalid = true; boolean isvalid = true;
switch (zjType) { switch (zjType) {
case 0: case 0:
isvalid = IdcardUtil.isValidCard15(zjNum) || IdcardUtil.isValidCard18(zjNum); isvalid = IdcardUtil.isValidCard15(zjNum) || IdcardUtil.isValidCard18(zjNum);
break; break;
case 1: case 1:
String[] strs = IdcardUtil.isValidCard10(zjNum); String[] strs = IdcardUtil.isValidCard10(zjNum);
if (strs == null) { if (strs == null) {
isvalid = false; isvalid = false;
break;
}
String str2 = strs != null && strs.length > 2 ? strs[2] : "false";
isvalid = "澳门/香港".contains(strs[0]) && "true".equals(str2);
break;
case 2:
isvalid = IdcardUtil.isValidTWCard(zjNum);
break;
case 3:
isvalid = ReUtil.isMatch(Regular.PASSPORT1, zjNum) || ReUtil.isMatch(Regular.PASSPORT2, zjNum);
break;
default:
break; break;
}
String str2 = strs != null && strs.length > 2 ? strs[2] : "false";
isvalid = "澳门/香港".contains(strs[0]) && "true".equals(str2);
break;
case 2:
isvalid = IdcardUtil.isValidTWCard(zjNum);
break;
case 3:
isvalid = ReUtil.isMatch(Regular.PASSPORT1, zjNum) || ReUtil.isMatch(Regular.PASSPORT2, zjNum);
break;
default:
break;
} }
if (!isvalid) { if (!isvalid) {
return ResultUtil.error("证件格式不对!"); return ResultUtil.error("证件格式不对!");
...@@ -619,9 +619,9 @@ public class YgglController { ...@@ -619,9 +619,9 @@ public class YgglController {
// 存放 插入失败的 数据 // 存放 插入失败的 数据
insertErrors.add(yme); insertErrors.add(yme);
} }
//假期规则初始化 //假期规则初始化
String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, orgCode)); List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, orgCode));
...@@ -632,8 +632,8 @@ public class YgglController { ...@@ -632,8 +632,8 @@ public class YgglController {
KqglAssoLeaveEmployeeBalance.builder().leaveRulesId(r.getId()).userid(login.getId()).balanceDays(0.0).modifyUserid(userBean.getEmpNum()).modifyTimer(current_time).orgCode(userBean.getOrgCode()).build().insert(); KqglAssoLeaveEmployeeBalance.builder().leaveRulesId(r.getId()).userid(login.getId()).balanceDays(0.0).modifyUserid(userBean.getEmpNum()).modifyTimer(current_time).orgCode(userBean.getOrgCode()).build().insert();
} }
} }
} }
JSONObject obj = JSONUtil.createObj(); JSONObject obj = JSONUtil.createObj();
...@@ -649,7 +649,7 @@ public class YgglController { ...@@ -649,7 +649,7 @@ public class YgglController {
/** /**
* 获取导入模板 * 获取导入模板
* *
* @param * @param
* @return * @return
* @throws IOException * @throws IOException
...@@ -706,7 +706,7 @@ public class YgglController { ...@@ -706,7 +706,7 @@ public class YgglController {
/** /**
* 导出员工 * 导出员工
* *
* @param * @param
* @return * @return
*/ */
...@@ -721,7 +721,7 @@ public class YgglController { ...@@ -721,7 +721,7 @@ public class YgglController {
/** /**
* 获取员工教育经历表 * 获取员工教育经历表
* *
* @param * @param
* @return * @return
*/ */
...@@ -748,7 +748,7 @@ public class YgglController { ...@@ -748,7 +748,7 @@ public class YgglController {
/** /**
* 添加/修改员工教育经历表 * 添加/修改员工教育经历表
* *
* @param * @param
* @return * @return
*/ */
...@@ -764,7 +764,7 @@ public class YgglController { ...@@ -764,7 +764,7 @@ public class YgglController {
/** /**
* 删除员工教育经历表 * 删除员工教育经历表
* *
* @param * @param
* @return * @return
*/ */
...@@ -779,7 +779,7 @@ public class YgglController { ...@@ -779,7 +779,7 @@ public class YgglController {
/** /**
* 获取员工培训经历信息表 * 获取员工培训经历信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -807,7 +807,7 @@ public class YgglController { ...@@ -807,7 +807,7 @@ public class YgglController {
/** /**
* 添加/修改员工培训经历信息表 * 添加/修改员工培训经历信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -815,7 +815,7 @@ public class YgglController { ...@@ -815,7 +815,7 @@ public class YgglController {
@ApiOperation(value = "16.添加/修改员工培训经历信息表", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "16.添加/修改员工培训经历信息表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 16) @ApiOperationSupport(order = 16)
public Result<YgglAttaPxjlxxb> addpxjlxxb(@CurrentUser UserBean userBean, public Result<YgglAttaPxjlxxb> addpxjlxxb(@CurrentUser UserBean userBean,
@RequestBody YgglAttaPxjlxxb ygglAttaPxjlxxb) { @RequestBody YgglAttaPxjlxxb ygglAttaPxjlxxb) {
ygglAttaPxjlxxb.setEmpNum(ygglAttaPxjlxxb.getEmpNum()); ygglAttaPxjlxxb.setEmpNum(ygglAttaPxjlxxb.getEmpNum());
ygglAttaPxjlxxb.setOrgCode(userBean.getOrgCode()); ygglAttaPxjlxxb.setOrgCode(userBean.getOrgCode());
ygglAttaPxjlxxb.insertOrUpdate(); ygglAttaPxjlxxb.insertOrUpdate();
...@@ -824,7 +824,7 @@ public class YgglController { ...@@ -824,7 +824,7 @@ public class YgglController {
/** /**
* 删除员工培训经历信息表 * 删除员工培训经历信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -839,7 +839,7 @@ public class YgglController { ...@@ -839,7 +839,7 @@ public class YgglController {
/** /**
* 获取员工工作经历表 * 获取员工工作经历表
* *
* @param * @param
* @return * @return
*/ */
...@@ -866,7 +866,7 @@ public class YgglController { ...@@ -866,7 +866,7 @@ public class YgglController {
/** /**
* 添加/修改员工工作经历表 * 添加/修改员工工作经历表
* *
* @param * @param
* @return * @return
*/ */
...@@ -882,7 +882,7 @@ public class YgglController { ...@@ -882,7 +882,7 @@ public class YgglController {
/** /**
* 删除员工工作经历表 * 删除员工工作经历表
* *
* @param * @param
* @return * @return
*/ */
...@@ -897,7 +897,7 @@ public class YgglController { ...@@ -897,7 +897,7 @@ public class YgglController {
/** /**
* 获取员工职称信息表 * 获取员工职称信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -924,7 +924,7 @@ public class YgglController { ...@@ -924,7 +924,7 @@ public class YgglController {
/** /**
* 添加/修改员工职称信息表 * 添加/修改员工职称信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -940,7 +940,7 @@ public class YgglController { ...@@ -940,7 +940,7 @@ public class YgglController {
/** /**
* 删除员工职称信息表 * 删除员工职称信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -955,7 +955,7 @@ public class YgglController { ...@@ -955,7 +955,7 @@ public class YgglController {
/** /**
* 获取员工证书证件表 * 获取员工证书证件表
* *
* @param * @param
* @return * @return
*/ */
...@@ -982,7 +982,7 @@ public class YgglController { ...@@ -982,7 +982,7 @@ public class YgglController {
/** /**
* 添加/修改员工证书证件表 * 添加/修改员工证书证件表
* *
* @param * @param
* @return * @return
*/ */
...@@ -998,7 +998,7 @@ public class YgglController { ...@@ -998,7 +998,7 @@ public class YgglController {
/** /**
* 删除员工证书证件表 * 删除员工证书证件表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1013,7 +1013,7 @@ public class YgglController { ...@@ -1013,7 +1013,7 @@ public class YgglController {
/** /**
* 获取员工联系信息表 * 获取员工联系信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1040,7 +1040,7 @@ public class YgglController { ...@@ -1040,7 +1040,7 @@ public class YgglController {
/** /**
* 添加/修改员工联系信息表 * 添加/修改员工联系信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1056,7 +1056,7 @@ public class YgglController { ...@@ -1056,7 +1056,7 @@ public class YgglController {
/** /**
* 删除员工联系信息表 * 删除员工联系信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1071,7 +1071,7 @@ public class YgglController { ...@@ -1071,7 +1071,7 @@ public class YgglController {
/** /**
* 获取员工紧急联系人表 * 获取员工紧急联系人表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1098,7 +1098,7 @@ public class YgglController { ...@@ -1098,7 +1098,7 @@ public class YgglController {
/** /**
* 添加/修改员工紧急联系人表 * 添加/修改员工紧急联系人表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1114,7 +1114,7 @@ public class YgglController { ...@@ -1114,7 +1114,7 @@ public class YgglController {
/** /**
* 删除员工紧急联系人表 * 删除员工紧急联系人表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1130,7 +1130,7 @@ public class YgglController { ...@@ -1130,7 +1130,7 @@ public class YgglController {
// 获取工资卡信息 // 获取工资卡信息
/** /**
* 获取员工工资卡信息 * 获取员工工资卡信息
* *
* @param * @param
* @return * @return
*/ */
...@@ -1156,7 +1156,7 @@ public class YgglController { ...@@ -1156,7 +1156,7 @@ public class YgglController {
/** /**
* 添加/修改工资卡信息 * 添加/修改工资卡信息
* *
* @param * @param
* @return * @return
*/ */
...@@ -1172,7 +1172,7 @@ public class YgglController { ...@@ -1172,7 +1172,7 @@ public class YgglController {
/** /**
* 删除工资卡信息 * 删除工资卡信息
* *
* @param * @param
* @return * @return
*/ */
...@@ -1187,7 +1187,7 @@ public class YgglController { ...@@ -1187,7 +1187,7 @@ public class YgglController {
/** /**
* 获取员工合同信息表 * 获取员工合同信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1214,7 +1214,7 @@ public class YgglController { ...@@ -1214,7 +1214,7 @@ public class YgglController {
/** /**
* 添加/修改员工合同信息表 * 添加/修改员工合同信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1230,7 +1230,7 @@ public class YgglController { ...@@ -1230,7 +1230,7 @@ public class YgglController {
/** /**
* 删除员工合同信息表 * 删除员工合同信息表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1245,7 +1245,7 @@ public class YgglController { ...@@ -1245,7 +1245,7 @@ public class YgglController {
/** /**
* 获取员工材料附件表 * 获取员工材料附件表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1272,7 +1272,7 @@ public class YgglController { ...@@ -1272,7 +1272,7 @@ public class YgglController {
/** /**
* 添加/修改员工材料附件表 * 添加/修改员工材料附件表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1288,7 +1288,7 @@ public class YgglController { ...@@ -1288,7 +1288,7 @@ public class YgglController {
/** /**
* 删除员工材料附件表 * 删除员工材料附件表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1303,7 +1303,7 @@ public class YgglController { ...@@ -1303,7 +1303,7 @@ public class YgglController {
/** /**
* 获取成长记录表 * 获取成长记录表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1330,7 +1330,7 @@ public class YgglController { ...@@ -1330,7 +1330,7 @@ public class YgglController {
/** /**
* 添加/修改成长记录表 * 添加/修改成长记录表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1346,7 +1346,7 @@ public class YgglController { ...@@ -1346,7 +1346,7 @@ public class YgglController {
/** /**
* 获取单个离职员工信息(管) * 获取单个离职员工信息(管)
* *
* @param * @param
* @return * @return
*/ */
...@@ -1361,7 +1361,7 @@ public class YgglController { ...@@ -1361,7 +1361,7 @@ public class YgglController {
/** /**
* 员工转正 0-1 * 员工转正 0-1
* *
* @param * @param
* @return * @return
*/ */
...@@ -1378,7 +1378,7 @@ public class YgglController { ...@@ -1378,7 +1378,7 @@ public class YgglController {
/** /**
* 计划离职 type1-2 * 计划离职 type1-2
* *
* @param * @param
* @return * @return
*/ */
...@@ -1392,11 +1392,11 @@ public class YgglController { ...@@ -1392,11 +1392,11 @@ public class YgglController {
YgglMainEmp ygglMainEmp = ygglMainEmpMapper.selectOne(new QueryWrapper<YgglMainEmp>().lambda() YgglMainEmp ygglMainEmp = ygglMainEmpMapper.selectOne(new QueryWrapper<YgglMainEmp>().lambda()
.eq(YgglMainEmp::getEmpNum, empNum) .eq(YgglMainEmp::getEmpNum, empNum)
.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())); .eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
if (ygglMainEmp.getJobStatus() == jobStatus.LIZHIZHONG.getType()) { if (ygglMainEmp.getJobStatus() == jobStatus.LIZHIZHONG.getType()) {
return ResultUtil.success("你已在离职中"); return ResultUtil.success("你已在离职中");
} }
YgglMainLzb ygglMainLzb = YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).build(); YgglMainLzb ygglMainLzb = YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).build();
// 移动员工表数据到离职表 // 移动员工表数据到离职表
BeanUtil.copyProperties(ygglMainEmp, ygglMainLzb, "before_leaving_sts"); BeanUtil.copyProperties(ygglMainEmp, ygglMainLzb, "before_leaving_sts");
...@@ -1407,7 +1407,7 @@ public class YgglController { ...@@ -1407,7 +1407,7 @@ public class YgglController {
.update(new UpdateWrapper<YgglMainEmp>().lambda() .update(new UpdateWrapper<YgglMainEmp>().lambda()
.eq(YgglMainEmp::getEmpNum, empNum) .eq(YgglMainEmp::getEmpNum, empNum)
.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())); .eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
YgglMainLzb.builder().jobStatus(jobStatus.LIZHIZHONG.getType()).lzTime(lzygQueryDto.getLzTime()) YgglMainLzb.builder().jobStatus(jobStatus.LIZHIZHONG.getType()).lzTime(lzygQueryDto.getLzTime())
.lzyy(lzygQueryDto.getLzyy()).lzbz(lzygQueryDto.getLzbz()).build() .lzyy(lzygQueryDto.getLzyy()).lzbz(lzygQueryDto.getLzbz()).build()
.update(new UpdateWrapper<YgglMainLzb>().lambda() .update(new UpdateWrapper<YgglMainLzb>().lambda()
...@@ -1419,7 +1419,7 @@ public class YgglController { ...@@ -1419,7 +1419,7 @@ public class YgglController {
/** /**
* 确认离职 type2-3 * 确认离职 type2-3
* *
* @param * @param
* @return * @return
*/ */
...@@ -1435,8 +1435,8 @@ public class YgglController { ...@@ -1435,8 +1435,8 @@ public class YgglController {
YgglMainLzb.builder().empNum(empNum).jobStatus(YgEnumInterface.jobStatus.YILIZHI.getType()).sjlzTime(new Date()) YgglMainLzb.builder().empNum(empNum).jobStatus(YgEnumInterface.jobStatus.YILIZHI.getType()).sjlzTime(new Date())
.build().update(new UpdateWrapper<YgglMainLzb>().lambda() .build().update(new UpdateWrapper<YgglMainLzb>().lambda()
.eq(YgglMainLzb::getEmpNum, empNum) .eq(YgglMainLzb::getEmpNum, empNum)
.eq(YgglMainLzb::getOrgCode, userBean.getOrgCode())); .eq(YgglMainLzb::getOrgCode, userBean.getOrgCode()));
LambdaQueryWrapper<QyzxEmpEntAsso> queryWrapper = new QueryWrapper<QyzxEmpEntAsso>().lambda() LambdaQueryWrapper<QyzxEmpEntAsso> queryWrapper = new QueryWrapper<QyzxEmpEntAsso>().lambda()
.eq(QyzxEmpEntAsso::getEmpNum, empNum) .eq(QyzxEmpEntAsso::getEmpNum, empNum)
...@@ -1448,8 +1448,8 @@ public class YgglController { ...@@ -1448,8 +1448,8 @@ public class YgglController {
// 初始化 部门主管 // 初始化 部门主管
zzglBmgwMMapper.update(ZzglBmgwM.builder().leader(null).build(), zzglBmgwMMapper.update(ZzglBmgwM.builder().leader(null).build(),
new UpdateWrapper<ZzglBmgwM>().lambda() new UpdateWrapper<ZzglBmgwM>().lambda()
.eq(ZzglBmgwM::getOrgCode, userBean.getOrgCode()) .eq(ZzglBmgwM::getOrgCode, userBean.getOrgCode())
.eq(ZzglBmgwM::getLeader, empNum)); .eq(ZzglBmgwM::getLeader, empNum));
// 更新当前企业 // 更新当前企业
List<QyzxEmpEntAsso> listEEA = qyzxEmpEntAssoMapper.selectList(new QueryWrapper<QyzxEmpEntAsso>().lambda() List<QyzxEmpEntAsso> listEEA = qyzxEmpEntAssoMapper.selectList(new QueryWrapper<QyzxEmpEntAsso>().lambda()
...@@ -1457,11 +1457,11 @@ public class YgglController { ...@@ -1457,11 +1457,11 @@ public class YgglController {
if (listEEA != null && listEEA.size() > 0) { if (listEEA != null && listEEA.size() > 0) {
QyzxEmpLogin.builder().id(empNum).orgId(CollUtil.getFirst(listEEA).getOrgCode()).build().updateById(); QyzxEmpLogin.builder().id(empNum).orgId(CollUtil.getFirst(listEEA).getOrgCode()).build().updateById();
} }
QyzxEmpLogin.builder().build().delete(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode()).eq(QyzxEmpLogin::getId, empNum)); QyzxEmpLogin.builder().build().delete(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode()).eq(QyzxEmpLogin::getId, empNum));
KqglAssoYhkqz.builder().build().delete(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getUserid, empNum).eq(KqglAssoYhkqz::getQyid, userBean.getOrgCode())); KqglAssoYhkqz.builder().build().delete(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getUserid, empNum).eq(KqglAssoYhkqz::getQyid, userBean.getOrgCode()));
try { try {
realtimeupdate.AttendanceTask(userBean.getOrgCode(), empNum, 2,null); realtimeupdate.AttendanceTask(userBean.getOrgCode(), empNum, 2,null);
...@@ -1469,13 +1469,13 @@ public class YgglController { ...@@ -1469,13 +1469,13 @@ public class YgglController {
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }
return ResultUtil.success("确认离职员工成功"); return ResultUtil.success("确认离职员工成功");
} }
/** /**
* 放弃离职 type 2-1 * 放弃离职 type 2-1
* *
* @param * @param
* @return * @return
*/ */
...@@ -1514,7 +1514,7 @@ public class YgglController { ...@@ -1514,7 +1514,7 @@ public class YgglController {
/** /**
* 查询离职员工列表 * 查询离职员工列表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1533,7 +1533,7 @@ public class YgglController { ...@@ -1533,7 +1533,7 @@ public class YgglController {
/** /**
* 展示民族/展示所有民族 * 展示民族/展示所有民族
* *
* @param * @param
* @return * @return
*/ */
...@@ -1554,7 +1554,7 @@ public class YgglController { ...@@ -1554,7 +1554,7 @@ public class YgglController {
/** /**
* 籍贯树 * 籍贯树
* *
* @param * @param
* @return * @return
*/ */
...@@ -1570,7 +1570,7 @@ public class YgglController { ...@@ -1570,7 +1570,7 @@ public class YgglController {
/** /**
* 查询员工列表 * 查询员工列表
* *
* @param * @param
* @return * @return
*/ */
...@@ -1590,7 +1590,7 @@ public class YgglController { ...@@ -1590,7 +1590,7 @@ public class YgglController {
/*************** 统计图 ***************/ /*************** 统计图 ***************/
/** /**
* 查询统计图 * 查询统计图
* *
* @return 成功信息 * @return 成功信息
*/ */
@GetMapping("/yggl") @GetMapping("/yggl")
...@@ -1633,7 +1633,7 @@ public class YgglController { ...@@ -1633,7 +1633,7 @@ public class YgglController {
/** /**
* 员工信息统计图 * 员工信息统计图
* *
* @return 成功信息(weng) * @return 成功信息(weng)
*/ */
@GetMapping("/Cartogram") @GetMapping("/Cartogram")
...@@ -1711,7 +1711,7 @@ public class YgglController { ...@@ -1711,7 +1711,7 @@ public class YgglController {
/** /**
* 获取员工社保公积金 * 获取员工社保公积金
* *
* @param * @param
* @return * @return
*/ */
...@@ -1727,7 +1727,7 @@ public class YgglController { ...@@ -1727,7 +1727,7 @@ public class YgglController {
/** /**
* 获取员工社保公积金 * 获取员工社保公积金
* *
* @param * @param
* @return * @return
*/ */
...@@ -1744,7 +1744,7 @@ public class YgglController { ...@@ -1744,7 +1744,7 @@ public class YgglController {
/** /**
* 添加/修改员工社保公积金 * 添加/修改员工社保公积金
* *
* @param * @param
* @return * @return
*/ */
...@@ -1769,7 +1769,7 @@ public class YgglController { ...@@ -1769,7 +1769,7 @@ public class YgglController {
/** /**
* 删除员工社保公积金 * 删除员工社保公积金
* *
* @param * @param
* @return * @return
*/ */
...@@ -1811,7 +1811,7 @@ public class YgglController { ...@@ -1811,7 +1811,7 @@ public class YgglController {
/** /**
* 获取登录人的相关信息 * 获取登录人的相关信息
* *
* @param * @param
* @return * @return
*/ */
...@@ -1846,22 +1846,22 @@ public class YgglController { ...@@ -1846,22 +1846,22 @@ public class YgglController {
loginInfo.setGwId(gw); loginInfo.setGwId(gw);
loginInfo.setGwName(gwObj != null ? gwObj.getName() : ""); loginInfo.setGwName(gwObj != null ? gwObj.getName() : "");
loginInfo.setEntryTime(ygglMainEmp.getRzTime()); loginInfo.setEntryTime(ygglMainEmp.getRzTime());
if(ygglMainEmp.getSyq()!=null) { if(ygglMainEmp.getSyq()!=null) {
// System.out.println(ygglMainEmp.getSyq()); // System.out.println(ygglMainEmp.getSyq());
Date expireDate = DateUtil.offsetMonth(ygglMainEmp.getRzTime(), ygglMainEmp.getSyq()); // 时间偏移 Date expireDate = DateUtil.offsetMonth(ygglMainEmp.getRzTime(), ygglMainEmp.getSyq()); // 时间偏移
loginInfo.setRegularTime(expireDate); loginInfo.setRegularTime(expireDate);
}else { }else {
loginInfo.setRegularTime(new Date()); loginInfo.setRegularTime(new Date());
} }
} }
return ResultUtil.data(loginInfo); return ResultUtil.data(loginInfo);
} }
/** /**
* 获取登录人和上级主管的empNum和名称 * 获取登录人和上级主管的empNum和名称
* *
* @param * @param
* @return * @return
*/ */
...@@ -1869,16 +1869,16 @@ public class YgglController { ...@@ -1869,16 +1869,16 @@ public class YgglController {
@ApiOperation(value = "70.获取登录人和上级主管的empNum和名称", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "70.获取登录人和上级主管的empNum和名称", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 70) @ApiOperationSupport(order = 70)
public Result<List<LoginerChargeDto>> loginerChargers(@CurrentUser UserBean userBean) { public Result<List<LoginerChargeDto>> loginerChargers(@CurrentUser UserBean userBean) {
List<LoginerChargeDto> loginerChargeDtos = new ArrayList<LoginerChargeDto>(); List<LoginerChargeDto> loginerChargeDtos = new ArrayList<LoginerChargeDto>();
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
ArrayList<Integer> list = new ArrayList<Integer>(); ArrayList<Integer> list = new ArrayList<Integer>();
Integer empNum = userBean.getEmpNum(); Integer empNum = userBean.getEmpNum();
Integer gw = empNumConfirm(orgCode, empNum).getBmgwId(); Integer gw = empNumConfirm(orgCode, empNum).getBmgwId();
if(gw != null && gw > 0) { if(gw != null && gw > 0) {
ZzglBmgwM buid = ZzglBmgwM.builder().id(gw).build().selectById(); ZzglBmgwM buid = ZzglBmgwM.builder().id(gw).build().selectById();
List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper) List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
.eq(ZzglBmgwM::getOrgCode, orgCode).eq(ZzglBmgwM::getType, 0).list(); .eq(ZzglBmgwM::getOrgCode, orgCode).eq(ZzglBmgwM::getType, 0).list();
// 获取该员工的上级部门id 的数组list // 获取该员工的上级部门id 的数组list
...@@ -1894,7 +1894,7 @@ public class YgglController { ...@@ -1894,7 +1894,7 @@ public class YgglController {
} }
List<YgglMainEmp> ygglMainEmps = empNumsConfirm(orgCode, leaderList); List<YgglMainEmp> ygglMainEmps = empNumsConfirm(orgCode, leaderList);
// List<LoginerChargeDto> loginerChargeDtos = new ArrayList<LoginerChargeDto>(); // List<LoginerChargeDto> loginerChargeDtos = new ArrayList<LoginerChargeDto>();
for (Integer leaderId : leaderList) { for (Integer leaderId : leaderList) {
for (YgglMainEmp m : ygglMainEmps) { for (YgglMainEmp m : ygglMainEmps) {
if(leaderId.equals(m.getEmpNum())) { if(leaderId.equals(m.getEmpNum())) {
...@@ -1904,10 +1904,10 @@ public class YgglController { ...@@ -1904,10 +1904,10 @@ public class YgglController {
loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(), m.getName(), m.getHeadUrl())); loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(), m.getName(), m.getHeadUrl()));
} }
} }
} }
Collections.reverse(loginerChargeDtos); Collections.reverse(loginerChargeDtos);
if(loginerChargeDtos.size()>0) { if(loginerChargeDtos.size()>0) {
if((userBean.getEmpNum()).equals(loginerChargeDtos.get(loginerChargeDtos.size()-1).getLeaderEmpNum())) { if((userBean.getEmpNum()).equals(loginerChargeDtos.get(loginerChargeDtos.size()-1).getLeaderEmpNum())) {
...@@ -1917,7 +1917,7 @@ public class YgglController { ...@@ -1917,7 +1917,7 @@ public class YgglController {
return ResultUtil.data(loginerChargeDtos); return ResultUtil.data(loginerChargeDtos);
} }
return ResultUtil.data(loginerChargeDtos); return ResultUtil.data(loginerChargeDtos);
} }
// 根据传来的empNum获取该人员信息，没有则传全部 // 根据传来的empNum获取该人员信息，没有则传全部
...@@ -1947,7 +1947,7 @@ public class YgglController { ...@@ -1947,7 +1947,7 @@ public class YgglController {
/** /**
* 获取用户头像 * 获取用户头像
* *
* @param * @param
* @return * @return
*/ */
...@@ -1969,52 +1969,52 @@ public class YgglController { ...@@ -1969,52 +1969,52 @@ public class YgglController {
} }
return ResultUtil.data(yglList); return ResultUtil.data(yglList);
} }
@Autowired @Autowired
private KqglAssoLeaveBalanceMapper kqglassoleavebalancemapper; private KqglAssoLeaveBalanceMapper kqglassoleavebalancemapper;
@GetMapping(value = "/address_book") @GetMapping(value = "/address_book")
@ApiOperation(value = "APP 获取通讯录", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "APP 获取通讯录", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 70) @ApiOperationSupport(order = 70)
public Result<Object> Getaddressbook(@CurrentUser UserBean userBean) { public Result<Object> Getaddressbook(@CurrentUser UserBean userBean) {
List<AdditionalDto> userlist = kqglassoleavebalancemapper.selectAdditionalList(userBean.getOrgCode()); List<AdditionalDto> userlist = kqglassoleavebalancemapper.selectAdditionalList(userBean.getOrgCode());
return ResultUtil.data(userlist); return ResultUtil.data(userlist);
} }
@PostMapping(value = "/modify_avatar") @PostMapping(value = "/modify_avatar")
@ApiOperation(value = "APP_修改头像", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "APP_修改头像", httpMethod = "POST", notes = "接口发布说明")
public Result<YgglAttaSbgjj> Modify_Avatar(@CurrentUser UserBean userBean, @RequestBody ModifyAvatarDto modifyavatardto) { public Result<YgglAttaSbgjj> Modify_Avatar(@CurrentUser UserBean userBean, @RequestBody ModifyAvatarDto modifyavatardto) {
YgglMainEmp.builder().headUrl(modifyavatardto.getAvatar_path()).build().update(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()) YgglMainEmp.builder().headUrl(modifyavatardto.getAvatar_path()).build().update(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
.eq(YgglMainEmp::getEmpNum, userBean.getEmpNum())); .eq(YgglMainEmp::getEmpNum, userBean.getEmpNum()));
QyzxEmpLogin.builder().headUrl(modifyavatardto.getAvatar_path()).build().update(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode()) QyzxEmpLogin.builder().headUrl(modifyavatardto.getAvatar_path()).build().update(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode())
.eq(QyzxEmpLogin::getPhone, userBean.getQyzxEmpLogin().getPhone())); .eq(QyzxEmpLogin::getPhone, userBean.getQyzxEmpLogin().getPhone()));
return ResultUtil.success("上传成功"); return ResultUtil.success("上传成功");
} }
@PostMapping(value = "/new_account") @PostMapping(value = "/new_account")
@ApiOperation(value = "修改账号", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "修改账号", httpMethod = "POST", notes = "接口发布说明")
public Result<Object> New_account(@CurrentUser UserBean userBean, @RequestBody UserInfo userinfo) { public Result<Object> New_account(@CurrentUser UserBean userBean, @RequestBody UserInfo userinfo) {
YgglMainEmp sjhpd = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getPhone, userinfo.getPhone()) YgglMainEmp sjhpd = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getPhone, userinfo.getPhone())
.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())); .eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
if(sjhpd == null) { if(sjhpd == null) {
YgglMainEmp.builder().phone(userinfo.getPhone()).build().update(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, userinfo.getName()).eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())); YgglMainEmp.builder().phone(userinfo.getPhone()).build().update(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, userinfo.getName()).eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
QyzxEmpLogin.builder().phone(userinfo.getPhone()).build().update(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getId,userinfo.getName()).eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode())); QyzxEmpLogin.builder().phone(userinfo.getPhone()).build().update(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getId,userinfo.getName()).eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode()));
return ResultUtil.success("修改成功"); return ResultUtil.success("修改成功");
}else { }else {
return ResultUtil.error("该号码已存在"); return ResultUtil.error("该号码已存在");
} }
} }
} }
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