优化导出

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ResultUser.java

@@ -46,4 +46,6 @@ public class ResultUser implements Serializable {
     @ApiModelProperty(name = "type",value = "类型（公司、外协）")
     private String type;
 
+    @ApiModelProperty(name = "day", value = "限制审核的天数")
+    private Integer day;
 }

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java

@@ -4,11 +4,12 @@ package cn.wisenergy.service.impl;
 import cn.wisenergy.common.utils.Md5Util;
 import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
 import cn.wisenergy.common.utils.exception.BaseCustomException;
-import cn.wisenergy.mapper.WorkDeptMapper;
 import cn.wisenergy.mapper.WorkUserMapper;
+import cn.wisenergy.model.app.WorkSubmitAdopt;
 import cn.wisenergy.model.app.WorkUser;
 import cn.wisenergy.model.dto.ResultUser;
 import cn.wisenergy.model.enums.ManagerEnum;
+import cn.wisenergy.service.WorkSubmitAdoptService;
 import cn.wisenergy.service.WorkUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -36,10 +37,11 @@ public class WorkUserServiceImpl implements WorkUserService {
     private WorkUserMapper workUserMapper;
 
     @Autowired
-    private WorkDeptMapper workDeptMapper;
+    private WorkSubmitAdoptService workSubmitAdoptService;
 
     private static final String LOGIN_SOURCE = "PC";
 
+
     @Override
     public WorkUser getById(Integer id) {
         log.info("WorkUserServiceImpl[]getById[]input.param.id:{}" + id);
@@ -110,14 +112,24 @@ public class WorkUserServiceImpl implements WorkUserService {
         if (null == user) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.USER_LOGIN_NAME_OR_PASSWORD_IS_ERROR);
         }
+/*
+        if (user.getModifyTime() != user.getCreateTime()) {
+            修改密码
+        }
+  */
         //如果登录来源是PC,判断用户是不是管理员
         if (LOGIN_SOURCE.equals(source)) {
             if (user.getLevel().equals(ManagerEnum.NOT_MANAGER.getCode())) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
             }
         }
+
+        WorkSubmitAdopt byId = workSubmitAdoptService.getById(1);
+
         //将用户对象转换为dto
-        return getResultUser(user);
+        ResultUser resultUser = getResultUser(user);
+        resultUser.setDay(byId.getSubmitTime());
+        return resultUser;
     }
 
     @Override