From 2a828cb9cf1999facca517e27732e36ba480f0cd Mon Sep 17 00:00:00 2001 From: hansha Date: Sat, 3 Aug 2024 14:35:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E7=B4=A2=E9=A1=B5=E9=9D=A2=E6=8D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9A=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E3=80=81=E8=BA=AB=E4=BB=BD=E8=AF=81=E3=80=81?= =?UTF-8?q?=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F=E5=85=B3=E9=94=AE=E5=AD=97?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?ip=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dangan/controller/DaCzrkdjController.java | 19 +- .../controller/DaJianSuoController.java | 199 ++++++++++-------- .../dangan/controller/DaTaskController.java | 2 +- .../java/com/da/dangan/domain/DaBirthDj.java | 2 +- .../main/java/com/da/dangan/domain/DaQyz.java | 2 +- .../java/com/da/dangan/domain/DaYtzm.java | 2 +- .../java/com/da/dangan/domain/DaZfnyhkcg.java | 2 +- .../main/java/com/da/dangan/domain/DaZqz.java | 2 +- .../com/da/dangan/mapper/DaBirthDjMapper.java | 2 + .../com/da/dangan/mapper/DaCzrkdjMapper.java | 2 +- .../com/da/dangan/mapper/DaQyzMapper.java | 2 + .../com/da/dangan/mapper/DaYtzmMapper.java | 5 +- .../da/dangan/mapper/DaZfnyhkcgMapper.java | 5 +- .../com/da/dangan/mapper/DaZqzMapper.java | 5 +- .../da/dangan/service/IDaBirthDjService.java | 2 + .../da/dangan/service/IDaCzrkdjService.java | 9 +- .../com/da/dangan/service/IDaQyzService.java | 2 + .../com/da/dangan/service/IDaTaskService.java | 3 +- .../com/da/dangan/service/IDaYtzmService.java | 5 +- .../da/dangan/service/IDaZfnyhkcgService.java | 5 +- .../com/da/dangan/service/IDaZqzService.java | 5 +- .../service/impl/DaBirthDjServiceImpl.java | 11 +- .../service/impl/DaCzrkdjServiceImpl.java | 49 +++-- .../dangan/service/impl/DaQyzServiceImpl.java | 10 +- .../service/impl/DaTaskServiceImpl.java | 132 +++++++++++- .../service/impl/DaYtzmServiceImpl.java | 10 +- .../service/impl/DaZfnyhkcgServiceImpl.java | 9 +- .../dangan/service/impl/DaZqzServiceImpl.java | 10 +- .../mapper/dangan/DaBirthDjMapper.xml | 18 ++ .../mapper/dangan/DaCzrkdjMapper.xml | 64 +----- .../resources/mapper/dangan/DaQyzMapper.xml | 27 ++- .../resources/mapper/dangan/DaYtzmMapper.xml | 18 +- .../mapper/dangan/DaZfnyhkcgMapper.xml | 19 +- .../resources/mapper/dangan/DaZqzMapper.xml | 27 ++- 34 files changed, 472 insertions(+), 214 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java index 744eff0..a119ce2 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java +++ b/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 list = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj); + List 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 daCzrkdjs) { + int result = 0; + for(DaCzrkdj czrkdj:daCzrkdjs){ + czrkdj.setCreateBy(getUsername()); + result= daCzrkdjService.insertDaCzrkdj(czrkdj); + } + return toAjax(result); + } + /** * 修改常住人口登记 */ diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java index f08ffb6..50a87cd 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java +++ b/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.DaCatalog; -import com.da.dangan.domain.DaCzrkdj; -import com.da.dangan.service.IDaCzrkdjService; +import com.da.common.core.domain.entity.SysUser; +import com.da.common.core.domain.model.LoginUser; +import com.da.common.core.page.TableDataInfo; +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("/list") - public AjaxResult list(DaCatalog daCatalog) - { - AjaxResult ajax = AjaxResult.success(); - ajax.put("czrkdj",null); - switch(daCatalog.getYwType()){ - case "0": - DaCzrkdj daCzrkdj = new DaCzrkdj(); - daCzrkdj.setMuId(daCatalog.getId()); - startPage(); - List 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; + @GetMapping("/ip") + public String getIp() { + String ipAddr = IpUtils.getIpAddr(); + return ipAddr; } /** - * 档案检索————————————————接口未用，前端分开判断调用每个表的list接口———————————————— - * keyword 关键字 ywTypes 勾选从哪些业务类型中查询 + * 查询常住人口登记列表 */ - // @PreAuthorize("@ss.hasPermi('dangan:czrkdj:list')") - @GetMapping("/listAll") - public AjaxResult listAll(@RequestParam("keyword") String keyword, @RequestParam("ywTypes")List ywTypes) - { - AjaxResult ajax = AjaxResult.success(); - ajax.put("czrkdj",null); - if(ywTypes!=null&&ywTypes.size()>0){ - if (ywTypes.contains("0")) { - DaCzrkdj daCzrkdj = new DaCzrkdj(); - daCzrkdj.setName(keyword); - startPage(); //分页关系到几个表的分页 - List czrkdjs = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj); - ajax.put("czrkdj",getDataTable(czrkdjs)); - } - //TODO 其他业务类型查询 + @PreAuthorize("@ss.hasPermi('dangan:czrkdj:list')") + @GetMapping("/czrk") + public TableDataInfo list(DaCzrkdj daCzrkdj) { + // 超管及角色为管理员显示所有目录信息 + LoginUser loginUser = getLoginUser(); + if (SysUser.isAdmin(getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + } else { + daCzrkdj.setUserId(getUserId()); } - return ajax; + startPage(); + List list = daCzrkdjService.searchDaCzrkdjList(daCzrkdj); + return getDataTable(list); } /** - * 查出来的数据做分页 - * @param keyword - * @param ywType - * @return + * 查询出生登记列表 */ - @GetMapping("/listPage") - public AjaxResult listPage(@RequestParam("keyword") String keyword, @RequestParam("ywType")String ywType) + @PreAuthorize("@ss.hasPermi('dangan:birthDJ:list')") + @GetMapping("/cszm") + public TableDataInfo list(DaBirthDj daBirthDj) { - AjaxResult ajax = AjaxResult.success(); - ajax.put("czrkdj",null); - switch(ywType){ - case "0": - DaCzrkdj daCzrkdj = new DaCzrkdj(); - daCzrkdj.setName(keyword); - startPage(); //分页关系到几个表的分页 - List czrkdjs = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj); - ajax.put("czrkdj",getDataTable(czrkdjs)); - break; - //TODO 其他业务类型查询 + // 超管及角色为管理员显示所有目录信息 + LoginUser loginUser = getLoginUser(); + if (SysUser.isAdmin(getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + }else{ + daBirthDj.setUserId(getUserId()); + } + startPage(); + List list = daBirthDjService.searchDaBirthDjList(daBirthDj); + return getDataTable(list); + } - case "1": - break; - case "2": - break; - case "3": - break; - case "4": - break; - case "5": - break; - default : - break; + /** + * 查询迁移证列表 + */ + @PreAuthorize("@ss.hasPermi('dangan:qyz:list')") + @GetMapping("/qyz") + public TableDataInfo list(DaQyz daQyz) { + // 超管及角色为管理员显示所有目录信息 + LoginUser loginUser = getLoginUser(); + if (SysUser.isAdmin(getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + }else{ + daQyz.setUserId(getUserId()); } - return ajax; + startPage(); + List 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 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 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 list = daZqzService.searchDaZqzList(daZqz); + return getDataTable(list); + } + } diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaTaskController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaTaskController.java index 977d89c..939a4dd 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaTaskController.java +++ b/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); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java index 851c223..8a5f649 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java +++ b/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; /** diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java index 1a1b5e5..3b8776e 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java +++ b/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; /** diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java index 68411b2..c9b3042 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java +++ b/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; /** diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java index 5baf75f..962fa9b 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java +++ b/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; /** diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java index 13be4ab..243d39a 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java +++ b/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 */ diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaBirthDjMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaBirthDjMapper.java index 28b9a21..95e22e1 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaBirthDjMapper.java +++ b/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 searchDaBirthDjList(DaBirthDj daBirthDj); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCzrkdjMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCzrkdjMapper.java index 9f1288f..a4ad18f 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCzrkdjMapper.java +++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCzrkdjMapper.java @@ -60,5 +60,5 @@ public interface DaCzrkdjMapper */ public int deleteDaCzrkdjByIds(Long[] ids); - List selectDaCzrkdjList1(DaCzrkdj daCzrkdj); + List searchDaCzrkdjList(DaCzrkdj daCzrkdj); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaQyzMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaQyzMapper.java index 59359b4..4544b6c 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaQyzMapper.java +++ b/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 searchDaQyzList(DaQyz daQyz); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaYtzmMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaYtzmMapper.java index 6caec7c..b223b7d 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaYtzmMapper.java +++ b/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 searchYtzmList(DaYtzm daYtzm); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZfnyhkcgMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZfnyhkcgMapper.java index 4ce96c5..7705360 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZfnyhkcgMapper.java +++ b/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 searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZqzMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZqzMapper.java index 317c39d..86731fd 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZqzMapper.java +++ b/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 searchDaZqzList(DaZqz daZqz); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java index 0fd19c6..a520c96 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java +++ b/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 searchDaBirthDjList(DaBirthDj daBirthDj); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java index 0c473b8..4eba610 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java +++ b/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 selectDaCzrkdjList1(DaCzrkdj daCzrkdj); + List searchDaCzrkdjList(DaCzrkdj daCzrkdj); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java index 98e697a..590d177 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java +++ b/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 searchDaQyzList(DaQyz daQyz); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaTaskService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaTaskService.java index 3f75c7a..39666d3 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaTaskService.java +++ b/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); /** * 删除识别任务记录信息 diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java index adb54b4..9b7aafc 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java +++ b/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 searchYtzmList(DaYtzm daYtzm); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java index 1212f86..d253d77 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java +++ b/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 searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java index 2427db5..f0e212e 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java +++ b/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 searchDaZqzList(DaZqz daZqz); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java index 2a92a14..d2d8d87 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java +++ b/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 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.setSuccessIds(StringUtils.join(successIds)); + daTask.setFailIds(StringUtils.join(failIds, ",")); + daTask.setSuccessIds(StringUtils.join(successIds, ",")); daTaskMapper.updateDaTask(daTask); } } @@ -143,4 +148,6 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService { return daBirthDjMapper.deleteDaBirthDjById(id); } + + } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java index cc081db..52ed337 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java +++ b/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 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 failIds = Stream.of(daTask.getFailIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); - List successIds = Stream.of(daTask.getSuccessIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); - //失败减少、成功增加 - 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.setSuccessIds(StringUtils.join(successIds)); + List failIds ; + List successIds = new ArrayList<>(); + String failId = daTask.getFailIds(); + String successId = daTask.getSuccessIds(); + if(failId!=null&&!failId.trim().equals("")){ + failIds = Stream.of(daTask.getFailIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + if(successId!=null&&!successId.trim().equals("")){ + 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 selectDaCzrkdjList1(DaCzrkdj daCzrkdj) { - return daCzrkdjMapper.selectDaCzrkdjList1(daCzrkdj); - } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java index f026b69..c5d5a80 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java +++ b/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 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.setSuccessIds(StringUtils.join(successIds)); + daTask.setFailIds(StringUtils.join(failIds, ",")); + daTask.setSuccessIds(StringUtils.join(successIds, ",")); daTaskMapper.updateDaTask(daTask); } } @@ -144,4 +149,5 @@ public class DaQyzServiceImpl implements IDaQyzService { return daQyzMapper.deleteDaQyzById(id); } + } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaTaskServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaTaskServiceImpl.java index 3258a99..6538137 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaTaskServiceImpl.java +++ b/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.dangan.mapper.DaTaskMapper; +import com.da.common.utils.SecurityUtils; +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) - { - return daTaskMapper.deleteDaTaskByIds(ids); + @Transactional + public AjaxResult deleteDaTaskByIds(Long[] 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 daCzrkdjs = daCzrkdjMapper.selectDaCzrkdjList(czrkdj); + if(daCzrkdjs!=null&&daCzrkdjs.size()>0){ + List 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 daBirthDjs = daBirthDjMapper.selectDaBirthDjList(birthDj); + if(daBirthDjs!=null&&daBirthDjs.size()>0){ + List 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 qyzs = daQyzMapper.selectDaQyzList(qyz); + if(qyzs!=null&&qyzs.size()>0){ + List 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 ytzms = daYtzmMapper.selectDaYtzmList(ytzm); + if(ytzms!=null&&ytzms.size()>0){ + List 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 zfnyhkcgs = daZfnyhkcgMapper.selectDaZfnyhkcgList(zfnyhkcg); + if(zfnyhkcgs!=null&&zfnyhkcgs.size()>0){ + List 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 zqzs = daZqzMapper.selectDaZqzList(zqz); + if(zqzs!=null&&zqzs.size()>0){ + List zqzIds = zqzs.stream().map(DaZqz::getId).collect(Collectors.toList()); + daZqzMapper.deleteDaZqzByIds(zqzIds.toArray(new Long[zqzIds.size()])); + } + break; + } + } + } + //修改任务对应的图片为未识别 + List 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 结果 */ diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java index 01f0b2f..a1ad1b4 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java +++ b/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 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.setSuccessIds(StringUtils.join(successIds)); + daTask.setFailIds(StringUtils.join(failIds, ",")); + daTask.setSuccessIds(StringUtils.join(successIds, ",")); daTaskMapper.updateDaTask(daTask); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java index 4afda7a..84652a9 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java +++ b/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 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.setSuccessIds(StringUtils.join(successIds)); + daTask.setFailIds(StringUtils.join(failIds, ",")); + daTask.setSuccessIds(StringUtils.join(successIds, ",")); daTaskMapper.updateDaTask(daTask); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java index 93191d8..03e2fab 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java +++ b/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 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.setSuccessIds(StringUtils.join(successIds)); + daTask.setFailIds(StringUtils.join(failIds, ",")); + daTask.setSuccessIds(StringUtils.join(successIds, ",")); daTaskMapper.updateDaTask(daTask); } } diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml index 170e893..d850a52 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml @@ -103,6 +103,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by id desc + + - - select distinct c.* from da_czrkdj c left join da_user_catalog uc on c.mu_id = uc.mu_id and uc.user_id = #{userId} - and task_id = #{taskId} - - and name !='无' and yw_type = #{ywType} - and c.mu_id = #{muId} - and mu_path = #{muPath} - and relation = #{relation} 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}, '%') ) - - and birthday like concat('%', #{birthday}, '%') - - - and card_id like concat('%', #{cardId}, '%') - - and other_name like concat('%', #{otherName}, '%') - and used_name like concat('%', #{usedName}, '%') - and sex = #{sex} - and jhr1 like concat('%', #{jhr1}, '%') - and jhgx1 = #{jhgx1} - and jhr2 like concat('%', #{jhr2}, '%') - and jhgx2 = #{jhgx2} - and gmcszqfrq = #{gmcszqfrq} - and address = #{address} - and yj = #{yj} - and nation like concat('%', #{nation}, '%') - and zjxy = #{zjxy} - and whcd = #{whcd} - and hyzk = #{hyzk} - and zyjfwcs = #{zyjfwcs} - and bxsqtzz = #{bxsqtzz} - and gmzdhhmqfjgjrq = #{gmzdhhmqfjgjrq} - and hsyhdqlbxshsdjhk = #{hsyhdqlbxshsdjhk} - and hsybxshcqlhsdjhk = #{hsybxshcqlhsdjhk} - and hshyqwhd = #{hshyqwhd} - and zxhkrq = #{zxhkrq} - and zxhkyy = #{zxhkyy} - and hkdjsxbgjznrsjjblrz1 = #{hkdjsxbgjznrsjjblrz1} - and hkdjsxbgjznrsjjblrz2 = #{hkdjsxbgjznrsjjblrz2} - and jiguan = #{jiguan} - and xzz = #{xzz} - and hz_name like concat('%', #{hzName}, '%') - and hb = #{hb} - and djrq = #{djrq} - and byzk = #{byzk} - and height = #{height} - and blood = #{blood} - and zy = #{zy} - and sl_reason = #{slReason} - and sljmsfzqm = #{sljmsfzqm} - and qfyj = #{qfyj} - and yxrq = #{yxrq} - and pic_ids = #{picIds} - and pictures = #{pictures} - and all_pic_ids = #{allPicIds} - and all_pics = #{allPics} - and error_correct = #{errorCorrect} - and audit_status = #{auditStatus} - and audit_name like concat('%', #{auditName}, '%') - and audit_result = #{auditResult} - and audit_reason = #{auditReason} order by id desc diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml index 7afeaf2..a33440c 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml @@ -73,9 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sex1 = #{sex1} and (card_id1 like concat('%', #{cardId1}, '%') - or cardId2 like concat('%', #{cardId1}, '%') - or cardId3 like concat('%', #{cardId1}, '%') - or cardId4 like concat('%', #{cardId1}, '%') + or card_id2 like concat('%', #{cardId1}, '%') + or card_id3 like concat('%', #{cardId1}, '%') + or card_id4 like concat('%', #{cardId1}, '%') ) and name2 = #{name2} @@ -105,7 +105,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by id desc - + + - + + - + + - + +