常住字段调整等

dangan-dangan/src/main/java/com/da/dangan/controller/DaBirthDjController.java

@@ -1,25 +1,21 @@
 package com.da.dangan.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.da.common.annotation.Log;
 import com.da.common.core.controller.BaseController;
 import com.da.common.core.domain.AjaxResult;
+import com.da.common.core.page.TableDataInfo;
 import com.da.common.enums.BusinessType;
+import com.da.common.utils.poi.ExcelUtil;
 import com.da.dangan.domain.DaBirthDj;
+import com.da.dangan.domain.DaPicturesRecard;
 import com.da.dangan.service.IDaBirthDjService;
-import com.da.common.utils.poi.ExcelUtil;
+import com.da.dangan.service.IDaPicturesRecardService;
-import com.da.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 出生登记Controller
@@ -33,7 +29,8 @@ public class DaBirthDjController extends BaseController
 {
     @Autowired
     private IDaBirthDjService daBirthDjService;
-
+    @Autowired
+    private IDaPicturesRecardService daPicturesRecardService;
     /**
      * 查询出生登记列表
      */
@@ -69,6 +66,16 @@ public class DaBirthDjController extends BaseController
         return success(daBirthDjService.selectDaBirthDjById(id));
     }
 
+    /**
+     * 新增出生登记
+     */
+    /*@PreAuthorize("@ss.hasPermi('dangan:birthDJ:add')")
+    @Log(title = "出生登记", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DaBirthDj daBirthDj)
+    {
+        return toAjax(daBirthDjService.insertDaBirthDj(daBirthDj));
+    }*/
     /**
      * 新增出生登记
      */
@@ -77,6 +84,15 @@ public class DaBirthDjController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody DaBirthDj daBirthDj)
     {
+        String[] picIds = daBirthDj.getPicIds().split(",");
+        if(picIds!=null&&picIds.length>0){
+            for(String picid:picIds){
+                DaPicturesRecard picRecard = new DaPicturesRecard();
+                picRecard.setId(Long.parseLong(picid));
+                picRecard.setRecognize("1");
+                daPicturesRecardService.updateDaPicturesRecard(picRecard);
+            }
+        }
         return toAjax(daBirthDjService.insertDaBirthDj(daBirthDj));
     }
 

dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java

@@ -7,7 +7,9 @@ import com.da.common.core.page.TableDataInfo;
 import com.da.common.enums.BusinessType;
 import com.da.common.utils.poi.ExcelUtil;
 import com.da.dangan.domain.DaCzrkdj;
+import com.da.dangan.domain.DaPicturesRecard;
 import com.da.dangan.service.IDaCzrkdjService;
+import com.da.dangan.service.IDaPicturesRecardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +29,8 @@ public class DaCzrkdjController extends BaseController
 {
     @Autowired
     private IDaCzrkdjService daCzrkdjService;
-
+    @Autowired
+    private IDaPicturesRecardService daPicturesRecardService;
     /**
      * 查询常住人口登记列表
      */
@@ -63,6 +66,17 @@ public class DaCzrkdjController extends BaseController
         return success(daCzrkdjService.selectDaCzrkdjById(id));
     }
 
+/*    *//**
+     * 新增常住人口登记
+     *//*
+    @PreAuthorize("@ss.hasPermi('dangan:czrkdj:add')")
+    @Log(title = "常住人口登记", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DaCzrkdj daCzrkdj)
+    {
+        return toAjax(daCzrkdjService.insertDaCzrkdj(daCzrkdj));
+    }*/
+
     /**
      * 新增常住人口登记
      */
@@ -71,6 +85,15 @@ public class DaCzrkdjController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody DaCzrkdj daCzrkdj)
     {
+        String[] picIds = daCzrkdj.getPicIds().split(",");
+        if(picIds!=null&&picIds.length>0){
+            for(String picid:picIds){
+                DaPicturesRecard picRecard = new DaPicturesRecard();
+                picRecard.setId(Long.parseLong(picid));
+                picRecard.setRecognize("1");
+                daPicturesRecardService.updateDaPicturesRecard(picRecard);
+            }
+        }
         return toAjax(daCzrkdjService.insertDaCzrkdj(daCzrkdj));
     }
 

dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java

@@ -85,6 +85,17 @@ public class DaPicturesRecardController extends BaseController
         return toAjax(daPicturesRecardService.updateDaPicturesRecard(daPicturesRecard));
     }
 
+    /**
+     * 删除档案图片信息记录
+     */
+    @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:remove')")
+    @Log(title = "档案图片信息记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id)
+    {
+        return daPicturesRecardService.deleteDaPicturesRecardById(id);
+    }
+
     /**
      * 删除档案图片信息记录
      */
@@ -93,6 +104,6 @@ public class DaPicturesRecardController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(daPicturesRecardService.deleteDaPicturesRecardByIds(ids));
+        return daPicturesRecardService.deleteDaPicturesRecardByIds(ids);
     }
 }

dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java

@@ -1,5 +1,6 @@
 package com.da.dangan.controller;
 
+import cn.hutool.json.JSONObject;
 import com.da.common.config.RuoYiConfig;
 import com.da.common.core.controller.BaseController;
 import com.da.common.core.domain.AjaxResult;
@@ -7,6 +8,7 @@ import com.da.common.utils.file.FileUploadUtils;
 import com.da.common.utils.file.FileUtils;
 import com.da.dangan.domain.DaPicturesRecard;
 import com.da.dangan.domain.vo.PicParams;
+import com.da.dangan.service.IDaBirthDjService;
 import com.da.dangan.service.IDaCzrkdjService;
 import com.da.dangan.service.IDaPicturesRecardService;
 import com.da.dangan.util.CallThirdInterface;
@@ -44,6 +46,8 @@ public class DangAnCollectController extends BaseController {
     private IDaPicturesRecardService daPicturesRecardService;
     @Autowired
     private IDaCzrkdjService daCzrkdjService;
+    @Autowired
+    private IDaBirthDjService daBirthDjService;
 
     private static final String FILE_DELIMETER = ",";
     @Value("${ocr.url}")
@@ -135,42 +139,67 @@ public class DangAnCollectController extends BaseController {
             });
             long end =System.currentTimeMillis();
             logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms");*/
-
             //不使用循环调用接口   直接传递数组
-           // String result = CallThirdInterface.callThirdInterface(url, files, ywType,singeOrDouble,ids);
+            String result = CallThirdInterface.callThirdInterface(url, files, ywType,ids);
-            String result = CallThirdInterface.callThirdInterface(url, files, ywType);
-            System.out.println(result);
             long end =System.currentTimeMillis();
             logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms");
+            //如果result中的code=0代表结果错误
+            // 解析JSON字符串
+            //! 获取键对应的值
+            JSONObject jsonobject = new JSONObject(result);
+            String code = jsonobject.getStr("code");
+            String msg = jsonobject.getStr("msg");
+            int success = jsonobject.getInt("success");
+            int total = jsonobject.getInt("total");
+            Long[] failPicids = (Long[])jsonobject.getJSONArray("failPicid").toArray();
+            String datas = jsonobject.getStr("datas");
 
             // TODO   数据解析    根据业务类型存储识别后的信息
-
+            /*<option value="option1">常住人口登记表1</option>            <option value="option2">常住卡</option>
+            <option value="option3">常住人口登记表2</option>
+            <option value="option4">出生医学证明</option>
+            <option value="option5">迁移证</option>
+            <option value="option6">一胎证明</option>
+            <option value="option7">转非农业人口批复存根</option>
+            <option value="option8">准迁证</option>
+            <option value="option9">常住人口登记表3</option>*/
+            Long dajlId=null;
             switch(ywType){
-                case "0" :
+                case "option1" :
 
                     break;
-                case "1" :
+                case "option2" :
 
                     break;
-                case "2" :
+                case "option3" :
-                    //daCzrkdjService.insertDaCzrkdj();
+                    /*DaCzrkdj daCzrkdj = new DaCzrkdj();
-                    //picRecards.stream().filter(p -> p.getId()==1L || p.getId()==2L).collect(Collectors.toList());
+                    daCzrkdj.setAllPicIds(picIds);
+                    daCzrkdj.setAllPics();
+                    daCzrkdj.setPicIds();
+                    daCzrkdj.setPictures();
+                    daCzrkdjService.insertDaCzrkdj();
+                    //将插入后的id反写回来
+                    dajlid=daCzrkdj.getId();*/
                     break;
-                case "3" :
+                case "option4" :
 
                     break;
-                case "4" :
+                case "option5" :
 
                     break;
-                case "5" :
+                case "option6" :
 
                     break;
-                case "6" :
+                case "option7" :
 
                     break;
-            }
+                case "option8" :
 
+                    break;
+                case "option9" :
 
+                    break;
+            }
 
             //识别成功的图片 ，修改图片信息记录表为已识别   可以用多线程
             for (DaPicturesRecard picRecard : picRecards) {
@@ -220,21 +249,29 @@ public class DangAnCollectController extends BaseController {
                 long start =System.currentTimeMillis();
                 //参数:地址、文件、业务类型、单双面： 1单面   2双面
                 //String result = CallThirdInterface.callThirdInterface(url, files, ywType,singleOrDouble,ids);
-                String result = CallThirdInterface.callThirdInterface(url, files, ywType);
+                String result = CallThirdInterface.callThirdInterface(url, files, ywType,ids);
-                System.out.println(result);
                 long end =System.currentTimeMillis();
                 logger.info("CompletableFuture耗时--——————————————————》"+ (end-start)+"ms");
 
                 // TODO 根据业务类型存储识别后的信息
+            /*<option value="option1">常住人口登记表1</option>
+            <option value="option2">常住卡</option>
+            <option value="option3">常住人口登记表2</option>
+            <option value="option4">出生医学证明</option>
+            <option value="option5">迁移证</option>
+            <option value="option6">一胎证明</option>
+            <option value="option7">转非农业人口批复存根</option>
+            <option value="option8">准迁证</option>
+            <option value="option9">常住人口登记表3</option>*/
                 Long dajlId=null;
                 switch(ywType){
-                    case "0" :
+                    case "option1" :
 
                         break;
-                    case "1" :
+                    case "option2" :
 
                         break;
-                    case "2" :
+                    case "option3" :
                     /*DaCzrkdj daCzrkdj = new DaCzrkdj();
                     daCzrkdj.setAllPicIds(picIds);
                     daCzrkdj.setAllPics();
@@ -244,16 +281,22 @@ public class DangAnCollectController extends BaseController {
                     //将插入后的id反写回来
                     dajlid=daCzrkdj.getId();*/
                         break;
-                    case "3" :
+                    case "option4" :
+
+                        break;
+                    case "option5" :
+
+                        break;
+                    case "option6" :
 
                         break;
-                    case "4" :
+                    case "option7" :
 
                         break;
-                    case "5" :
+                    case "option8" :
 
                         break;
-                    case "6" :
+                    case "option9" :
 
                         break;
                 }
@@ -284,10 +327,68 @@ public class DangAnCollectController extends BaseController {
         return AjaxResult.success();
     }
 
+    /**
+     * test参数
+     */
+    @PostMapping("/test3")
+    public String test(@RequestParam ("files")MultipartFile[] files,@RequestParam ("datas")Long[] datas){
+        return datas.toString();
+    }
+
+    /**
+     * 手动识别
+     */
+    /*@PostMapping("/sdrecongnize")
+    public AjaxResult sdrecognize(@RequestBody DaPicturesRecard picRecard) {
+        try {
+            //取所有id的集合
+            String ywType = picRecard.getYwType();
+            String singleOrDouble = picRecard.getSingelOrDouble();
+            // TODO   数据解析    根据业务类型存储识别后的信息
+
+            switch(ywType){
+                case "0" :
+
+                    break;
+                case "1" :
+
+                    break;
+                case "2" :
+                    DaCzrkdj czrkdj = picRecard.getCzrkdj();
+                    daCzrkdjService.insertDaCzrkdj(czrkdj);
+                    //picRecards.stream().filter(p -> p.getId()==1L || p.getId()==2L).collect(Collectors.toList());
+                    break;
+                case "3" :
+
+                    break;
+                case "4" :
+
+                    break;
+                case "5" :
+
+                    break;
+                case "6" :
+
+                    break;
+                case "7" :
+                    DaBirthDj csdj = picRecard.getCsdj();
+                    daBirthDjService.insertDaBirthDj(csdj);
+                    break;
+            }
+            //识别成功图片 ，修改图片信息记录表为已识别
+                picRecard.setRecognize("1");
+                daPicturesRecardService.updateDaPicturesRecard(picRecard);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error(e.getMessage());
+        }
+        return AjaxResult.success();
+    }*/
     /**
      * 线程池调用第三方接口
      */
-    public String testAsync(File file,String ywType){
+    /*public String testAsync(File file,String ywType){
         String result = null;
         try {
             Thread.sleep(10);
@@ -304,7 +405,7 @@ public class DangAnCollectController extends BaseController {
             e.printStackTrace();
         }
         return result;
-    }
+    }*/
 
 
     /**
@@ -331,7 +432,7 @@ public class DangAnCollectController extends BaseController {
             multipartFile.transferTo(file);
             fileList.add(file);
         }
-        String result = CallThirdInterface.callThirdInterface(url, fileList, fileType);
+        String result = CallThirdInterface.callThirdInterface(url, fileList, fileType,new ArrayList<>());
         return result;
     }
 

dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java

@@ -12,272 +12,695 @@ import java.util.Date;
  * 常住人口登记对象 da_czrkdj
  *
  * @author hs
- * @date 2024-06-03
+ * @date 2024-06-14
  */
-public class DaCzrkdj extends BaseEntity
+public class DaCzrkdj extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    /**
+     * id
+     */
     private Long id;
 
-    /** 业务类型(字典) */
+    /**
+     * 业务类型(字典)
+     */
     @Excel(name = "业务类型(字典)")
     private String ywType;
 
-    /** 目录id */
+    /**
+     * 目录id
+     */
     @Excel(name = "目录id")
     private Long muId;
 
-    /** 姓名 */
+    /**
-    @Excel(name = "姓名")
+     * 与户主关系
-    private String name;
+     */
-
-    /** 户主姓名 */
-    @Excel(name = "户主姓名")
-    private String hzName;
-
-    /** 与户主关系 */
     @Excel(name = "与户主关系")
     private String relation;
 
-    /** 出生日期 */
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名")
+    private String name;
+
+    /**
+     * 别名
+     */
+    @Excel(name = "别名")
+    private String otherName;
+
+    /**
+     * 性别
+     */
+    @Excel(name = "性别")
+    private String sex;
+
+    /**
+     * 出生日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date birthday;
 
-    /** 地址 */
+    /**
-    @Excel(name = "地址")
+     * 出生地址
+     */
+    @Excel(name = "出生地址")
     private String address;
 
-    /** 籍贯 */
+    /**
+     * 原籍
+     */
+    @Excel(name = "原籍")
+    private String yj;
+
+    /**
+     * 民族
+     */
+    @Excel(name = "民族")
+    private String nation;
+
+    /**
+     * 宗教信仰
+     */
+    @Excel(name = "宗教信仰")
+    private String zjxy;
+
+    /**
+     * 文化程度
+     */
+    @Excel(name = "文化程度")
+    private String whcd;
+
+    /**
+     * 婚姻状况
+     */
+    @Excel(name = "婚姻状况")
+    private String hyzk;
+
+    /**
+     * 职业及服务处所
+     */
+    @Excel(name = "职业及服务处所")
+    private String zyjfwcs;
+
+    /**
+     * 本县(市)其他住址
+     */
+    @Excel(name = "本县(市)其他住址")
+    private String bxsqtzz;
+
+    /**
+     * 公民证代号号码签发
+     * 公民证代号号码签发机关及日期
+     */
+    @Excel(name = "公民证代号号码签发机关及日期")
+    private String gmzdhhmqfjgjrq;
+
+    /**
+     * 何时由何地迁来本县市何时登记户口
+     */
+    @Excel(name = "何时由何地迁来本县市何时登记户口")
+    private String hsyhdqlbxshsdjhk;
+
+    /**
+     * 何时由本县、市何处迁来何时登记户口
+     */
+    @Excel(name = "何时由本县、市何处迁来何时登记户口")
+    private String hsybxshcqlhsdjhk;
+
+    /**
+     * 注销户口日期
+     */
+    @Excel(name = "注销户口日期")
+    private String zxhkrq;
+
+    /**
+     * 注销户口原因
+     */
+    @Excel(name = "注销户口原因")
+    private String zxhkyy;
+
+    /**
+     * 户口登记事项变更记载内容、时间及办理人章_1
+     */
+    @Excel(name = "户口登记事项变更记载内容、时间及办理人章_1")
+    private String hkdjsxbgjznrsjjblrz1;
+
+    /**
+     * 户口登记事项变更记载内容、时间及办理人章_2
+     */
+    @Excel(name = "户口登记事项变更记载内容、时间及办理人章_2")
+    private String hkdjsxbgjznrsjjblrz2;
+
+    /**
+     * 籍贯
+     */
     @Excel(name = "籍贯")
     private String jiguan;
 
-    /** 身份证号 */
+    /**
+     * 现住址
+     */
+    @Excel(name = "现住址")
+    private String xzz;
+
+    /**
+     * 户主姓名
+     */
+    @Excel(name = "户主姓名")
+    private String hzName;
+
+    /**
+     * 户别
+     */
+    @Excel(name = "户别")
+    private String hb;
+
+    /**
+     * 登记日期
+     */
+    @Excel(name = "登记日期")
+    private String djrq;
+
+    /**
+     * 兵役状况
+     */
+    @Excel(name = "兵役状况")
+    private String byzk;
+
+    /**
+     * 身高
+     */
+    @Excel(name = "身高")
+    private String height;
+
+    /**
+     * 血型
+     */
+    @Excel(name = "血型")
+    private String blood;
+
+    /**
+     * 职业
+     */
+    @Excel(name = "职业")
+    private String zy;
+
+    /**
+     * 申领居民身份证原因
+     */
+    @Excel(name = "申领居民身份证原因")
+    private String slReason;
+
+    /**
+     * 申领居民身份证签名
+     */
+    @Excel(name = "申领居民身份证签名")
+    private String sljmsfzqm;
+
+    /**
+     * 签发意见
+     */
+    @Excel(name = "签发意见")
+    private String qfyj;
+
+    /**
+     * 有效日期
+     */
+    @Excel(name = "有效日期")
+    private String yxrq;
+
+    /**
+     * 身份证号
+     */
     @Excel(name = "身份证号")
     private String cardId;
 
-    /** 识别图片id */
+    /**
+     * 识别图片id
+     */
     @Excel(name = "识别图片id")
     private String picIds;
 
-    /** 识别图片 */
+    /**
+     * 识别图片
+     */
     @Excel(name = "识别图片")
     private String pictures;
 
-    /** 相关图片id */
+    /**
+     * 相关图片id
+     */
     @Excel(name = "相关图片id")
     private String allPicIds;
 
-    /** 相关图片 */
+    /**
+     * 相关图片
+     */
     @Excel(name = "相关图片")
     private String allPics;
 
-    /** 是否纠错(字典0否1是) */
+    /**
+     * 是否纠错(字典0否1是)
+     */
     @Excel(name = "是否纠错(字典0否1是)")
     private String errorCorrect;
 
-    /** 审核状态(字典) */
+    /**
+     * 审核状态(字典)
+     */
     @Excel(name = "审核状态(字典)")
     private String auditStatus;
 
-    /** 审核人 */
+    /**
+     * 审核人
+     */
     @Excel(name = "审核人")
     private String auditName;
 
-    /** 审核结果 */
+    /**
+     * 审核结果
+     */
     @Excel(name = "审核结果")
     private String auditResult;
 
-    /** 审核原由 */
+    /**
+     * 审核原由
+     */
     @Excel(name = "审核原由")
     private String auditReason;
 
-    public void setId(Long id)
+    public void setId(Long id) {
-    {
         this.id = id;
     }
 
-    public Long getId()
+    public Long getId() {
-    {
         return id;
     }
-    public void setYwType(String ywType)
+
-    {
+    public void setYwType(String ywType) {
         this.ywType = ywType;
     }
 
-    public String getYwType()
+    public String getYwType() {
-    {
         return ywType;
     }
-    public void setMuId(Long muId)
+
-    {
+    public void setMuId(Long muId) {
         this.muId = muId;
     }
 
-    public Long getMuId()
+    public Long getMuId() {
-    {
         return muId;
     }
-    public void setName(String name)
+
-    {
+    public void setRelation(String relation) {
+        this.relation = relation;
+    }
+
+    public String getRelation() {
+        return relation;
+    }
+
+    public void setName(String name) {
         this.name = name;
     }
 
-    public String getName()
+    public String getName() {
-    {
         return name;
     }
-    public void setHzName(String hzName)
+
-    {
+    public void setOtherName(String otherName) {
-        this.hzName = hzName;
+        this.otherName = otherName;
     }
 
-    public String getHzName()
+    public String getOtherName() {
-    {
+        return otherName;
-        return hzName;
     }
-    public void setRelation(String relation)
+
-    {
+    public void setSex(String sex) {
-        this.relation = relation;
+        this.sex = sex;
     }
 
-    public String getRelation()
+    public String getSex() {
-    {
+        return sex;
-        return relation;
     }
-    public void setBirthday(Date birthday)
+
-    {
+    public void setBirthday(Date birthday) {
         this.birthday = birthday;
     }
 
-    public Date getBirthday()
+    public Date getBirthday() {
-    {
         return birthday;
     }
-    public void setAddress(String address)
+
-    {
+    public void setAddress(String address) {
         this.address = address;
     }
 
-    public String getAddress()
+    public String getAddress() {
-    {
         return address;
     }
-    public void setJiguan(String jiguan)
+
-    {
+    public void setYj(String yj) {
+        this.yj = yj;
+    }
+
+    public String getYj() {
+        return yj;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setZjxy(String zjxy) {
+        this.zjxy = zjxy;
+    }
+
+    public String getZjxy() {
+        return zjxy;
+    }
+
+    public void setWhcd(String whcd) {
+        this.whcd = whcd;
+    }
+
+    public String getWhcd() {
+        return whcd;
+    }
+
+    public void setHyzk(String hyzk) {
+        this.hyzk = hyzk;
+    }
+
+    public String getHyzk() {
+        return hyzk;
+    }
+
+    public void setZyjfwcs(String zyjfwcs) {
+        this.zyjfwcs = zyjfwcs;
+    }
+
+    public String getZyjfwcs() {
+        return zyjfwcs;
+    }
+
+    public void setBxsqtzz(String bxsqtzz) {
+        this.bxsqtzz = bxsqtzz;
+    }
+
+    public String getBxsqtzz() {
+        return bxsqtzz;
+    }
+
+    public void setGmzdhhmqfjgjrq(String gmzdhhmqfjgjrq) {
+        this.gmzdhhmqfjgjrq = gmzdhhmqfjgjrq;
+    }
+
+    public String getGmzdhhmqfjgjrq() {
+        return gmzdhhmqfjgjrq;
+    }
+
+    public void setHsyhdqlbxshsdjhk(String hsyhdqlbxshsdjhk) {
+        this.hsyhdqlbxshsdjhk = hsyhdqlbxshsdjhk;
+    }
+
+    public String getHsyhdqlbxshsdjhk() {
+        return hsyhdqlbxshsdjhk;
+    }
+
+    public void setHsybxshcqlhsdjhk(String hsybxshcqlhsdjhk) {
+        this.hsybxshcqlhsdjhk = hsybxshcqlhsdjhk;
+    }
+
+    public String getHsybxshcqlhsdjhk() {
+        return hsybxshcqlhsdjhk;
+    }
+
+    public void setZxhkrq(String zxhkrq) {
+        this.zxhkrq = zxhkrq;
+    }
+
+    public String getZxhkrq() {
+        return zxhkrq;
+    }
+
+    public void setZxhkyy(String zxhkyy) {
+        this.zxhkyy = zxhkyy;
+    }
+
+    public String getZxhkyy() {
+        return zxhkyy;
+    }
+
+    public void setHkdjsxbgjznrsjjblrz1(String hkdjsxbgjznrsjjblrz1) {
+        this.hkdjsxbgjznrsjjblrz1 = hkdjsxbgjznrsjjblrz1;
+    }
+
+    public String getHkdjsxbgjznrsjjblrz1() {
+        return hkdjsxbgjznrsjjblrz1;
+    }
+
+    public void setHkdjsxbgjznrsjjblrz2(String hkdjsxbgjznrsjjblrz2) {
+        this.hkdjsxbgjznrsjjblrz2 = hkdjsxbgjznrsjjblrz2;
+    }
+
+    public String getHkdjsxbgjznrsjjblrz2() {
+        return hkdjsxbgjznrsjjblrz2;
+    }
+
+    public void setJiguan(String jiguan) {
         this.jiguan = jiguan;
     }
 
-    public String getJiguan()
+    public String getJiguan() {
-    {
         return jiguan;
     }
-    public void setCardId(String cardId)
+
-    {
+    public void setXzz(String xzz) {
+        this.xzz = xzz;
+    }
+
+    public String getXzz() {
+        return xzz;
+    }
+
+    public void setHzName(String hzName) {
+        this.hzName = hzName;
+    }
+
+    public String getHzName() {
+        return hzName;
+    }
+
+    public void setHb(String hb) {
+        this.hb = hb;
+    }
+
+    public String getHb() {
+        return hb;
+    }
+
+    public void setDjrq(String djrq) {
+        this.djrq = djrq;
+    }
+
+    public String getDjrq() {
+        return djrq;
+    }
+
+    public void setByzk(String byzk) {
+        this.byzk = byzk;
+    }
+
+    public String getByzk() {
+        return byzk;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setBlood(String blood) {
+        this.blood = blood;
+    }
+
+    public String getBlood() {
+        return blood;
+    }
+
+    public void setZy(String zy) {
+        this.zy = zy;
+    }
+
+    public String getZy() {
+        return zy;
+    }
+
+    public void setSlReason(String slReason) {
+        this.slReason = slReason;
+    }
+
+    public String getSlReason() {
+        return slReason;
+    }
+
+    public void setSljmsfzqm(String sljmsfzqm) {
+        this.sljmsfzqm = sljmsfzqm;
+    }
+
+    public String getSljmsfzqm() {
+        return sljmsfzqm;
+    }
+
+    public void setQfyj(String qfyj) {
+        this.qfyj = qfyj;
+    }
+
+    public String getQfyj() {
+        return qfyj;
+    }
+
+    public void setYxrq(String yxrq) {
+        this.yxrq = yxrq;
+    }
+
+    public String getYxrq() {
+        return yxrq;
+    }
+
+    public void setCardId(String cardId) {
         this.cardId = cardId;
     }
 
-    public String getCardId()
+    public String getCardId() {
-    {
         return cardId;
     }
-    public void setPicIds(String picIds)
+
-    {
+    public void setPicIds(String picIds) {
         this.picIds = picIds;
     }
 
-    public String getPicIds()
+    public String getPicIds() {
-    {
         return picIds;
     }
-    public void setPictures(String pictures)
+
-    {
+    public void setPictures(String pictures) {
         this.pictures = pictures;
     }
 
-    public String getPictures()
+    public String getPictures() {
-    {
         return pictures;
     }
-    public void setAllPicIds(String allPicIds)
+
-    {
+    public void setAllPicIds(String allPicIds) {
         this.allPicIds = allPicIds;
     }
 
-    public String getAllPicIds()
+    public String getAllPicIds() {
-    {
         return allPicIds;
     }
-    public void setAllPics(String allPics)
+
-    {
+    public void setAllPics(String allPics) {
         this.allPics = allPics;
     }
 
-    public String getAllPics()
+    public String getAllPics() {
-    {
         return allPics;
     }
-    public void setErrorCorrect(String errorCorrect)
+
-    {
+    public void setErrorCorrect(String errorCorrect) {
         this.errorCorrect = errorCorrect;
     }
 
-    public String getErrorCorrect()
+    public String getErrorCorrect() {
-    {
         return errorCorrect;
     }
-    public void setAuditStatus(String auditStatus)
+
-    {
+    public void setAuditStatus(String auditStatus) {
         this.auditStatus = auditStatus;
     }
 
-    public String getAuditStatus()
+    public String getAuditStatus() {
-    {
         return auditStatus;
     }
-    public void setAuditName(String auditName)
+
-    {
+    public void setAuditName(String auditName) {
         this.auditName = auditName;
     }
 
-    public String getAuditName()
+    public String getAuditName() {
-    {
         return auditName;
     }
-    public void setAuditResult(String auditResult)
+
-    {
+    public void setAuditResult(String auditResult) {
         this.auditResult = auditResult;
     }
 
-    public String getAuditResult()
+    public String getAuditResult() {
-    {
         return auditResult;
     }
-    public void setAuditReason(String auditReason)
+
-    {
+    public void setAuditReason(String auditReason) {
         this.auditReason = auditReason;
     }
 
-    public String getAuditReason()
+    public String getAuditReason() {
-    {
         return auditReason;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
-                .append("name", getName())
-                .append("hzName", getHzName())
                 .append("relation", getRelation())
+                .append("name", getName())
+                .append("otherName", getOtherName())
+                .append("sex", getSex())
                 .append("birthday", getBirthday())
                 .append("address", getAddress())
+                .append("yj", getYj())
+                .append("nation", getNation())
+                .append("zjxy", getZjxy())
+                .append("whcd", getWhcd())
+                .append("hyzk", getHyzk())
+                .append("zyjfwcs", getZyjfwcs())
+                .append("bxsqtzz", getBxsqtzz())
+                .append("gmzdhhmqfjgjrq", getGmzdhhmqfjgjrq())
+                .append("hsyhdqlbxshsdjhk", getHsyhdqlbxshsdjhk())
+                .append("hsybxshcqlhsdjhk", getHsybxshcqlhsdjhk())
+                .append("zxhkrq", getZxhkrq())
+                .append("zxhkyy", getZxhkyy())
+                .append("hkdjsxbgjznrsjjblrz1", getHkdjsxbgjznrsjjblrz1())
+                .append("hkdjsxbgjznrsjjblrz2", getHkdjsxbgjznrsjjblrz2())
                 .append("jiguan", getJiguan())
+                .append("xzz", getXzz())
+                .append("hzName", getHzName())
+                .append("hb", getHb())
+                .append("djrq", getDjrq())
+                .append("byzk", getByzk())
+                .append("height", getHeight())
+                .append("blood", getBlood())
+                .append("zy", getZy())
+                .append("slReason", getSlReason())
+                .append("sljmsfzqm", getSljmsfzqm())
+                .append("qfyj", getQfyj())
+                .append("yxrq", getYxrq())
                 .append("cardId", getCardId())
                 .append("picIds", getPicIds())
                 .append("pictures", getPictures())

dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java

@@ -57,6 +57,26 @@ public class DaPicturesRecard extends BaseEntity
     /**传递参数使用 单双面   0单面  1双面 */
     private String singelOrDouble;
 
+    private DaCzrkdj czrkdj;
+
+    private DaBirthDj csdj;
+
+    public DaCzrkdj getCzrkdj() {
+        return czrkdj;
+    }
+
+    public void setCzrkdj(DaCzrkdj czrkdj) {
+        this.czrkdj = czrkdj;
+    }
+
+    public DaBirthDj getCsdj() {
+        return csdj;
+    }
+
+    public void setCsdj(DaBirthDj csdj) {
+        this.csdj = csdj;
+    }
+
     public void setId(Long id)
     {
         this.id = id;
@@ -170,6 +190,8 @@ public class DaPicturesRecard extends BaseEntity
                 .append("daJlId", getDaJlId())
                 .append("recognize", getRecognize())
                 .append("singeOrDouble", getSingelOrDouble())
+                .append("czrkdj", getCzrkdj())
+                .append("csdj", getCsdj())
                 .append("remark", getRemark())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

dangan-dangan/src/main/java/com/da/dangan/service/IDaPicturesRecardService.java

@@ -1,5 +1,6 @@
 package com.da.dangan.service;
 
+import com.da.common.core.domain.AjaxResult;
 import com.da.dangan.domain.DaPicturesRecard;
 
 import java.util.List;
@@ -50,7 +51,7 @@ public interface IDaPicturesRecardService
      * @param ids 需要删除的档案图片信息记录主键集合
      * @return 结果
      */
-    public int deleteDaPicturesRecardByIds(Long[] ids);
+    public AjaxResult deleteDaPicturesRecardByIds(Long[] ids);
 
     /**
      * 删除档案图片信息记录信息
@@ -58,5 +59,5 @@ public interface IDaPicturesRecardService
      * @param id 档案图片信息记录主键
      * @return 结果
      */
-    public int deleteDaPicturesRecardById(Long id);
+    public AjaxResult deleteDaPicturesRecardById(Long id);
 }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaPicturesRecardServiceImpl.java

@@ -1,5 +1,6 @@
 package com.da.dangan.service.impl;
 
+import com.da.common.core.domain.AjaxResult;
 import com.da.common.utils.DateUtils;
 import com.da.dangan.domain.DaPicturesRecard;
 import com.da.dangan.mapper.DaPicturesRecardMapper;
@@ -78,9 +79,20 @@ public class DaPicturesRecardServiceImpl implements IDaPicturesRecardService
      * @return 结果
      */
     @Override
-    public int deleteDaPicturesRecardByIds(Long[] ids)
+    public AjaxResult deleteDaPicturesRecardByIds(Long[] ids)
     {
-        return daPicturesRecardMapper.deleteDaPicturesRecardByIds(ids);
+        //判断图片是否已经被识别
+        for(Long id:ids){
+            DaPicturesRecard picturesRecard = daPicturesRecardMapper.selectDaPicturesRecardById(id);
+            if (picturesRecard!=null&&picturesRecard.getRecognize()!="0"){
+                return AjaxResult.error("只能删除未识别图片");
+            }
+        }
+        int i = daPicturesRecardMapper.deleteDaPicturesRecardByIds(ids);
+        if(i>0){
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("系统错误！");
     }
 
     /**
@@ -90,8 +102,17 @@ public class DaPicturesRecardServiceImpl implements IDaPicturesRecardService
      * @return 结果
      */
     @Override
-    public int deleteDaPicturesRecardById(Long id)
+    public AjaxResult deleteDaPicturesRecardById(Long id)
     {
-        return daPicturesRecardMapper.deleteDaPicturesRecardById(id);
+        //判断图片是否已经被识别
+        DaPicturesRecard picturesRecard = daPicturesRecardMapper.selectDaPicturesRecardById(id);
+        if (picturesRecard!=null&&picturesRecard.getRecognize()!="0"){
+           return AjaxResult.error("只能删除未识别图片");
+        }
+        int i = daPicturesRecardMapper.deleteDaPicturesRecardById(id);
+        if(i>0){
+            return AjaxResult.success();
+        }
+        return AjaxResult.error("系统错误！");
     }
 }

dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java

@@ -47,7 +47,8 @@ public  class CallThirdInterface {
         return  result;
     }
 
-    public static  String callThirdInterface(String url,List<File> files,String fileType){
+    public static  String callThirdInterface(String url,List<File> files,String fileType,List<Long> picIds){
+
         // 1. 创建HttpRequest对象 - 指定好 url 地址
         HttpRequest httpRequest = new HttpRequest(url);
         // 2. 设置请求方式，默认是GET请求
@@ -59,6 +60,7 @@ public  class CallThirdInterface {
 
         httpRequest.charset(CharsetUtil.CHARSET_UTF_8);
         httpRequest.form("files[]",files.toArray(new File[files.size()]));
+        httpRequest.form("picIds",picIds);
         httpRequest.form("fileType",fileType);
         //httpRequest.form("singeOrDouble",);
         //httpRequest.form("picIds",ids.toArray(new Long[ids.size()]));
@@ -99,4 +101,34 @@ public  class CallThirdInterface {
         }
         System.out.println(values);
     }
+    /*public static  String callThirdInterface2(){
+        List<File>  files = new ArrayList<>();
+        File file1 = new File("图片物理路径");
+        File file2 = new File("图片物理路径");
+        files.add(file1);
+        files.add(file2);
+
+        String fileType="option1";
+
+        String url="http://123.57.142.195:443/upload_api";
+
+        List<Long> picIds = new ArrayList<>();
+        picIds.add(1L);
+        picIds.add(5L);
+
+        HttpRequest httpRequest = new HttpRequest(url);
+        httpRequest.setMethod(Method.POST);
+        httpRequest.charset(CharsetUtil.CHARSET_UTF_8);
+        httpRequest.form("files[]",files.toArray(new File[files.size()]));
+        httpRequest.form("fileType",fileType);
+        httpRequest.form("picIds",picIds.toArray(new File[picIds.size()]));
+        HttpResponse execute = httpRequest.execute();
+        boolean ok = execute.isOk();
+        System.out.println(ok);
+        List<HttpCookie> cookies = execute.getCookies();
+        cookies.forEach(System.out::println);
+        String body = execute.body();
+        System.out.println(body);
+        return body;
+    }*/
 }

dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml

@@ -8,12 +8,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="ywType"    column="yw_type"    />
         <result property="muId"    column="mu_id"    />
-        <result property="name"    column="name"    />
-        <result property="hzName"    column="hz_name"    />
         <result property="relation"    column="relation"    />
+        <result property="name"    column="name"    />
+        <result property="otherName"    column="other_name"    />
+        <result property="sex"    column="sex"    />
         <result property="birthday"    column="birthday"    />
         <result property="address"    column="address"    />
+        <result property="yj"    column="yj"    />
+        <result property="nation"    column="nation"    />
+        <result property="zjxy"    column="zjxy"    />
+        <result property="whcd"    column="whcd"    />
+        <result property="hyzk"    column="hyzk"    />
+        <result property="zyjfwcs"    column="zyjfwcs"    />
+        <result property="bxsqtzz"    column="bxsqtzz"    />
+        <result property="gmzdhhmqfjgjrq"    column="gmzdhhmqfjgjrq"    />
+        <result property="hsyhdqlbxshsdjhk"    column="hsyhdqlbxshsdjhk"    />
+        <result property="hsybxshcqlhsdjhk"    column="hsybxshcqlhsdjhk"    />
+        <result property="zxhkrq"    column="zxhkrq"    />
+        <result property="zxhkyy"    column="zxhkyy"    />
+        <result property="hkdjsxbgjznrsjjblrz1"    column="hkdjsxbgjznrsjjblrz1"    />
+        <result property="hkdjsxbgjznrsjjblrz2"    column="hkdjsxbgjznrsjjblrz2"    />
         <result property="jiguan"    column="jiguan"    />
+        <result property="xzz"    column="xzz"    />
+        <result property="hzName"    column="hz_name"    />
+        <result property="hb"    column="hb"    />
+        <result property="djrq"    column="djrq"    />
+        <result property="byzk"    column="byzk"    />
+        <result property="height"    column="height"    />
+        <result property="blood"    column="blood"    />
+        <result property="zy"    column="zy"    />
+        <result property="slReason"    column="sl_reason"    />
+        <result property="sljmsfzqm"    column="sljmsfzqm"    />
+        <result property="qfyj"    column="qfyj"    />
+        <result property="yxrq"    column="yxrq"    />
         <result property="cardId"    column="card_id"    />
         <result property="picIds"    column="pic_ids"    />
         <result property="pictures"    column="pictures"    />
@@ -32,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDaCzrkdjVo">
-        select id,yw_type, mu_id, name, hz_name, relation, birthday, address, jiguan, card_id, pic_ids, pictures, all_pic_ids, all_pics,error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_czrkdj
+        select id, yw_type, mu_id, relation, name, other_name, sex, birthday, address, yj, nation, zjxy, whcd, hyzk, zyjfwcs, bxsqtzz, gmzdhhmqfjgjrq, hsyhdqlbxshsdjhk, hsybxshcqlhsdjhk, zxhkrq, zxhkyy, hkdjsxbgjznrsjjblrz1, hkdjsxbgjznrsjjblrz2, jiguan, xzz, hz_name, hb, djrq, byzk, height, blood, zy, sl_reason, sljmsfzqm, qfyj, yxrq, card_id, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_czrkdj
     </sql>
 
     <select id="selectDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
@@ -40,12 +67,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and mu_id = #{muId}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="hzName != null  and hzName != ''"> and hz_name like concat('%', #{hzName}, '%')</if>
             <if test="relation != null  and relation != ''"> and relation = #{relation}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="otherName != null  and otherName != ''"> and other_name like concat('%', #{otherName}, '%')</if>
+            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
             <if test="birthday != null "> and birthday = #{birthday}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="yj != null  and yj != ''"> and yj = #{yj}</if>
+            <if test="nation != null  and nation != ''"> and nation = #{nation}</if>
+            <if test="zjxy != null  and zjxy != ''"> and zjxy = #{zjxy}</if>
+            <if test="whcd != null  and whcd != ''"> and whcd = #{whcd}</if>
+            <if test="hyzk != null  and hyzk != ''"> and hyzk = #{hyzk}</if>
+            <if test="zyjfwcs != null  and zyjfwcs != ''"> and zyjfwcs = #{zyjfwcs}</if>
+            <if test="bxsqtzz != null  and bxsqtzz != ''"> and bxsqtzz = #{bxsqtzz}</if>
+            <if test="gmzdhhmqfjgjrq != null  and gmzdhhmqfjgjrq != ''"> and gmzdhhmqfjgjrq = #{gmzdhhmqfjgjrq}</if>
+            <if test="hsyhdqlbxshsdjhk != null  and hsyhdqlbxshsdjhk != ''"> and hsyhdqlbxshsdjhk = #{hsyhdqlbxshsdjhk}</if>
+            <if test="hsybxshcqlhsdjhk != null  and hsybxshcqlhsdjhk != ''"> and hsybxshcqlhsdjhk = #{hsybxshcqlhsdjhk}</if>
+            <if test="zxhkrq != null  and zxhkrq != ''"> and zxhkrq = #{zxhkrq}</if>
+            <if test="zxhkyy != null  and zxhkyy != ''"> and zxhkyy = #{zxhkyy}</if>
+            <if test="hkdjsxbgjznrsjjblrz1 != null  and hkdjsxbgjznrsjjblrz1 != ''"> and hkdjsxbgjznrsjjblrz1 = #{hkdjsxbgjznrsjjblrz1}</if>
+            <if test="hkdjsxbgjznrsjjblrz2 != null  and hkdjsxbgjznrsjjblrz2 != ''"> and hkdjsxbgjznrsjjblrz2 = #{hkdjsxbgjznrsjjblrz2}</if>
             <if test="jiguan != null  and jiguan != ''"> and jiguan = #{jiguan}</if>
+            <if test="xzz != null  and xzz != ''"> and xzz = #{xzz}</if>
+            <if test="hzName != null  and hzName != ''"> and hz_name like concat('%', #{hzName}, '%')</if>
+            <if test="hb != null  and hb != ''"> and hb = #{hb}</if>
+            <if test="djrq != null  and djrq != ''"> and djrq = #{djrq}</if>
+            <if test="byzk != null  and byzk != ''"> and byzk = #{byzk}</if>
+            <if test="height != null  and height != ''"> and height = #{height}</if>
+            <if test="blood != null  and blood != ''"> and blood = #{blood}</if>
+            <if test="zy != null  and zy != ''"> and zy = #{zy}</if>
+            <if test="slReason != null  and slReason != ''"> and sl_reason = #{slReason}</if>
+            <if test="sljmsfzqm != null  and sljmsfzqm != ''"> and sljmsfzqm = #{sljmsfzqm}</if>
+            <if test="qfyj != null  and qfyj != ''"> and qfyj = #{qfyj}</if>
+            <if test="yxrq != null  and yxrq != ''"> and yxrq = #{yxrq}</if>
             <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
             <if test="picIds != null  and picIds != ''"> and pic_ids = #{picIds}</if>
             <if test="pictures != null  and pictures != ''"> and pictures = #{pictures}</if>
@@ -67,16 +121,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''">
              and (name like concat('%', #{name}, '%')
                 or hz_name like concat('%', #{name}, '%'))
+                or other_name like concat('%', #{name}, '%'))
              </if>
-            <if test="relation != null  and relation != ''"> and relation = #{relation}</if>
+            <if test="otherName != null  and otherName != ''"> and other_name like concat('%', #{otherName}, '%')</if>
+            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
             <if test="birthday != null "> and birthday = #{birthday}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="yj != null  and yj != ''"> and yj = #{yj}</if>
+            <if test="nation != null  and nation != ''"> and nation = #{nation}</if>
+            <if test="zjxy != null  and zjxy != ''"> and zjxy = #{zjxy}</if>
+            <if test="whcd != null  and whcd != ''"> and whcd = #{whcd}</if>
+            <if test="hyzk != null  and hyzk != ''"> and hyzk = #{hyzk}</if>
+            <if test="zyjfwcs != null  and zyjfwcs != ''"> and zyjfwcs = #{zyjfwcs}</if>
+            <if test="bxsqtzz != null  and bxsqtzz != ''"> and bxsqtzz = #{bxsqtzz}</if>
+            <if test="gmzdhhmqfjgjrq != null  and gmzdhhmqfjgjrq != ''"> and gmzdhhmqfjgjrq = #{gmzdhhmqfjgjrq}</if>
+            <if test="hsyhdqlbxshsdjhk != null  and hsyhdqlbxshsdjhk != ''"> and hsyhdqlbxshsdjhk = #{hsyhdqlbxshsdjhk}</if>
+            <if test="hsybxshcqlhsdjhk != null  and hsybxshcqlhsdjhk != ''"> and hsybxshcqlhsdjhk = #{hsybxshcqlhsdjhk}</if>
+            <if test="zxhkrq != null  and zxhkrq != ''"> and zxhkrq = #{zxhkrq}</if>
+            <if test="zxhkyy != null  and zxhkyy != ''"> and zxhkyy = #{zxhkyy}</if>
+            <if test="hkdjsxbgjznrsjjblrz1 != null  and hkdjsxbgjznrsjjblrz1 != ''"> and hkdjsxbgjznrsjjblrz1 = #{hkdjsxbgjznrsjjblrz1}</if>
+            <if test="hkdjsxbgjznrsjjblrz2 != null  and hkdjsxbgjznrsjjblrz2 != ''"> and hkdjsxbgjznrsjjblrz2 = #{hkdjsxbgjznrsjjblrz2}</if>
             <if test="jiguan != null  and jiguan != ''"> and jiguan = #{jiguan}</if>
+            <if test="xzz != null  and xzz != ''"> and xzz = #{xzz}</if>
+            <if test="hzName != null  and hzName != ''"> and hz_name like concat('%', #{hzName}, '%')</if>
+            <if test="hb != null  and hb != ''"> and hb = #{hb}</if>
+            <if test="djrq != null  and djrq != ''"> and djrq = #{djrq}</if>
+            <if test="byzk != null  and byzk != ''"> and byzk = #{byzk}</if>
+            <if test="height != null  and height != ''"> and height = #{height}</if>
+            <if test="blood != null  and blood != ''"> and blood = #{blood}</if>
+            <if test="zy != null  and zy != ''"> and zy = #{zy}</if>
+            <if test="slReason != null  and slReason != ''"> and sl_reason = #{slReason}</if>
+            <if test="sljmsfzqm != null  and sljmsfzqm != ''"> and sljmsfzqm = #{sljmsfzqm}</if>
+            <if test="qfyj != null  and qfyj != ''"> and qfyj = #{qfyj}</if>
+            <if test="yxrq != null  and yxrq != ''"> and yxrq = #{yxrq}</if>
             <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
-            <if test="picIds != null">pic_ids,</if>
+            <if test="picIds != null  and picIds != ''"> and pic_ids = #{picIds}</if>
-            <if test="pictures != null">pictures,</if>
+            <if test="pictures != null  and pictures != ''"> and pictures = #{pictures}</if>
-            <if test="allPicIds != null">all_pic_ids,</if>
+            <if test="allPicIds != null  and allPicIds != ''"> and all_pic_ids = #{allPicIds}</if>
-            <if test="allPics != null">all_pics,</if>
+            <if test="allPics != null  and allPics != ''"> and all_pics = #{allPics}</if>
             <if test="errorCorrect != null  and errorCorrect != ''"> and error_correct = #{errorCorrect}</if>
             <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
             <if test="auditName != null  and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
@@ -95,12 +177,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="ywType != null">yw_type,</if>
             <if test="muId != null">mu_id,</if>
-            <if test="name != null">name,</if>
-            <if test="hzName != null">hz_name,</if>
             <if test="relation != null">relation,</if>
+            <if test="name != null">name,</if>
+            <if test="otherName != null">other_name,</if>
+            <if test="sex != null">sex,</if>
             <if test="birthday != null">birthday,</if>
             <if test="address != null">address,</if>
+            <if test="yj != null">yj,</if>
+            <if test="nation != null">nation,</if>
+            <if test="zjxy != null">zjxy,</if>
+            <if test="whcd != null">whcd,</if>
+            <if test="hyzk != null">hyzk,</if>
+            <if test="zyjfwcs != null">zyjfwcs,</if>
+            <if test="bxsqtzz != null">bxsqtzz,</if>
+            <if test="gmzdhhmqfjgjrq != null">gmzdhhmqfjgjrq,</if>
+            <if test="hsyhdqlbxshsdjhk != null">hsyhdqlbxshsdjhk,</if>
+            <if test="hsybxshcqlhsdjhk != null">hsybxshcqlhsdjhk,</if>
+            <if test="zxhkrq != null">zxhkrq,</if>
+            <if test="zxhkyy != null">zxhkyy,</if>
+            <if test="hkdjsxbgjznrsjjblrz1 != null">hkdjsxbgjznrsjjblrz1,</if>
+            <if test="hkdjsxbgjznrsjjblrz2 != null">hkdjsxbgjznrsjjblrz2,</if>
             <if test="jiguan != null">jiguan,</if>
+            <if test="xzz != null">xzz,</if>
+            <if test="hzName != null">hz_name,</if>
+            <if test="hb != null">hb,</if>
+            <if test="djrq != null">djrq,</if>
+            <if test="byzk != null">byzk,</if>
+            <if test="height != null">height,</if>
+            <if test="blood != null">blood,</if>
+            <if test="zy != null">zy,</if>
+            <if test="slReason != null">sl_reason,</if>
+            <if test="sljmsfzqm != null">sljmsfzqm,</if>
+            <if test="qfyj != null">qfyj,</if>
+            <if test="yxrq != null">yxrq,</if>
             <if test="cardId != null">card_id,</if>
             <if test="picIds != null">pic_ids,</if>
             <if test="pictures != null">pictures,</if>
@@ -116,16 +225,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ywType != null">#{ywType},</if>
             <if test="muId != null">#{muId},</if>
-            <if test="name != null">#{name},</if>
-            <if test="hzName != null">#{hzName},</if>
             <if test="relation != null">#{relation},</if>
+            <if test="name != null">#{name},</if>
+            <if test="otherName != null">#{otherName},</if>
+            <if test="sex != null">#{sex},</if>
             <if test="birthday != null">#{birthday},</if>
             <if test="address != null">#{address},</if>
+            <if test="yj != null">#{yj},</if>
+            <if test="nation != null">#{nation},</if>
+            <if test="zjxy != null">#{zjxy},</if>
+            <if test="whcd != null">#{whcd},</if>
+            <if test="hyzk != null">#{hyzk},</if>
+            <if test="zyjfwcs != null">#{zyjfwcs},</if>
+            <if test="bxsqtzz != null">#{bxsqtzz},</if>
+            <if test="gmzdhhmqfjgjrq != null">#{gmzdhhmqfjgjrq},</if>
+            <if test="hsyhdqlbxshsdjhk != null">#{hsyhdqlbxshsdjhk},</if>
+            <if test="hsybxshcqlhsdjhk != null">#{hsybxshcqlhsdjhk},</if>
+            <if test="zxhkrq != null">#{zxhkrq},</if>
+            <if test="zxhkyy != null">#{zxhkyy},</if>
+            <if test="hkdjsxbgjznrsjjblrz1 != null">#{hkdjsxbgjznrsjjblrz1},</if>
+            <if test="hkdjsxbgjznrsjjblrz2 != null">#{hkdjsxbgjznrsjjblrz2},</if>
             <if test="jiguan != null">#{jiguan},</if>
+            <if test="xzz != null">#{xzz},</if>
+            <if test="hzName != null">#{hzName},</if>
+            <if test="hb != null">#{hb},</if>
+            <if test="djrq != null">#{djrq},</if>
+            <if test="byzk != null">#{byzk},</if>
+            <if test="height != null">#{height},</if>
+            <if test="blood != null">#{blood},</if>
+            <if test="zy != null">#{zy},</if>
+            <if test="slReason != null">#{slReason},</if>
+            <if test="sljmsfzqm != null">#{sljmsfzqm},</if>
+            <if test="qfyj != null">#{qfyj},</if>
+            <if test="yxrq != null">#{yxrq},</if>
             <if test="cardId != null">#{cardId},</if>
             <if test="picIds != null">#{picIds},</if>
             <if test="pictures != null">#{pictures},</if>
@@ -141,7 +277,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDaCzrkdj" parameterType="DaCzrkdj">
@@ -149,12 +285,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="ywType != null">yw_type = #{ywType},</if>
             <if test="muId != null">mu_id = #{muId},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="hzName != null">hz_name = #{hzName},</if>
             <if test="relation != null">relation = #{relation},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="otherName != null">other_name = #{otherName},</if>
+            <if test="sex != null">sex = #{sex},</if>
             <if test="birthday != null">birthday = #{birthday},</if>
             <if test="address != null">address = #{address},</if>
+            <if test="yj != null">yj = #{yj},</if>
+            <if test="nation != null">nation = #{nation},</if>
+            <if test="zjxy != null">zjxy = #{zjxy},</if>
+            <if test="whcd != null">whcd = #{whcd},</if>
+            <if test="hyzk != null">hyzk = #{hyzk},</if>
+            <if test="zyjfwcs != null">zyjfwcs = #{zyjfwcs},</if>
+            <if test="bxsqtzz != null">bxsqtzz = #{bxsqtzz},</if>
+            <if test="gmzdhhmqfjgjrq != null">gmzdhhmqfjgjrq = #{gmzdhhmqfjgjrq},</if>
+            <if test="hsyhdqlbxshsdjhk != null">hsyhdqlbxshsdjhk = #{hsyhdqlbxshsdjhk},</if>
+            <if test="hsybxshcqlhsdjhk != null">hsybxshcqlhsdjhk = #{hsybxshcqlhsdjhk},</if>
+            <if test="zxhkrq != null">zxhkrq = #{zxhkrq},</if>
+            <if test="zxhkyy != null">zxhkyy = #{zxhkyy},</if>
+            <if test="hkdjsxbgjznrsjjblrz1 != null">hkdjsxbgjznrsjjblrz1 = #{hkdjsxbgjznrsjjblrz1},</if>
+            <if test="hkdjsxbgjznrsjjblrz2 != null">hkdjsxbgjznrsjjblrz2 = #{hkdjsxbgjznrsjjblrz2},</if>
             <if test="jiguan != null">jiguan = #{jiguan},</if>
+            <if test="xzz != null">xzz = #{xzz},</if>
+            <if test="hzName != null">hz_name = #{hzName},</if>
+            <if test="hb != null">hb = #{hb},</if>
+            <if test="djrq != null">djrq = #{djrq},</if>
+            <if test="byzk != null">byzk = #{byzk},</if>
+            <if test="height != null">height = #{height},</if>
+            <if test="blood != null">blood = #{blood},</if>
+            <if test="zy != null">zy = #{zy},</if>
+            <if test="slReason != null">sl_reason = #{slReason},</if>
+            <if test="sljmsfzqm != null">sljmsfzqm = #{sljmsfzqm},</if>
+            <if test="qfyj != null">qfyj = #{qfyj},</if>
+            <if test="yxrq != null">yxrq = #{yxrq},</if>
             <if test="cardId != null">card_id = #{cardId},</if>
             <if test="picIds != null">pic_ids = #{picIds},</if>
             <if test="pictures != null">pictures = #{pictures},</if>