Browse Source

信息审核添加部门筛选

master
Jackwang 3 years ago
parent
commit
1a1b961c6c
  1. 2
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java
  2. 3
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java
  3. 2
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java
  4. 7
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java
  5. 26
      epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml

2
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java

@ -49,7 +49,7 @@ public class EpidemicUserInfoAuditController {
@GetMapping("page") @GetMapping("page")
public Result<PageData<EpidemicUserInfoAuditDTO>> page(@RequestParam Map<String, Object> params){ public Result<PageData<EpidemicUserInfoAuditDTO>> page(@RequestParam Map<String, Object> params){
PageData<EpidemicUserInfoAuditDTO> page = epidemicUserInfoAuditService.page(params); PageData<EpidemicUserInfoAuditDTO> page = epidemicUserInfoAuditService.getPageList(params);
return new Result<PageData<EpidemicUserInfoAuditDTO>>().ok(page); return new Result<PageData<EpidemicUserInfoAuditDTO>>().ok(page);
} }

3
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java

@ -25,6 +25,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 疫情防控信息表 * 疫情防控信息表
@ -55,4 +56,6 @@ public interface EpidemicUserInfoAuditDao extends BaseDao<EpidemicUserInfoAuditE
* @date 2022/6/30 14:12 * @date 2022/6/30 14:12
*/ */
List<FamilyMemberInfoResultDTO> listByUnitId(@Param("unitId") Long unitId, @Param("existIdCard") List<String> existIdCard); List<FamilyMemberInfoResultDTO> listByUnitId(@Param("unitId") Long unitId, @Param("existIdCard") List<String> existIdCard);
List<EpidemicUserInfoAuditDTO> getPageList(Map<String, Object> params);
} }

2
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java

@ -126,4 +126,6 @@ public interface EpidemicUserInfoAuditService extends BaseService<EpidemicUserIn
* @date 2022-06-29 * @date 2022-06-29
*/ */
void delete(String[] ids); void delete(String[] ids);
PageData<EpidemicUserInfoAuditDTO> getPageList(Map<String, Object> params);
} }

7
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java

@ -163,4 +163,11 @@ public class EpidemicUserInfoAuditServiceImpl extends BaseServiceImpl<EpidemicUs
baseDao.deleteBatchIds(Arrays.asList(ids)); baseDao.deleteBatchIds(Arrays.asList(ids));
} }
@Override
public PageData<EpidemicUserInfoAuditDTO> getPageList(Map<String, Object> params) {
IPage<EpidemicUserInfoAuditDTO> page = getPage(params);
List<EpidemicUserInfoAuditDTO> list = baseDao.getPageList(params);
return new PageData<>(list, page.getTotal());
}
} }

26
epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml

@ -75,4 +75,30 @@
</foreach> </foreach>
</if> </if>
</select> </select>
<select id="getPageList" resultType="com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO">
select * from epidemic_user_info_audit
WHERE
DEL_FLAG = '0'
<if test="userName != '' and userName != null">
AND USER_NAME like '%${userName}%'
</if>
<if test="idCard != '' and idCard != null">
AND ID_CARD like '%${idCard}%'
</if>
<if test="auditState != '' and auditState != null">
AND AUDIT_STATE = #{auditState}
</if>
<if test="streetId != '' and streetId != null">
AND (find_in_set(#{streetId},PARENT_DEPT_IDS)
OR find_in_set(#{streetId},ALL_DEPT_IDS))
</if>
<if test="communityId != '' and communityId != null">
AND (find_in_set(#{communityId},PARENT_DEPT_IDS)
OR find_in_set(#{communityId},ALL_DEPT_IDS))
</if>
<if test="gridId != '' and gridId != null">
and find_in_set(#{gridId},ALL_DEPT_IDS)
</if>
order by CREATED_TIME desc
</select>
</mapper> </mapper>
Loading…
Cancel
Save