Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YcsbController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.Fkqk;
+import com.ruoyi.system.domain.Hscj;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -153,4 +154,14 @@ public class YcsbController extends BaseController
         List<Ycsb> list = util.importExcel(file.getInputStream());
         ycsbService.importList(list, response);
     }
+
+    /**
+     * 校验身份证号是否重复
+     */
+    @GetMapping("/checkCard")
+    public AjaxResult checkCard(Ycsb ycsb)
+    {
+        List<Ycsb> list = ycsbService.checkCard(ycsb);
+        return AjaxResult.success(list.isEmpty());
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/YcsbMapper.java

@@ -65,4 +65,5 @@ public interface YcsbMapper
      * @return
      */
     List<Ycsb> selectYcsbByCard(String cardNo);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IYcsbService.java

@@ -67,4 +67,6 @@ public interface IYcsbService
      * @param response
      */
     void importList(List<Ycsb> list, HttpServletResponse response);
+
+    List<Ycsb> checkCard(Ycsb ycsb);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YcsbServiceImpl.java

@@ -227,4 +227,10 @@ public class YcsbServiceImpl implements IYcsbService
         return dicList.stream().filter(i -> str.equals(i.getDictLabel()))
                 .map(SysDictData::getDictValue).collect(Collectors.toList());
     }
+
+    @Override
+    public List<Ycsb> checkCard(Ycsb ycsb) {
+        return ycsbMapper.selectYcsbByCard(ycsb.getCardNo());
+    }
+
 }