Merge remote-tracking branch 'origin/master'

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

@@ -18,6 +18,7 @@ import com.da.dangan.service.IDaCzrkdjService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -51,7 +52,7 @@ public class DaCzrkdjController extends BaseController {
             daCzrkdj.setUserId(getUserId());
         }
         startPage();
-        List<DaCzrkdj> list = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj);
+        List<DaCzrkdj> list = daCzrkdjService.selectDaCzrkdjList(daCzrkdj);
         return getDataTable(list);
     }
 
@@ -136,6 +137,22 @@ public class DaCzrkdjController extends BaseController {
         return toAjax(daCzrkdjService.insertDaCzrkdj(daCzrkdj));
     }
 
+    /**
+     * 批量新增常住人口登记
+     */
+    @PreAuthorize("@ss.hasPermi('dangan:czrkdj:add')")
+    @Log(title = "常住人口登记", businessType = BusinessType.INSERT)
+    @PostMapping("/batchAdd")
+    @Transactional
+    public AjaxResult add(@RequestBody List<DaCzrkdj> daCzrkdjs) {
+        int result = 0;
+        for(DaCzrkdj czrkdj:daCzrkdjs){
+            czrkdj.setCreateBy(getUsername());
+            result= daCzrkdjService.insertDaCzrkdj(czrkdj);
+        }
+        return toAjax(result);
+    }
+
     /**
      * 修改常住人口登记
      */

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

@@ -1,14 +1,16 @@
 package com.da.dangan.controller;
 
 import com.da.common.core.controller.BaseController;
-import com.da.common.core.domain.AjaxResult;
+import com.da.common.core.domain.entity.SysUser;
-import com.da.common.core.domain.entity.DaCatalog;
+import com.da.common.core.domain.model.LoginUser;
-import com.da.dangan.domain.DaCzrkdj;
+import com.da.common.core.page.TableDataInfo;
-import com.da.dangan.service.IDaCzrkdjService;
+import com.da.common.utils.ip.IpUtils;
+import com.da.dangan.domain.*;
+import com.da.dangan.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -24,97 +26,130 @@ import java.util.List;
 public class DaJianSuoController extends BaseController {
     @Autowired
     private IDaCzrkdjService daCzrkdjService;
+    @Autowired
+    private IDaBirthDjService daBirthDjService;
+    @Autowired
+    private IDaQyzService daQyzService;
+    @Autowired
+    private IDaYtzmService daYtzmService;
+    @Autowired
+    private IDaZfnyhkcgService daZfnyhkcgService;
+    @Autowired
+    private IDaZqzService daZqzService;
 
     /**
-     * 从档案目录查询对应的档案信息
+     *获取当前客户端ip   扫描仪webscan插件使用
      */
-   // @PreAuthorize("@ss.hasPermi('dangan:czrkdj:list')")
+    @GetMapping("/ip")
-    @GetMapping("/list")
+    public String getIp() {
-    public AjaxResult list(DaCatalog daCatalog)
+        String ipAddr = IpUtils.getIpAddr();
-    {
+        return ipAddr;
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("czrkdj",null);
-        switch(daCatalog.getYwType()){
-            case "0":
-                DaCzrkdj daCzrkdj = new DaCzrkdj();
-                daCzrkdj.setMuId(daCatalog.getId());
-                startPage();
-                List<DaCzrkdj> czrkdjs = daCzrkdjService.selectDaCzrkdjList(daCzrkdj);
-                ajax.put("czrkdj",getDataTable(czrkdjs));
-                break;
-            case "1":
-                break;
-            case "2":
-                break;
-            case "3":
-                break;
-            case "4":
-                break;
-            case "5":
-                break;
-            default :
-                break;
-        }
-        return ajax;
     }
 
     /**
-     * 档案检索————————————————接口未用，前端分开判断调用每个表的list接口————————————————
+     * 查询常住人口登记列表
-     *  keyword  关键字    ywTypes 勾选从哪些业务类型中查询
      */
-   // @PreAuthorize("@ss.hasPermi('dangan:czrkdj:list')")
+    @PreAuthorize("@ss.hasPermi('dangan:czrkdj:list')")
-    @GetMapping("/listAll")
+    @GetMapping("/czrk")
-    public AjaxResult listAll(@RequestParam("keyword") String keyword, @RequestParam("ywTypes")List<String> ywTypes)
+    public TableDataInfo list(DaCzrkdj daCzrkdj) {
-    {
+        // 超管及角色为管理员显示所有目录信息
-        AjaxResult ajax = AjaxResult.success();
+        LoginUser loginUser = getLoginUser();
-        ajax.put("czrkdj",null);
+        if (SysUser.isAdmin(getUserId()) ||
-        if(ywTypes!=null&&ywTypes.size()>0){
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
-            if (ywTypes.contains("0")) {
+        } else {
-                DaCzrkdj daCzrkdj = new DaCzrkdj();
+            daCzrkdj.setUserId(getUserId());
-                daCzrkdj.setName(keyword);
-                startPage();  //分页关系到几个表的分页
-                List<DaCzrkdj> czrkdjs = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj);
-                ajax.put("czrkdj",getDataTable(czrkdjs));
-            }
-            //TODO 其他业务类型查询
         }
-        return ajax;
+        startPage();
+        List<DaCzrkdj> list = daCzrkdjService.searchDaCzrkdjList(daCzrkdj);
+        return getDataTable(list);
     }
 
     /**
-     * 查出来的数据做分页
+     * 查询出生登记列表
-     * @param keyword
-     * @param ywType
-     * @return
      */
-    @GetMapping("/listPage")
+    @PreAuthorize("@ss.hasPermi('dangan:birthDJ:list')")
-    public AjaxResult listPage(@RequestParam("keyword") String keyword, @RequestParam("ywType")String ywType)
+    @GetMapping("/cszm")
+    public TableDataInfo list(DaBirthDj daBirthDj)
     {
-        AjaxResult ajax = AjaxResult.success();
+        // 超管及角色为管理员显示所有目录信息
-        ajax.put("czrkdj",null);
+        LoginUser loginUser = getLoginUser();
-        switch(ywType){
+        if (SysUser.isAdmin(getUserId()) ||
-            case "0":
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
-                DaCzrkdj daCzrkdj = new DaCzrkdj();
+        }else{
-                daCzrkdj.setName(keyword);
+            daBirthDj.setUserId(getUserId());
-                startPage();  //分页关系到几个表的分页
+        }
-                List<DaCzrkdj> czrkdjs = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj);
+        startPage();
-                ajax.put("czrkdj",getDataTable(czrkdjs));
+        List<DaBirthDj> list = daBirthDjService.searchDaBirthDjList(daBirthDj);
-                break;
+        return getDataTable(list);
-            //TODO 其他业务类型查询
+    }
 
-            case "1":
+    /**
-                break;
+     * 查询迁移证列表
-            case "2":
+     */
-                break;
+    @PreAuthorize("@ss.hasPermi('dangan:qyz:list')")
-            case "3":
+    @GetMapping("/qyz")
-                break;
+    public TableDataInfo list(DaQyz daQyz) {
-            case "4":
+        // 超管及角色为管理员显示所有目录信息
-                break;
+        LoginUser loginUser = getLoginUser();
-            case "5":
+        if (SysUser.isAdmin(getUserId()) ||
-                break;
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
-            default :
+        }else{
-                break;
+            daQyz.setUserId(getUserId());
         }
-        return ajax;
+        startPage();
+        List<DaQyz> list = daQyzService.searchDaQyzList(daQyz);
+        return getDataTable(list);
     }
+    /**
+     * 查询一胎证明列表
+     */
+    @PreAuthorize("@ss.hasPermi('dangan:ytzm:list')")
+    @GetMapping("/ytzm")
+    public TableDataInfo list(DaYtzm daYtzm) {
+        // 超管及角色为管理员显示所有目录信息
+        LoginUser loginUser = getLoginUser();
+        if (SysUser.isAdmin(getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+        }else{
+            daYtzm.setUserId(getUserId());
+        }
+        startPage();
+        List<DaYtzm> list = daYtzmService.searchYtzmList(daYtzm);
+        return getDataTable(list);
+    }
+    /**
+     * 查询转非农业人口批复存根列表
+     */
+    @PreAuthorize("@ss.hasPermi('dangan:zfnyhkcg:list')")
+    @GetMapping("/zfny")
+    public TableDataInfo list(DaZfnyhkcg daZfnyhkcg) {
+        // 超管及角色为管理员显示所有目录信息
+        LoginUser loginUser = getLoginUser();
+        if (SysUser.isAdmin(getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+        }else{
+            daZfnyhkcg.setUserId(getUserId());
+        }
+        startPage();
+        List<DaZfnyhkcg> list = daZfnyhkcgService.searchDaZfnyhkcgList(daZfnyhkcg);
+        return getDataTable(list);
+    }
+    /**
+     * 查询准迁证列表
+     */
+    @PreAuthorize("@ss.hasPermi('dangan:zqz:list')")
+    @GetMapping("/zqz")
+    public TableDataInfo list(DaZqz daZqz) {
+        // 超管及角色为管理员显示所有目录信息
+        LoginUser loginUser = getLoginUser();
+        if (SysUser.isAdmin(getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+        }else{
+            daZqz.setUserId(getUserId());
+        }
+        startPage();
+        List<DaZqz> list = daZqzService.searchDaZqzList(daZqz);
+        return getDataTable(list);
+    }
+
 }

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

@@ -103,6 +103,6 @@ public class DaTaskController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(daTaskService.deleteDaTaskByIds(ids));
+        return daTaskService.deleteDaTaskByIds(ids);
     }
 }

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

@@ -26,7 +26,7 @@ public class DaBirthDj extends BaseEntity {
     /**
      * 业务类型(字典)
      */
-    @Excel(name = "业务类型", dictType = "yw_type")
+    //@Excel(name = "业务类型", dictType = "yw_type")
     private String ywType;
 
     /**

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

@@ -26,7 +26,7 @@ public class DaQyz extends BaseEntity {
     /**
      * 业务类型(字典)
      */
-    @Excel(name = "业务类型", dictType = "yw_type")
+   // @Excel(name = "业务类型", dictType = "yw_type")
     private String ywType;
 
     /**

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

@@ -26,7 +26,7 @@ public class DaYtzm extends BaseEntity {
     /**
      * 业务类型(字典)
      */
-    @Excel(name = "业务类型", dictType = "yw_type")
+   // @Excel(name = "业务类型", dictType = "yw_type")
     private String ywType;
 
     /**

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

@@ -26,7 +26,7 @@ public class DaZfnyhkcg extends BaseEntity {
     /**
      * 业务类型(字典)
      */
-    @Excel(name = "业务类型", dictType = "yw_type")
+    //@Excel(name = "业务类型", dictType = "yw_type")
     private String ywType;
 
     /**

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

@@ -23,7 +23,7 @@ public class DaZqz extends BaseEntity
     private Long taskId;
 
     /** 业务类型(字典) */
-    @Excel(name = "业务类型",dictType = "yw_type")
+   // @Excel(name = "业务类型",dictType = "yw_type")
     private String ywType;
 
     /** 目录id */

dangan-dangan/src/main/java/com/da/dangan/mapper/DaBirthDjMapper.java

@@ -59,4 +59,6 @@ public interface DaBirthDjMapper
      * @return 结果
      */
     public int deleteDaBirthDjByIds(Long[] ids);
+
+    List<DaBirthDj> searchDaBirthDjList(DaBirthDj daBirthDj);
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaCzrkdjMapper.java

@@ -60,5 +60,5 @@ public interface DaCzrkdjMapper
      */
     public int deleteDaCzrkdjByIds(Long[] ids);
 
-    List<DaCzrkdj> selectDaCzrkdjList1(DaCzrkdj daCzrkdj);
+    List<DaCzrkdj> searchDaCzrkdjList(DaCzrkdj daCzrkdj);
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaQyzMapper.java

@@ -59,4 +59,6 @@ public interface DaQyzMapper
      * @return 结果
      */
     public int deleteDaQyzByIds(Long[] ids);
+
+    List<DaQyz> searchDaQyzList(DaQyz daQyz);
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaYtzmMapper.java

@@ -1,8 +1,9 @@
 package com.da.dangan.mapper;
 
-import java.util.List;
 import com.da.dangan.domain.DaYtzm;
 
+import java.util.List;
+
 /**
  * 一胎证明Mapper接口
  * 
@@ -58,4 +59,6 @@ public interface DaYtzmMapper
      * @return 结果
      */
     public int deleteDaYtzmByIds(Long[] ids);
+
+    List<DaYtzm> searchYtzmList(DaYtzm daYtzm);
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaZfnyhkcgMapper.java

@@ -1,8 +1,9 @@
 package com.da.dangan.mapper;
 
-import java.util.List;
 import com.da.dangan.domain.DaZfnyhkcg;
 
+import java.util.List;
+
 /**
  * 转非农业人口批复存根Mapper接口
  * 
@@ -58,4 +59,6 @@ public interface DaZfnyhkcgMapper
      * @return 结果
      */
     public int deleteDaZfnyhkcgByIds(Long[] ids);
+
+    List<DaZfnyhkcg> searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg);
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaZqzMapper.java

@@ -1,8 +1,9 @@
 package com.da.dangan.mapper;
 
-import java.util.List;
 import com.da.dangan.domain.DaZqz;
 
+import java.util.List;
+
 /**
  * 准迁证Mapper接口
  * 
@@ -58,4 +59,6 @@ public interface DaZqzMapper
      * @return 结果
      */
     public int deleteDaZqzByIds(Long[] ids);
+
+    List<DaZqz> searchDaZqzList(DaZqz daZqz);
 }

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

@@ -59,4 +59,6 @@ public interface IDaBirthDjService
      * @return 结果
      */
     public int deleteDaBirthDjById(Long id);
+
+    List<DaBirthDj> searchDaBirthDjList(DaBirthDj daBirthDj);
 }

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

@@ -52,13 +52,6 @@ public interface IDaCzrkdjService
      */
     public int deleteDaCzrkdjByIds(Long[] ids);
 
-    /**
-     * 删除常住人口登记信息
-     * 
-     * @param id 常住人口登记主键
-     * @return 结果
-     */
-    public int deleteDaCzrkdjById(Long id);
 
-    List<DaCzrkdj> selectDaCzrkdjList1(DaCzrkdj daCzrkdj);
+    List<DaCzrkdj> searchDaCzrkdjList(DaCzrkdj daCzrkdj);
 }

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

@@ -59,4 +59,6 @@ public interface IDaQyzService
      * @return 结果
      */
     public int deleteDaQyzById(Long id);
+
+    List<DaQyz> searchDaQyzList(DaQyz daQyz);
 }

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

@@ -1,5 +1,6 @@
 package com.da.dangan.service;
 
+import com.da.common.core.domain.AjaxResult;
 import com.da.dangan.domain.DaTask;
 
 import java.util.List;
@@ -50,7 +51,7 @@ public interface IDaTaskService
      * @param ids 需要删除的识别任务记录主键集合
      * @return 结果
      */
-    public int deleteDaTaskByIds(Long[] ids);
+    public AjaxResult deleteDaTaskByIds(Long[] ids);
 
     /**
      * 删除识别任务记录信息

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

@@ -1,8 +1,9 @@
 package com.da.dangan.service;
 
-import java.util.List;
 import com.da.dangan.domain.DaYtzm;
 
+import java.util.List;
+
 /**
  * 一胎证明Service接口
  * 
@@ -58,4 +59,6 @@ public interface IDaYtzmService
      * @return 结果
      */
     public int deleteDaYtzmById(Long id);
+
+    List<DaYtzm> searchYtzmList(DaYtzm daYtzm);
 }

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

@@ -1,8 +1,9 @@
 package com.da.dangan.service;
 
-import java.util.List;
 import com.da.dangan.domain.DaZfnyhkcg;
 
+import java.util.List;
+
 /**
  * 转非农业人口批复存根Service接口
  * 
@@ -58,4 +59,6 @@ public interface IDaZfnyhkcgService
      * @return 结果
      */
     public int deleteDaZfnyhkcgById(Long id);
+
+    List<DaZfnyhkcg> searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg);
 }

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

@@ -1,8 +1,9 @@
 package com.da.dangan.service;
 
-import java.util.List;
 import com.da.dangan.domain.DaZqz;
 
+import java.util.List;
+
 /**
  * 准迁证Service接口
  * 
@@ -58,4 +59,6 @@ public interface IDaZqzService
      * @return 结果
      */
     public int deleteDaZqzById(Long id);
+
+    List<DaZqz> searchDaZqzList(DaZqz daZqz);
 }

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

@@ -56,6 +56,11 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService
         return daBirthDjMapper.selectDaBirthDjList(daBirthDj);
     }
 
+    @Override
+    public List<DaBirthDj> searchDaBirthDjList(DaBirthDj daBirthDj) {
+        return daBirthDjMapper.searchDaBirthDjList(daBirthDj);
+    }
+
     /**
      * 新增出生登记
      * 
@@ -84,8 +89,8 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService
                 if (failIds.removeAll(picIds) && successIds.addAll(picIds)) {
                     daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size());
                     daTask.setFailNum(daTask.getFailNum() - picIds.size());
-                    daTask.setFailIds(StringUtils.join(failIds));
+                    daTask.setFailIds(StringUtils.join(failIds, ","));
-                    daTask.setSuccessIds(StringUtils.join(successIds));
+                    daTask.setSuccessIds(StringUtils.join(successIds, ","));
                     daTaskMapper.updateDaTask(daTask);
                 }
             }
@@ -143,4 +148,6 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService
     {
         return daBirthDjMapper.deleteDaBirthDjById(id);
     }
+
+
 }

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

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -54,6 +55,11 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService {
         return daCzrkdjMapper.selectDaCzrkdjList(daCzrkdj);
     }
 
+    @Override
+    public List<DaCzrkdj> searchDaCzrkdjList(DaCzrkdj daCzrkdj) {
+        return daCzrkdjMapper.searchDaCzrkdjList(daCzrkdj);
+    }
+
     /**
      * 新增常住人口登记
      *
@@ -75,14 +81,25 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService {
             //手动识别且图片来自于任务，修改任务成功、失败图片
             if (daCzrkdj.getTaskId() != null&&daCzrkdj.getErrorCorrect().equals("2")) {
                 DaTask daTask = daTaskMapper.selectDaTaskById(daCzrkdj.getTaskId());
-                List<Long> failIds = Stream.of(daTask.getFailIds().split(",")).map(Long::parseLong).collect(Collectors.toList());
+                List<Long> failIds ;
-                List<Long> successIds = Stream.of(daTask.getSuccessIds().split(",")).map(Long::parseLong).collect(Collectors.toList());
+                List<Long> successIds = new ArrayList<>();
-                //失败减少、成功增加
+                String failId = daTask.getFailIds();
-                if (failIds.removeAll(picIds) && successIds.addAll(picIds)) {
+                String successId = daTask.getSuccessIds();
-                    daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size());
+                if(failId!=null&&!failId.trim().equals("")){
-                    daTask.setFailNum(daTask.getFailNum() - picIds.size());
+                    failIds = Stream.of(daTask.getFailIds().split(",")).map(Long::parseLong).collect(Collectors.toList());
-                    daTask.setFailIds(StringUtils.join(failIds));
+                    if(successId!=null&&!successId.trim().equals("")){
-                    daTask.setSuccessIds(StringUtils.join(successIds));
+                        successIds = Stream.of(daTask.getSuccessIds().split(",")).map(Long::parseLong).collect(Collectors.toList());
+                    }
+
+                    //失败减少、成功增加
+                    for(Long picId:picIds){
+                        if (failIds.remove(picId) && successIds.add(picId)) {
+                            daTask.setSuccessNum(daTask.getSuccessNum() + 1);
+                            daTask.setFailNum(daTask.getFailNum() - 1);
+                        }
+                    }
+                    daTask.setFailIds(StringUtils.join(failIds, ","));
+                    daTask.setSuccessIds(StringUtils.join(successIds, ","));
                     daTaskMapper.updateDaTask(daTask);
                 }
             }
@@ -91,6 +108,7 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService {
         return daCzrkdjMapper.insertDaCzrkdj(daCzrkdj);
     }
 
+
     /**
      * 修改常住人口登记
      *
@@ -126,19 +144,4 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService {
         return daCzrkdjMapper.deleteDaCzrkdjByIds(ids);
     }
 
-    /**
-     * 删除常住人口登记信息
-     *
-     * @param id 常住人口登记主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDaCzrkdjById(Long id) {
-        return daCzrkdjMapper.deleteDaCzrkdjById(id);
-    }
-
-    @Override
-    public List<DaCzrkdj> selectDaCzrkdjList1(DaCzrkdj daCzrkdj) {
-        return daCzrkdjMapper.selectDaCzrkdjList1(daCzrkdj);
-    }
 }

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

@@ -56,6 +56,11 @@ public class DaQyzServiceImpl implements IDaQyzService
         return daQyzMapper.selectDaQyzList(daQyz);
     }
 
+    @Override
+    public List<DaQyz> searchDaQyzList(DaQyz daQyz) {
+        return daQyzMapper.searchDaQyzList(daQyz);
+    }
+
     /**
      * 新增迁移证
      * 
@@ -84,8 +89,8 @@ public class DaQyzServiceImpl implements IDaQyzService
                 if (failIds.removeAll(picIds) && successIds.addAll(picIds)) {
                     daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size());
                     daTask.setFailNum(daTask.getFailNum() - picIds.size());
-                    daTask.setFailIds(StringUtils.join(failIds));
+                    daTask.setFailIds(StringUtils.join(failIds, ","));
-                    daTask.setSuccessIds(StringUtils.join(successIds));
+                    daTask.setSuccessIds(StringUtils.join(successIds, ","));
                     daTaskMapper.updateDaTask(daTask);
                 }
             }
@@ -144,4 +149,5 @@ public class DaQyzServiceImpl implements IDaQyzService
     {
         return daQyzMapper.deleteDaQyzById(id);
     }
+
 }

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

@@ -1,13 +1,20 @@
 package com.da.dangan.service.impl;
 
+import com.da.common.core.domain.AjaxResult;
+import com.da.common.core.domain.entity.SysUser;
+import com.da.common.core.domain.model.LoginUser;
 import com.da.common.utils.DateUtils;
-import com.da.dangan.domain.DaTask;
+import com.da.common.utils.SecurityUtils;
-import com.da.dangan.mapper.DaTaskMapper;
+import com.da.dangan.domain.*;
+import com.da.dangan.mapper.*;
 import com.da.dangan.service.IDaTaskService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 识别任务记录Service业务层处理
@@ -18,9 +25,22 @@ import java.util.List;
 @Service
 public class DaTaskServiceImpl implements IDaTaskService 
 {
-    @Autowired
+    @Resource
     private DaTaskMapper daTaskMapper;
-
+    @Resource
+    private DaBirthDjMapper daBirthDjMapper;
+    @Resource
+    private DaCzrkdjMapper daCzrkdjMapper;
+    @Resource
+    private DaQyzMapper daQyzMapper;
+    @Resource
+    private DaYtzmMapper daYtzmMapper;
+    @Resource
+    private DaZfnyhkcgMapper daZfnyhkcgMapper;
+    @Resource
+    private DaZqzMapper daZqzMapper;
+    @Resource
+    private DaPicturesRecardMapper daPicturesRecardMapper;
     /**
      * 查询识别任务记录
      * 
@@ -87,14 +107,108 @@ public class DaTaskServiceImpl implements IDaTaskService
      * @return 结果
      */
     @Override
-    public int deleteDaTaskByIds(Long[] ids)
+    @Transactional
-    {
+    public AjaxResult deleteDaTaskByIds(Long[] ids) {
-        return daTaskMapper.deleteDaTaskByIds(ids);
+        //todo 删除条件  普通用户可以删除全部识别失败的任务   超管及管理员可以删除所有任务（识别数据一并删除）
+        boolean flag= false;
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (SysUser.isAdmin(loginUser.getUserId()) ||
+                loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
+            flag = true;
+        }
+        for(Long id :ids){
+            DaTask daTask = daTaskMapper.selectDaTaskById(id);
+            if(daTask.getSuccessNum()!=null&&daTask.getSuccessNum()>0){
+                if(!flag){
+                    return AjaxResult.error("已有识别数据，仅管理员可删除");
+                }else{
+                    switch (daTask.getYwType()){
+                        case "option1":  //常住人口登记表1
+                        case "option2":   //常住卡
+                        case "option3":   //常住人口登记表2
+                        case "option9":   //常住人口登记表3
+                            DaCzrkdj czrkdj = new DaCzrkdj();
+                            czrkdj.setTaskId(daTask.getId());
+                            List<DaCzrkdj> daCzrkdjs = daCzrkdjMapper.selectDaCzrkdjList(czrkdj);
+                            if(daCzrkdjs!=null&&daCzrkdjs.size()>0){
+                                List<Long> czrkIds = daCzrkdjs.stream().map(DaCzrkdj::getId).collect(Collectors.toList());
+                                daCzrkdjMapper.deleteDaCzrkdjByIds(czrkIds.toArray(new Long[czrkIds.size()]));
+                            }
+                            break;
+                        case "option4":
+                            //生医学证明
+                            DaBirthDj birthDj = new DaBirthDj();
+                            birthDj.setTaskId(daTask.getId());
+                            List<DaBirthDj> daBirthDjs = daBirthDjMapper.selectDaBirthDjList(birthDj);
+                            if(daBirthDjs!=null&&daBirthDjs.size()>0){
+                                List<Long> cszmIds = daBirthDjs.stream().map(DaBirthDj::getId).collect(Collectors.toList());
+                                daBirthDjMapper.deleteDaBirthDjByIds(cszmIds.toArray(new Long[cszmIds.size()]));
+                            }
+                            break;
+                        case "option5":
+                            //迁移证
+                            DaQyz qyz = new DaQyz();
+                            qyz.setTaskId(daTask.getId());
+                            List<DaQyz> qyzs = daQyzMapper.selectDaQyzList(qyz);
+                            if(qyzs!=null&&qyzs.size()>0){
+                                List<Long> qyzIds = qyzs.stream().map(DaQyz::getId).collect(Collectors.toList());
+                                daQyzMapper.deleteDaQyzByIds(qyzIds.toArray(new Long[qyzIds.size()]));
+                            }
+                            break;
+                        case "option6":
+                            //一胎证明
+                            DaYtzm ytzm = new DaYtzm();
+                            ytzm.setTaskId(daTask.getId());
+                            List<DaYtzm> ytzms = daYtzmMapper.selectDaYtzmList(ytzm);
+                            if(ytzms!=null&&ytzms.size()>0){
+                                List<Long> ytzmIds = ytzms.stream().map(DaYtzm::getId).collect(Collectors.toList());
+                                daYtzmMapper.deleteDaYtzmByIds(ytzmIds.toArray(new Long[ytzmIds.size()]));
+                            }
+                            break;
+                        case "option7":
+                            //转非农业人口批复存根
+                            DaZfnyhkcg zfnyhkcg = new DaZfnyhkcg();
+                            zfnyhkcg.setTaskId(daTask.getId());
+                            List<DaZfnyhkcg> zfnyhkcgs = daZfnyhkcgMapper.selectDaZfnyhkcgList(zfnyhkcg);
+                            if(zfnyhkcgs!=null&&zfnyhkcgs.size()>0){
+                                List<Long> zfIds = zfnyhkcgs.stream().map(DaZfnyhkcg::getId).collect(Collectors.toList());
+                                daZfnyhkcgMapper.deleteDaZfnyhkcgByIds(zfIds.toArray(new Long[zfIds.size()]));
+                            }
+                            break;
+                        case "option8":
+                            //准迁证
+                            DaZqz zqz = new DaZqz();
+                            zqz.setTaskId(daTask.getId());
+                            List<DaZqz> zqzs = daZqzMapper.selectDaZqzList(zqz);
+                            if(zqzs!=null&&zqzs.size()>0){
+                                List<Long> zqzIds = zqzs.stream().map(DaZqz::getId).collect(Collectors.toList());
+                                daZqzMapper.deleteDaZqzByIds(zqzIds.toArray(new Long[zqzIds.size()]));
+                            }
+                            break;
+                    }
+                }
+            }
+               //修改任务对应的图片为未识别
+                List<Long> picIds = Stream.of(daTask.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList());
+                for(Long picId :picIds){
+                    DaPicturesRecard pic = new DaPicturesRecard();
+                    pic.setId(picId);
+                    pic.setRecognize("0");//未识别
+                    pic.setErrorCorrect("0");
+                    daPicturesRecardMapper.updateDaPicturesRecard(pic);
+                }
+        }
+        int result = daTaskMapper.deleteDaTaskByIds(ids);
+
+        if(result>0){
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
     }
 
     /**
      * 删除识别任务记录信息
-     * 
+     *
      * @param id 识别任务记录主键
      * @return 结果
      */

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

@@ -56,6 +56,12 @@ public class DaYtzmServiceImpl implements IDaYtzmService
         return daYtzmMapper.selectDaYtzmList(daYtzm);
     }
 
+    @Override
+    public List<DaYtzm> searchYtzmList(DaYtzm daYtzm) {
+        return daYtzmMapper.searchYtzmList(daYtzm);
+    }
+
+
     /**
      * 新增一胎证明
      * 
@@ -84,8 +90,8 @@ public class DaYtzmServiceImpl implements IDaYtzmService
                 if (failIds.removeAll(picIds) && successIds.addAll(picIds)) {
                     daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size());
                     daTask.setFailNum(daTask.getFailNum() - picIds.size());
-                    daTask.setFailIds(StringUtils.join(failIds));
+                    daTask.setFailIds(StringUtils.join(failIds, ","));
-                    daTask.setSuccessIds(StringUtils.join(successIds));
+                    daTask.setSuccessIds(StringUtils.join(successIds, ","));
                     daTaskMapper.updateDaTask(daTask);
                 }
             }

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

@@ -56,6 +56,11 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService
         return daZfnyhkcgMapper.selectDaZfnyhkcgList(daZfnyhkcg);
     }
 
+    @Override
+    public List<DaZfnyhkcg> searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg) {
+        return daZfnyhkcgMapper.searchDaZfnyhkcgList(daZfnyhkcg);
+    }
+
     /**
      * 新增转非农业人口批复存根
      * 
@@ -84,8 +89,8 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService
                 if (failIds.removeAll(picIds) && successIds.addAll(picIds)) {
                     daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size());
                     daTask.setFailNum(daTask.getFailNum() - picIds.size());
-                    daTask.setFailIds(StringUtils.join(failIds));
+                    daTask.setFailIds(StringUtils.join(failIds, ","));
-                    daTask.setSuccessIds(StringUtils.join(successIds));
+                    daTask.setSuccessIds(StringUtils.join(successIds, ","));
                     daTaskMapper.updateDaTask(daTask);
                 }
             }

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

@@ -56,6 +56,12 @@ public class DaZqzServiceImpl implements IDaZqzService
         return daZqzMapper.selectDaZqzList(daZqz);
     }
 
+    @Override
+    public List<DaZqz> searchDaZqzList(DaZqz daZqz) {
+        return  daZqzMapper.searchDaZqzList(daZqz);
+    }
+
+
     /**
      * 新增准迁证
      * 
@@ -84,8 +90,8 @@ public class DaZqzServiceImpl implements IDaZqzService
                 if (failIds.removeAll(picIds) && successIds.addAll(picIds)) {
                     daTask.setSuccessNum(daTask.getSuccessNum() + picIds.size());
                     daTask.setFailNum(daTask.getFailNum() - picIds.size());
-                    daTask.setFailIds(StringUtils.join(failIds));
+                    daTask.setFailIds(StringUtils.join(failIds, ","));
-                    daTask.setSuccessIds(StringUtils.join(successIds));
+                    daTask.setSuccessIds(StringUtils.join(successIds, ","));
                     daTaskMapper.updateDaTask(daTask);
                 }
             }

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

@@ -103,6 +103,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by id desc
     </select>
+    <!--检索-->
+    <select id="searchDaBirthDjList" parameterType="DaBirthDj" resultMap="DaBirthDjResult">
+        select distinct b.* from da_birth_dj b
+        left join da_user_catalog uc on b.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null  "> and uc.user_id = #{userId}</if>
+            <if test="name != null  and name != ''">
+             and (name like concat('%', #{name}, '%')
+                 or m_name like  concat('%', #{name}, '%')
+                 or f_name like  concat('%', #{name}, '%')
+                 or birthday like  concat('%', #{name}, '%')
+                 or m_card_id like  concat('%', #{name}, '%')
+                 or f_card_id like  concat('%', #{name}, '%')
+                 )
+            </if>
+        </where>
+        order by id desc
+    </select>
 
     <select id="selectDaBirthDjById" parameterType="Long" resultMap="DaBirthDjResult">
         <include refid="selectDaBirthDjVo"/>

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

@@ -146,19 +146,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by id desc
     </select>
-
+    <!--检索-->
-    <select id="selectDaCzrkdjList1" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
+    <select id="searchDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
         select distinct  c.* from da_czrkdj c
         left join da_user_catalog uc on c.mu_id = uc.mu_id
         <where>
             <if test="userId != null  "> and uc.user_id = #{userId}</if>
-            <if test="taskId != null "> and task_id = #{taskId}</if>
-            <!-- flag=0 展示全部  =1不展示没有姓名的记录 -->
-            <if test="flag != null and flag=='1'.toString()"> and name !='无'</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
-            <if test="muId != null "> and c.mu_id = #{muId}</if>
-            <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
-            <if test="relation != null  and relation != ''"> and relation = #{relation}</if>
             <if test="name != null  and name != ''">
                 and ( name like concat('%', #{name}, '%')
                 or hz_name like concat('%', #{name}, '%')
@@ -166,60 +160,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 or used_name like concat('%', #{name}, '%')
                 or jhr1 like concat('%', #{name}, '%')
                 or jhr2 like concat('%', #{name}, '%')
+                or birthday like concat('%', #{name}, '%')
+                or card_id like concat('%', #{name}, '%')
                 )
             </if>
-            <if test="birthday != null  and birthday != ''">
-                and birthday like concat('%', #{birthday}, '%')
-            </if>
-            <if test="cardId != null  and cardId != ''">
-             and card_id like concat('%', #{cardId}, '%')
-             </if>
-            <if test="otherName != null  and otherName != ''"> and other_name like concat('%', #{otherName}, '%')</if>
-            <if test="usedName != null  and usedName != ''"> and used_name like concat('%', #{usedName}, '%')</if>
-            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
-            <if test="jhr1 != null  and jhr1 != ''"> and jhr1 like concat('%', #{jhr1}, '%') </if>
-            <if test="jhgx1 != null  and jhgx1 != ''"> and jhgx1 = #{jhgx1}</if>
-            <if test="jhr2 != null  and jhr2 != ''"> and jhr2 like concat('%', #{jhr2}, '%') </if>
-            <if test="jhgx2 != null  and jhgx2 != ''"> and jhgx2 = #{jhgx2}</if>
-            <if test="gmcszqfrq != null  and gmcszqfrq != ''"> and gmcszqfrq = #{gmcszqfrq}</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 like concat('%', #{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="hshyqwhd != null  and hshyqwhd != ''"> and hshyqwhd = #{hshyqwhd}</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="picIds != null  and picIds != ''"> and pic_ids = #{picIds}</if>
-            <if test="pictures != null  and pictures != ''"> and pictures = #{pictures}</if>
-            <if test="allPicIds != null  and allPicIds != ''"> and all_pic_ids = #{allPicIds}</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>
-            <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
-            <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
         </where>
         order by id desc
     </select>

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

@@ -73,9 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sex1 != null  and sex1 != ''"> and sex1 = #{sex1}</if>
             <if test="cardId1 != null  and cardId1 != ''">
              and (card_id1  like concat('%', #{cardId1}, '%')
-                or cardId2 like concat('%', #{cardId1}, '%')
+                or card_id2 like concat('%', #{cardId1}, '%')
-                or cardId3 like concat('%', #{cardId1}, '%')
+                or card_id3 like concat('%', #{cardId1}, '%')
-                or cardId4 like concat('%', #{cardId1}, '%')
+                or card_id4 like concat('%', #{cardId1}, '%')
                 )
              </if>
             <if test="name2 != null  and name2 != ''"> and name2 = #{name2}</if>
@@ -105,7 +105,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by id desc
     </select>
-    
+    <select id="searchDaQyzList" parameterType="DaQyz" resultMap="DaQyzResult">
+        select distinct  q.* from da_qyz q
+        left join da_user_catalog uc on q.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null"> and uc.user_id = #{userId}</if>
+            <if test="name1 != null  and name1 != ''">
+                and ( name1 like concat('%', #{name1}, '%')
+                or name2 like concat('%', #{name1}, '%')
+                or name3 like concat('%', #{name1}, '%')
+                or name4 like concat('%', #{name1}, '%')
+                or card_id1 like concat('%', #{name1}, '%')
+                or card_id2 like concat('%', #{name1}, '%')
+                or card_id3 like concat('%', #{name1}, '%')
+                or card_id4 like concat('%', #{name1}, '%')
+                )
+            </if>
+        </where>
+        order by id desc
+    </select>
+
     <select id="selectDaQyzById" parameterType="Long" resultMap="DaQyzResult">
         <include refid="selectDaQyzVo"/>
         where id = #{id}

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

@@ -95,7 +95,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by id desc
     </select>
-    
+    <select id="searchYtzmList" parameterType="DaYtzm" resultMap="DaYtzmResult">
+        select distinct  y.* from da_ytzm y
+        left join da_user_catalog uc on y.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null  "> and uc.user_id = #{userId}</if>
+            <if test="wName != null  and wName != ''">
+             and ( w_name like concat('%', #{wName}, '%')
+                   or m_name like concat('%', #{wName}, '%')
+                   or birthday like concat('%', #{wName}, '%')
+                   or w_card_id like concat('%', #{wName}, '%')
+                   or m_card_id like concat('%', #{wName}, '%')
+                )
+            </if>
+        </where>
+        order by id desc
+    </select>
+
     <select id="selectDaYtzmById" parameterType="Long" resultMap="DaYtzmResult">
         <include refid="selectDaYtzmVo"/>
         where id = #{id}

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

@@ -105,7 +105,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by id desc
     </select>
-    
+    <select id="searchDaZfnyhkcgList" parameterType="DaZfnyhkcg" resultMap="DaZfnyhkcgResult">
+        select distinct  z.* from da_zfnyhkcg z
+        left join da_user_catalog uc on z.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null "> and uc.user_id = #{userId}</if>
+            <if test="name != null  and name != ''">
+             and ( name like concat('%', #{name}, '%')
+                or name1 like concat('%', #{name}, '%')
+                or name2 like concat('%', #{name}, '%')
+                or name3 like concat('%', #{name}, '%')
+                or name4 like concat('%', #{name}, '%')
+                or name5 like concat('%', #{name}, '%')
+                )
+             </if>
+        </where>
+        order by id desc
+    </select>
+
     <select id="selectDaZfnyhkcgById" parameterType="Long" resultMap="DaZfnyhkcgResult">
         <include refid="selectDaZfnyhkcgVo"/>
         where id = #{id}

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

@@ -135,7 +135,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by id desc
     </select>
-    
+    <select id="searchDaZqzList" parameterType="DaZqz" resultMap="DaZqzResult">
+        select distinct z.* from da_zqz z
+        left join da_user_catalog uc on z.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null  "> and uc.user_id = #{userId}</if>
+            <if test="name != null  and name != ''">
+             and ( name like concat('%', #{name}, '%')
+                or name1 like concat('%', #{name}, '%')
+                or name2 like concat('%', #{name}, '%')
+                or name3 like concat('%', #{name}, '%')
+                or name4 like concat('%', #{name}, '%')
+                or card_id like concat('%', #{name}, '%')
+                or card_id1 like concat('%', #{name}, '%')
+                or card_id2 like concat('%', #{name}, '%')
+                or card_id3 like concat('%', #{name}, '%')
+                or card_id4 like concat('%', #{name}, '%')
+                or birth_date1 like concat('%', #{name}, '%')
+                or birth_date2 like concat('%', #{name}, '%')
+                or birth_date3 like concat('%', #{name}, '%')
+                or birth_date4 like concat('%', #{name}, '%')
+                )
+             </if>
+        </where>
+        order by id desc
+    </select>
+
     <select id="selectDaZqzById" parameterType="Long" resultMap="DaZqzResult">
         <include refid="selectDaZqzVo"/>
         where id = #{id}