哨卡完善信息修改

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java

@@ -88,6 +88,7 @@ public class ApiCustomController {
      */
     @PostMapping("sentryPost/completeInfo")
     public Result completeInfo(@RequestBody EpdcAppPidemicCompleteInfoFromDTO completeInfoFromDto, @LoginUser TokenDto userDetail) {
+        ValidatorUtils.validateEntity(completeInfoFromDto);
         return customService.createPidemicInfo(completeInfoFromDto, userDetail);
     }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -34,9 +34,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
-import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.MessageUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.config.StreamUtils;
 import com.elink.esua.epdc.constant.AuthenticatedConsant;
 import com.elink.esua.epdc.constant.UserFieldConsant;
@@ -74,6 +72,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.constraints.NotBlank;
 import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -911,10 +910,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             return new Result().error("查询用户信息失败");
         }
 
+        String identityNo = completeInfoFromDto.getIdcard();
+
         UserEntity updateUser = new UserEntity();
         updateUser.setId(userId);
         updateUser.setRealName(completeInfoFromDto.getName());
-        updateUser.setIdentityNo(completeInfoFromDto.getIdcard());
+        updateUser.setIdentityNo(identityNo);
+        updateUser.setSex(IdentityNoUtils.getSex(identityNo));
+        updateUser.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN));
         updateUser.setMobile(completeInfoFromDto.getPhone());
         updateUser.setAddress(completeInfoFromDto.getHabitationDetail());
         updateUser.setRentFlag(completeInfoFromDto.getIsRent());
@@ -927,6 +930,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 return new Result().error("查询机构信息失败");
             }
             ParentAndAllDeptDTO deptInfo = parentAndAllDeptDTOResult.getData();
+            updateUser.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value());
+            String lastName = updateUser.getRealName().substring(NumConstant.ZERO, NumConstant.ONE);
+            updateUser.setLastName(lastName);
+            updateUser.setNickname(deptInfo.getGrid().concat("-").concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(updateUser.getSex()) ? "女士" : "先生"));
             updateUser.setDeptId(gridId);
             updateUser.setAllDeptIds(deptInfo.getAllDeptIds());
             updateUser.setAllDeptNames(deptInfo.getAllDeptNames());
@@ -957,6 +964,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         return new Result();
     }
+
     @Autowired
     private PartyMembersService partyMembersService;
 
@@ -969,7 +977,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result insertUserList(MultipartFile file,Map<String, Object> params) {
+    public Result insertUserList(MultipartFile file, Map<String, Object> params) {
         Long gridId = Long.parseLong((String) params.get("gridId"));
         String time = (String) params.get("time");
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -988,8 +996,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (!parentAndAllDeptDTOResult.success()) {
             return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
         }
-        int i=0;
-        for(UserEntity userItem: userEntities){
+        int i = 0;
+        for (UserEntity userItem : userEntities) {
             userItem.setNickname(userItem.getRealName());
             userItem.setRegisterTime(date);
             userItem.setLastLoginTime(date);
@@ -999,7 +1007,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userItem.setIdentityNo(userItem.getIdentityNo().trim());
             userItem.setRealName(userItem.getRealName().trim());
             userItem.setMobile(userItem.getMobile().trim());
-            userItem.setWxOpenId("taidong_"+time+""+(i++));
+            userItem.setWxOpenId("taidong_" + time + "" + (i++));
             userItem.setDeptId(gridId);
             userItem.setPartyFlag("1");
             userItem.setState("3");