|
@@ -4292,13 +4292,17 @@ public class ApiController {
|
|
@PostMapping("/save-personal-business-card")
|
|
@PostMapping("/save-personal-business-card")
|
|
public R<?> savePersonalBusinessCard(@RequestBody @Validated UserBusinessCardDTO resource) {
|
|
public R<?> savePersonalBusinessCard(@RequestBody @Validated UserBusinessCardDTO resource) {
|
|
|
|
|
|
- SysUser queryUser = sysUserService.getById(resource.getUserId());
|
|
|
|
-
|
|
|
|
SysUser updateUser = new SysUser();
|
|
SysUser updateUser = new SysUser();
|
|
updateUser.setUserId(resource.getUserId());
|
|
updateUser.setUserId(resource.getUserId());
|
|
updateUser.setGender(resource.getGender());
|
|
updateUser.setGender(resource.getGender());
|
|
- if (StrUtil.isBlank(queryUser.getIdCardNumber())) {
|
|
|
|
- // 没有身份证号才可以录入, 否则不能修改
|
|
|
|
|
|
+
|
|
|
|
+ // 已签约/认证 或 已发起的不能修改姓名/身份证号
|
|
|
|
+ int toCertCount = sysUserSubService.count(Wrappers.<SysUserSub>lambdaQuery()
|
|
|
|
+ .eq(SysUserSub::getUserId, resource.getUserId())
|
|
|
|
+ .notIn(SysUserSub::getCertStatus, 0, 10));
|
|
|
|
+
|
|
|
|
+ if (toCertCount <= 0) {
|
|
|
|
+ updateUser.setRealname(resource.getRealname());
|
|
updateUser.setIdCardNumber(resource.getIdCardNumber());
|
|
updateUser.setIdCardNumber(resource.getIdCardNumber());
|
|
}
|
|
}
|
|
updateUser.setDegree(resource.getDegree());
|
|
updateUser.setDegree(resource.getDegree());
|
|
@@ -4355,9 +4359,9 @@ public class ApiController {
|
|
cardVO.setFinishTaskCount(finishTaskCount);
|
|
cardVO.setFinishTaskCount(finishTaskCount);
|
|
cardVO.setApprovedTaskCount(approvedTaskCount);
|
|
cardVO.setApprovedTaskCount(approvedTaskCount);
|
|
if (finishTaskCount > 0) {
|
|
if (finishTaskCount > 0) {
|
|
- cardVO.setApprovedTaskRate(String.format("%.0f%%", approvedTaskCount * 100.00 / finishTaskCount));
|
|
|
|
|
|
+ cardVO.setApprovedTaskRate(String.format("%.2f%%", approvedTaskCount * 100.00 / finishTaskCount));
|
|
} else {
|
|
} else {
|
|
- cardVO.setApprovedTaskRate("0%");
|
|
|
|
|
|
+ cardVO.setApprovedTaskRate("0.00%");
|
|
}
|
|
}
|
|
|
|
|
|
// 专业技能
|
|
// 专业技能
|