Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/yxproject/start/api/queryPreproPerson.java

@@ -60,9 +60,9 @@ public class queryPreproPerson {
      */
     @RequestMapping("updatePreproPerson")
 //    @RequiresPermissions("userInfo.add")//权限管理;
-    public Map<String,Object> updatePreproPerson(@RequestParam("uploadNo") String uploadNo, @RequestParam("isValid")String isValid, HttpServletResponse response){
+    public Map<String,Object> updatePreproPerson(@RequestParam("id") String id, @RequestParam("isValid")String isValid, HttpServletResponse response){
         PreproPersonEntity preproPersonEntity = new PreproPersonEntity();
-        preproPersonEntity.setJmsfzslh(uploadNo);
+        preproPersonEntity.setId(Long.valueOf(id));
         preproPersonEntity.setIsValid(Long.valueOf(isValid));
         preproPersonService.updatePreproPersonIsValid(preproPersonEntity);
         Map<String,Object> map = new LinkedHashMap<>();

src/main/java/com/yxproject/start/mapper/PreproPersonMapper.java

@@ -135,7 +135,7 @@ public interface PreproPersonMapper {
      * @param personEntity
      * @return
      */
-    @Update("UPDATE PREPRO_PERSON  SET IS_VALID=#{isValid} where JMSFZSLH=#{jmsfzslh}")
+    @Update("UPDATE PREPRO_PERSON  SET IS_VALID=#{isValid} where id=#{id}")
     public boolean updatePreproPersonIsValid(PreproPersonEntity personEntity);
 
     /**

src/main/java/com/yxproject/start/utils/IDCardFactory.java

@@ -37,6 +37,7 @@ public class IDCardFactory {
             filesEntity.setVersionCode(BBH);
             filesEntity.setUploadDate(date);
             String DWMC = packagehead.element("DWMC").getTextTrim();
+
             filesEntity.setDwmc(DWMC);
             filesEntity.setCreateTime(packagehead.element("SCSJ").getTextTrim());
             List<Element> recordlist = records.elements("RECORD");