@@ -10,6 +10,7 @@ import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.time.LocalTime;
/**
* <p>
@@ -165,16 +166,28 @@ public class MaintenanceCompany implements Serializable {
private Integer isClock;
- * 上班时间
+ * 下午上班时间
*/
- @TableField("top_time")
- private LocalDateTime topTime;
+ @TableField("top_time_pm")
+ private LocalTime topTimePm;
- * 下班时间
+ * 下午下班时间
- @TableField("down_time")
- private LocalDateTime downTime;
+ @TableField("down_time_pm")
+ private LocalTime downTimePm;
+
+ /**
+ * 加班上班时间
+ */
+ @TableField("top_time_ot")
+ private LocalTime topTimeOt;
+ * 加班下班时间
+ @TableField("down_time_ot")
+ private LocalTime downTimeOt;
* 是否开启上下班打卡
@@ -43,6 +43,8 @@ public class UserAccount {
private int deleteFlag;
+ private int expertFlag;
public UserAccount(){}
public UserAccount(UserRequest userRequest){
@@ -20,6 +20,7 @@ public class UserResponse {
private String name;//用户昵称
private Integer type;//用户类型
private Date createTime;//创建时间/注册时间
+ private Integer expertFlag;//专家标识
private String token;//验证token
private List<MaintenanceCompany> companyList;//用户所在团队信息集合
private List<Menu> menus;//用户菜单
@@ -157,6 +157,7 @@ public class UserService implements IUserService {
UserInfo userInfo = userInfoService.getByUserId(userId);
userResponse.setName(userInfo.getName());
userResponse.setMobile(userAccount.getMobile());
+ userResponse.setExpertFlag(userAccount.getExpertFlag());
//生成前端的token值
userResponse.setToken(IdUtil.fastSimpleUUID());
List<MtCompanyUser> mtCompanyUserList = mtCompanyUserService.list(new QueryWrapper<MtCompanyUser>()
@@ -16,11 +16,12 @@
<result column="remarks" property="remarks" jdbcType="VARCHAR" />
<result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
<result column="delete_flag" property="deleteFlag" jdbcType="INTEGER"/>
+ <result column="expert_flag" property="expertFlag" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List" >
user_id, type, account, password, salt, mobile, wechat_open_id, email, other_account,
- other_account2, status, remarks, create_date, delete_flag
+ other_account2, status, remarks, create_date, delete_flag, expert_flag
</sql>