fix(jyjc): 报检规则4.0开发

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/CommonController.java

@@ -97,12 +97,12 @@ public class CommonController extends BaseController {
         if (CollectionUtils.isEmpty(userPhones)) {
             return null;
         }
-        List<String> phones = userPhones.stream().filter(e -> StringUtils.isNotEmpty(e.getInnerPersonCode())).map(TzsUserInfo::getInnerPersonCode).collect(Collectors.toList());
+        List<String> certNubs = userPhones.stream().map(TzsUserInfo::getCertificateNum).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
         Map<String, Object> map = new HashMap<>();
-        if (CollectionUtils.isEmpty(phones)) {
-            map.put("innerPersonCode", " ");
+        if (CollectionUtils.isEmpty(certNubs)) {
+            map.put("innerPersonCode", "");
         } else {
-            String innerPersonCode = String.join(",", phones);
+            String innerPersonCode = String.join(",", certNubs);
             map.put("innerPersonCode", innerPersonCode);
         }
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/CommonServiceImpl.java

@@ -171,8 +171,8 @@ public class CommonServiceImpl {
 
     public List<TzsUserInfo> getUserPhonesByPersonCode(String personCode) {
         List<String> ids = StrUtil.split(personCode, ",");
-        QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
-        userInfoQueryWrapper.in("sequence_nbr", ids);
+        LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper = new LambdaQueryWrapper<>();
+        userInfoQueryWrapper.in(BaseEntity::getSequenceNbr, ids);
         return userInfoMapper.selectList(userInfoQueryWrapper);
     }