Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer
This commit is contained in:
commit
762b45407b
|
|
@ -11,7 +11,7 @@ public interface IEmployessAdvisioryInfoApi {
|
||||||
|
|
||||||
int updateById(EmployeesAdvisoryInfoEntity eployeesAdvisoryInfoEntity);
|
int updateById(EmployeesAdvisoryInfoEntity eployeesAdvisoryInfoEntity);
|
||||||
|
|
||||||
List<EmployeesAdvisoryInfoEntity> queryAuditInfo(String tel);
|
List<EmployeesAdvisoryInfoEntity> queryAuditInfo(String openId);
|
||||||
|
|
||||||
int updateByTel(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity);
|
int updateByTel(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -60,8 +60,8 @@ public class EmployeesAdvisoryInfoEntity implements Serializable {
|
||||||
/**民族*/
|
/**民族*/
|
||||||
private String national;
|
private String national;
|
||||||
/**出生日期*/
|
/**出生日期*/
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
@DateTimeFormat(pattern="yyyy.MM.dd")
|
||||||
private Date birthDate;
|
private Date birthDate;
|
||||||
/**住址(身份证上)*/
|
/**住址(身份证上)*/
|
||||||
private String idCardAddress;
|
private String idCardAddress;
|
||||||
|
|
@ -70,12 +70,12 @@ public class EmployeesAdvisoryInfoEntity implements Serializable {
|
||||||
/**签发机关*/
|
/**签发机关*/
|
||||||
private String issuingAuthority;
|
private String issuingAuthority;
|
||||||
/**有效开始日期*/
|
/**有效开始日期*/
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
@DateTimeFormat(pattern="yyyy.MM.dd")
|
||||||
private Date startTime;
|
private Date startTime;
|
||||||
/**有效结束日期*/
|
/**有效结束日期*/
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
@DateTimeFormat(pattern="yyyy.MM.dd")
|
||||||
private Date endTime;
|
private Date endTime;
|
||||||
/**身份证正面*/
|
/**身份证正面*/
|
||||||
private String cardZmPath;
|
private String cardZmPath;
|
||||||
|
|
|
||||||
|
|
@ -43,9 +43,9 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<EmployeesAdvisoryInfoEntity> queryAuditInfo(String tel) {
|
public List<EmployeesAdvisoryInfoEntity> queryAuditInfo(String openId) {
|
||||||
QueryWrapper<NuEmployeesAdvisoryInfo> qw = new QueryWrapper<>();
|
QueryWrapper<NuEmployeesAdvisoryInfo> qw = new QueryWrapper<>();
|
||||||
qw.eq("tel",tel);
|
qw.eq("open_id",openId);
|
||||||
// qw.in("status",new String[]{"1","3"});//审核状态为审核中、驳回的
|
// qw.in("status",new String[]{"1","3"});//审核状态为审核中、驳回的
|
||||||
qw.orderByDesc("create_time");
|
qw.orderByDesc("create_time");
|
||||||
List<NuEmployeesAdvisoryInfo> list = baseMapper.selectList(qw);
|
List<NuEmployeesAdvisoryInfo> list = baseMapper.selectList(qw);
|
||||||
|
|
|
||||||
|
|
@ -34,16 +34,16 @@ public class EmployessInfoApi {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据手机号获取工入驻申请信息
|
* 根据openId获取工入驻申请信息
|
||||||
*
|
*
|
||||||
* @param tel
|
* @param openId
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/queryApiEmployessInfo")
|
@GetMapping("/queryApiEmployessInfo")
|
||||||
public Result<List<EmployeesAdvisoryInfoEntity>> queryApiEmployessInfo(@RequestParam("tel") String tel){
|
public Result<List<EmployeesAdvisoryInfoEntity>> queryApiEmployessInfo(@RequestParam("openId") String openId){
|
||||||
if(StringUtils.isBlank(tel)){
|
if(StringUtils.isBlank(openId)){
|
||||||
return Result.error("手机号码错误");
|
return Result.error("手机号码错误");
|
||||||
}
|
}
|
||||||
return Result.ok(employessAdvisioryInfoApi.queryAuditInfo(tel));
|
return Result.ok(employessAdvisioryInfoApi.queryAuditInfo(openId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue