Commit 06434b99 by 东州 翁 Committed by chenzg

1.新增意见反馈接口 2.修改了验证码认证代码中的字段类型,3.添加意见反馈所需表

parent eff40f8e
package cn.timer.api.bean.qyzx;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import cn.timer.api.dto.login.QysDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author Tang 2019-11-11
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder(toBuilder=true)
@ApiModel("反馈附件表")
public class QyzxFeebackAccessory extends Model<QyzxFeebackAccessory> {
private static final long serialVersionUID = 3545665863196016627L;
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="意见id",example="1")
private Integer feebackId;
@ApiModelProperty(value = "附件url地址", example = "url")
private String opinionUrl;
}
\ No newline at end of file
package cn.timer.api.bean.qyzx;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author Tang 2019-11-11
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder(toBuilder=true)
@ApiModel("意见反馈表")
public class QyzxSuggestionFeeback extends Model<QyzxSuggestionFeeback> {
private static final long serialVersionUID = 3545665863196016627L;
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="员工编号",example="9688")
private Integer empNum;
@ApiModelProperty(value="",example="不好用")
private String opinionText;
@ApiModelProperty(value="",example="1")
private Integer bugType;
@ApiModelProperty(value="",example="2020-4-20 08:00:00")
private Date createTime;
@ApiModelProperty(value="",example="117")
private Integer orgCode;
@ApiModelProperty(value="",example="那别用了")
private String reply;
@ApiModelProperty(value="",example="2020-4-21 08:00:00")
private Date replyTime;
}
\ No newline at end of file
...@@ -134,11 +134,11 @@ public class LoginController { ...@@ -134,11 +134,11 @@ public class LoginController {
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
public Result<String> authentication(@RequestBody EntRegisterDto entRegisterDto) { public Result<String> authentication(@RequestBody EntRegisterDto entRegisterDto) {
String phone = entRegisterDto.getPhone(); String phone = entRegisterDto.getPhone();
String code = entRegisterDto.getCode(); String code = entRegisterDto.getCode().toString();
// String codeRedis = (String) redisTemplate.get(phone); // String codeRedis = (String) redisTemplate.get(phone);
String codeRedis = (String) session.getAttribute(phone); Integer codeRedis = (Integer) session.getAttribute(phone);
if (code == null || !code.toString().equals(codeRedis)) { if (code == null || !code.equals(codeRedis.toString())) {
return ResultUtil.error("验证码不符"); return ResultUtil.error("验证码不符");
} }
return ResultUtil.success("验证码正确"); return ResultUtil.success("验证码正确");
...@@ -401,9 +401,9 @@ public class LoginController { ...@@ -401,9 +401,9 @@ public class LoginController {
String phone = entRegisterDto.getPhone(); String phone = entRegisterDto.getPhone();
// Object codeRedis = redisTemplate.get(phone); // Object codeRedis = redisTemplate.get(phone);
String codeRedis = (String) session.getAttribute(phone); Integer codeRedis = (Integer) session.getAttribute(phone);
if (codeRedis == null || !code.toString().equals(codeRedis.toString())) if (codeRedis == null || !code.equals(codeRedis.toString()))
return ResultUtil.error("验证码不符"); return ResultUtil.error("验证码不符");
QyzxEmpLogin qyzxEmpLogin1 = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper) QyzxEmpLogin qyzxEmpLogin1 = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
......
...@@ -240,7 +240,7 @@ public class YgglController { ...@@ -240,7 +240,7 @@ public class YgglController {
// 添加三张表 // 添加三张表
// 员工权限表(未定) // 员工权限表(未定)
// 员工企业关联表和员工档案,员工成长表(未定) // 员工企业关联表和员工档案,员工成长表(未定)
QyzxEmpEntAsso.builder().empNum(qyzxEmpLogin.getId()).orgCode(orgCode).userType(2).status(1).build().insert();// usertype2普通员工 status1正常 QyzxEmpEntAsso.builder().empNum(qyzxEmpLogin.getId()).orgCode(orgCode).userType(CommonEnum.U_TYPE_EMP.getType()).status(1).build().insert();// usertype2普通员工 status1正常
YgglMainEmp ygglMainEmp = YgglMainEmp.builder().name(name).phone(phone).zjType(zjType).zjNum(zjNum) YgglMainEmp ygglMainEmp = YgglMainEmp.builder().name(name).phone(phone).zjType(zjType).zjNum(zjNum)
.jobType(jobType).rzTime(rzTime).syq(syq).sex(sex).empNum(qyzxEmpLogin.getId()).orgCode(orgCode) .jobType(jobType).rzTime(rzTime).syq(syq).sex(sex).empNum(qyzxEmpLogin.getId()).orgCode(orgCode)
.build(); .build();
......
...@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import cn.timer.api.bean.qyzx.QyzxEmpEntAsso; import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
import cn.timer.api.bean.yggl.YgglMainEmp;
import cn.timer.api.dto.qyzx.AdminListDto; import cn.timer.api.dto.qyzx.AdminListDto;
/** /**
...@@ -24,5 +25,4 @@ public interface QyzxEmpEntAssoMapper extends BaseMapper<QyzxEmpEntAsso> { ...@@ -24,5 +25,4 @@ public interface QyzxEmpEntAssoMapper extends BaseMapper<QyzxEmpEntAsso> {
*/ */
List<AdminListDto> adminlist(IPage<AdminListDto> page,Integer org_code); List<AdminListDto> adminlist(IPage<AdminListDto> page,Integer org_code);
} }
package cn.timer.api.dao.qyzx;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 员工企业关联表
* @author Tang 2019-11-11
*/
@Repository
public interface QyzxFeebackAccessoryMapper extends BaseMapper<QyzxFeebackAccessoryMapper> {
}
package cn.timer.api.dao.qyzx;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 员工企业关联表
* @author Tang 2019-11-11
*/
@Repository
public interface QyzxSuggestionFeebackMapper extends BaseMapper<QyzxSuggestionFeebackMapper> {
}
/**
* @date 2019年11月14日
* @author 翁东州
* @方法中文名称:
*/
package cn.timer.api.dto.qyzx;
import java.io.Serializable;
import cn.timer.api.config.swagger.IgnoreSwaggerParameter;
import cn.timer.api.utils.Page;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @date 2019年11月14日
* @author 翁东州
* @方法中文名称:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EntauthDto extends Page implements Serializable{
private static final long serialVersionUID = 910573493694136770L;
@ApiModelProperty(value="组织机构代码",example="117")
private Integer orgCode;
@ApiModelProperty(value="认证状态",example="2未通过或3通过")
private Integer authType;
}
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