diff --git a/src/main/java/cn/timer/api/controller/jxgl/AchievementsController.java b/src/main/java/cn/timer/api/controller/jxgl/AchievementsController.java index 04d0f66..ca62888 100644 --- a/src/main/java/cn/timer/api/controller/jxgl/AchievementsController.java +++ b/src/main/java/cn/timer/api/controller/jxgl/AchievementsController.java @@ -18,8 +18,9 @@ import org.springframework.web.bind.annotation.RestController; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; + import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import cn.hutool.core.util.StrUtil; diff --git a/src/main/java/cn/timer/api/controller/qyzx/QyzxController.java b/src/main/java/cn/timer/api/controller/qyzx/QyzxController.java index 0582084..1692570 100644 --- a/src/main/java/cn/timer/api/controller/qyzx/QyzxController.java +++ b/src/main/java/cn/timer/api/controller/qyzx/QyzxController.java @@ -1,6 +1,5 @@ package cn.timer.api.controller.qyzx; -import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -8,20 +7,18 @@ import java.util.stream.Stream; import javax.servlet.http.HttpSession; -import org.apache.ibatis.annotations.Param; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper; @@ -132,8 +129,11 @@ public class QyzxController { @ApiOperation(value = "添加/修改企业信息", httpMethod = "POST", notes = "接口发布说明") public Result<QyzxEntInfoM> addent(@CurrentUser UserBean userBean, @RequestBody QyzxEntInfoM qyzxEntInfoM) { qyzxEntInfoM.setId(userBean.getOrgCode()); + QyzxEntInfoM q = new LambdaQueryChainWrapper<QyzxEntInfoM>(qyzxEntInfoMMapper) .eq(QyzxEntInfoM::getId, userBean.getOrgCode()).one(); + + qyzxEntInfoM.setRegisterTime(q.getRegisterTime()); qyzxEntInfoM.insertOrUpdate(); diff --git a/src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java b/src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java index c764f31..d681d64 100644 --- a/src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java +++ b/src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java @@ -17,8 +17,9 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; + import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import cn.hutool.core.util.StrUtil; diff --git a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java index 365ece4..44cd071 100644 --- a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java +++ b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import cn.timer.api.bean.kqgl.AttendanceGroup; import cn.timer.api.bean.kqgl.AttendanceReport; diff --git a/src/main/java/cn/timer/api/controller/yggl/YgglController.java b/src/main/java/cn/timer/api/controller/yggl/YgglController.java index 54aa3bd..d196c49 100644 --- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java +++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java @@ -8,7 +8,7 @@ package cn.timer.api.controller.yggl; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; + import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -21,7 +21,9 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.transaction.Transactional; +import javax.websocket.server.PathParam; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.web.bind.annotation.DeleteMapping; @@ -35,13 +37,11 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; -import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper; import com.github.pagehelper.util.StringUtil; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; - -import cn.hutool.Hutool; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.BetweenFormater.Level; import cn.hutool.core.date.DateUtil; @@ -69,7 +69,6 @@ import cn.timer.api.config.enuminterface.YgEnumInterface; import cn.timer.api.config.enums.CommonEnum; import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper; import cn.timer.api.dao.yggl.YgAreaDtoMapper; -import cn.timer.api.dao.yggl.YgCartogramDtoMapper; import cn.timer.api.dao.yggl.YgCityDtoMapper; import cn.timer.api.dao.yggl.YgMzDtoMapper; import cn.timer.api.dao.yggl.YgProDtoMapper; @@ -168,7 +167,6 @@ public class YgglController { Integer orgCode = userBean.getOrgCode(); ArrayList<Integer> list = new ArrayList<Integer>(); Integer empNum = userBean.getEmpNum(); - List<LoginerChargeDto> loginerCharges = new ArrayList<LoginerChargeDto>(); Integer gw = empNumConfirm(orgCode, empNum).getBmgwId(); List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper).eq(ZzglBmgwM::getOrgCode, orgCode).list(); //获取该员工的上级部门id 的数组list @@ -212,17 +210,30 @@ public class YgglController { return one; } + + + /** - * 获取企业到期时间和版本 + * 获取用户头像 * * @param * @return */ - @GetMapping(value = "/endtimeVersion") - @ApiOperation(value = "获取企业到期时间和版本", httpMethod = "GET", notes = "接口发布说明") + @PostMapping(value = "/headphotos") + @ApiOperation(value = "获取用户头像", httpMethod = "POST", notes = "接口发布说明") @ApiOperationSupport(order = 70) - public Result<YgglMainEmp> endtimeVersion(@CurrentUser UserBean userBean) { - return ResultUtil.error(); + public Result<List<YgglMainEmp>> headphotos(@CurrentUser UserBean userBean, @RequestBody List<Integer> empNumList) { + if (empNumList.size()==0) { + return ResultUtil.error("请输入empNum数组"); + } + List<YgglMainEmp> yglList = YgglMainEmp.builder().build().selectList(new QueryWrapper<YgglMainEmp>().lambda() + .eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).in(YgglMainEmp::getEmpNum, empNumList).select(YgglMainEmp::getId,YgglMainEmp::getName,YgglMainEmp::getHeadUrl)); + for (YgglMainEmp yg : yglList) { + if (StringUtil.isEmpty(yg.getHeadUrl())) { + yg.setHeadUrl(""); + } + } + return ResultUtil.data(yglList, "获取用户头像组成功"); } /** * 获取员工档案 diff --git a/src/main/java/cn/timer/api/controller/zzgl/ZzglController.java b/src/main/java/cn/timer/api/controller/zzgl/ZzglController.java index 0c443ec..7a66dfe 100644 --- a/src/main/java/cn/timer/api/controller/zzgl/ZzglController.java +++ b/src/main/java/cn/timer/api/controller/zzgl/ZzglController.java @@ -18,8 +18,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; + import cn.timer.api.bean.yggl.YgglMainEmp; import cn.timer.api.bean.zzgl.ZzglAuth; diff --git a/src/main/java/cn/timer/api/dto/yggl/YgAreaDto.java b/src/main/java/cn/timer/api/dto/yggl/YgAreaDto.java index af1e0a8..d7c917e 100644 --- a/src/main/java/cn/timer/api/dto/yggl/YgAreaDto.java +++ b/src/main/java/cn/timer/api/dto/yggl/YgAreaDto.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import cn.timer.api.dao.yggl.YgAreaDtoMapper; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/cn/timer/api/dto/yggl/YgCityDto.java b/src/main/java/cn/timer/api/dto/yggl/YgCityDto.java index 7f5926c..b50e99a 100644 --- a/src/main/java/cn/timer/api/dto/yggl/YgCityDto.java +++ b/src/main/java/cn/timer/api/dto/yggl/YgCityDto.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import cn.timer.api.dao.yggl.YgCityDtoMapper; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/cn/timer/api/dto/yggl/YgProDto.java b/src/main/java/cn/timer/api/dto/yggl/YgProDto.java index 0576db8..0fb5181 100644 --- a/src/main/java/cn/timer/api/dto/yggl/YgProDto.java +++ b/src/main/java/cn/timer/api/dto/yggl/YgProDto.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import cn.timer.api.dao.yggl.YgProDtoMapper; import io.swagger.annotations.ApiModel;