diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/enterprise_pub_qrcode/enterprisePubQrcodeQueryList.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/enterprise_pub_qrcode/enterprisePubQrcodeQueryList.html new file mode 100644 index 00000000..bcf9f982 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/enterprise_pub_qrcode/enterprisePubQrcodeQueryList.html @@ -0,0 +1,248 @@ + + + + + + +
+
+
+
+
+
    +
  • +

    企业名称：

    + +
    • +
  • +

    统一社会信用代码：

    + +
    • +
  • +

    所属区域：

    + +
    • +
  • +

    所属街道：

    + +
    • +
  • +

    匹配状态：

    + +
    • +
  • +

    下载情况：

    + +
    • +
  • +

    上传人：

    + +
    • +
  • +

    上传单位：

    + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterprisePubQrcodeController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterprisePubQrcodeController.java index 308594ee..708b96cf 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterprisePubQrcodeController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterprisePubQrcodeController.java @@ -23,6 +23,8 @@ import org.springframework.web.multipart.MultipartFile; import com.zdxt.code.domain.EnterprisePubQrcode; import com.zdxt.code.service.IEnterprisePubQrcodeService; +import com.zdxt.auth.project.system.dict.service.IDictDataService; +import com.zdxt.domain.auth.DictData; import javax.servlet.http.HttpServletResponse; @@ -46,6 +48,9 @@ public class EnterprisePubQrcodeController extends BaseController @Autowired private IEnterprisePubQrcodeService enterprisePubQrcodeService; + @Autowired + private IDictDataService iDictDataService; + @RequiresPermissions("code:pubQrcode:view") @GetMapping() public String pubQrcode() @@ -53,6 +58,12 @@ public class EnterprisePubQrcodeController extends BaseController return prefix + "/enterprisePubQrcodeList"; } + @GetMapping("/queryListPage") + public String pubQrcodeQueryList() + { + return prefix + "/enterprisePubQrcodeQueryList"; + } + /** * 查询送码入企信息列表 */ @@ -321,4 +332,48 @@ public class EnterprisePubQrcodeController extends BaseController return ZDResponse.error(e.getMessage()); } } + + /** + * 送码入企信息查询页面 + */ + @RequiresPermissions("code:pubQrcodeQuery:view") + @GetMapping("/queryPage") + public String pubQrcodeQueryPage() + { + return prefix + "/enterprisePubQrcodeQueryList"; + } + + /** + * 查询送码入企信息列表（含数据范围过滤） + */ + @RequiresPermissions("code:pubQrcodeQuery:list") + @PostMapping("/queryPageList") + @ResponseBody + public TableDataInfo queryPageList(EnterprisePubQrcode enterprisePubQrcode) + { + List list = enterprisePubQrcodeService.selectEnterprisePubQrcodeQueryList(enterprisePubQrcode); + return getDataTable(list); + } + + /** + * 获取区域字典数据 + */ + @GetMapping("/dictAreaList") + @ResponseBody + public ZDResponse dictAreaList() + { + List list = iDictDataService.selectDictDataByType("address_type"); + return ZDResponse.success("查询成功", list); + } + + /** + * 获取街道字典数据（根据区域dictValue作为dictType查询） + */ + @GetMapping("/dictStreetList") + @ResponseBody + public ZDResponse dictStreetList(String areaId) + { + List list = iDictDataService.selectDictDataByType(areaId); + return ZDResponse.success("查询成功", list); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterprisePubQrcodeMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterprisePubQrcodeMapper.java index eec14072..c2a29211 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterprisePubQrcodeMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterprisePubQrcodeMapper.java @@ -86,6 +86,14 @@ public interface EnterprisePubQrcodeMapper */ List selectEnterprisePubQrcodeByIds(String[] ids); + /** + * 查询送码入企信息列表（含数据范围过滤） + * + * @param enterprisePubQrcode 查询条件（params.areaNames用于数据范围过滤） + * @return 送码入企信息集合 + */ + List selectEnterprisePubQrcodeQueryList(EnterprisePubQrcode enterprisePubQrcode); + /** * 批量更新下载状态和备注 * diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterprisePubQrcodeService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterprisePubQrcodeService.java index 7bd2fe44..a691bb1e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterprisePubQrcodeService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterprisePubQrcodeService.java @@ -30,4 +30,12 @@ public interface IEnterprisePubQrcodeService { String generatePdfFile(String ids) throws Exception; int batchUpdateDownloadStatus(String ids, String downloadStatus, String remark); + + /** + * 查询送码入企信息列表（含数据范围过滤） + * + * @param enterprisePubQrcode 查询条件 + * @return 送码入企信息集合 + */ + List selectEnterprisePubQrcodeQueryList(EnterprisePubQrcode enterprisePubQrcode); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterprisePubQrcodeServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterprisePubQrcodeServiceImpl.java index 6b3c59bc..ed0107f6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterprisePubQrcodeServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterprisePubQrcodeServiceImpl.java @@ -33,9 +33,12 @@ import com.lowagie.text.pdf.PdfOutline; import com.lowagie.text.pdf.PdfPCell; import com.lowagie.text.pdf.PdfPTable; import com.lowagie.text.pdf.PdfWriter; +import com.zdxt.auth.dto.DeptBean; +import com.zdxt.auth.dto.RoleBean; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.FileUploadApi; import com.zdxt.auth.feign.UserApi; +import com.zdxt.auth.project.system.dept.mapper.DeptMapper; import com.zdxt.auth.project.system.dept.service.IDeptService; import com.zdxt.code.domain.EnterpriseInformation; import com.zdxt.code.mapper.EnterpriseInformationMapper; @@ -46,14 +49,17 @@ import com.zdxt.auth.project.system.dict.service.IDictDataService; import com.zdxt.common.config.RuoYiConfig; import com.zdxt.common.util.Constants; import com.zdxt.common.util.DateUtils; +import com.zdxt.common.util.PageUtil; import com.zdxt.common.util.StringUtils; import com.zdxt.domain.auth.Dept; import com.zdxt.domain.auth.DictData; +import org.apache.commons.collections.CollectionUtils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -110,6 +116,9 @@ public class EnterprisePubQrcodeServiceImpl implements IEnterprisePubQrcodeServi @Autowired private FileUploadApi fileUploadApi; + @Autowired + private DeptMapper deptMapper; + @Value("${ruoyi.profile}") private String filePath; @@ -916,6 +925,90 @@ public class EnterprisePubQrcodeServiceImpl implements IEnterprisePubQrcodeServi return enterprisePubQrcodeMapper.batchUpdateDownloadStatus(idArray, downloadStatus, remark); } + /** + * 查询送码入企信息列表（含数据范围过滤） + * + * @param enterprisePubQrcode 查询条件 + * @return 送码入企信息集合 + */ + @Override + public List selectEnterprisePubQrcodeQueryList(EnterprisePubQrcode enterprisePubQrcode) + { + List checkDept = check(); + if (checkDept != null && checkDept.isEmpty()) + { + return new ArrayList<>(); + } + if (checkDept != null) + { + List deptIds = new ArrayList<>(); + for (DeptBean deptBean : checkDept) + { + deptIds.add(deptBean.getDeptId()); + } + enterprisePubQrcode.getParams().put("deptIds", deptIds); + } + PageUtil.startPage(); + return enterprisePubQrcodeMapper.selectEnterprisePubQrcodeQueryList(enterprisePubQrcode); + } + + /** + * 数据范围校验：根据当前用户角色的dataScope判断可查询的数据范围 + * 参考 EnterpriseInformationServiceImpl.check 方法 + * + * @return null表示全部可见，空集合表示无权限，非空集合表示可见的部门（区域）列表 + */ + private List check() + { + UserBean currentUser = userApi.getCurrentUser(); + List deptBeans = new ArrayList<>(); + if (currentUser.isAdmin()) + { + return null; + } + for (RoleBean role : currentUser.getRoles()) + { + String dataScope = role.getDataScope(); + if ("2".equals(dataScope)) + { + List depts = deptMapper.selectDeptByRoleId(role.getRoleId()); + if (CollectionUtils.isNotEmpty(depts)) + { + for (Dept dept : depts) + { + DeptBean deptBean = new DeptBean(); + BeanUtils.copyProperties(dept, deptBean); + deptBeans.add(deptBean); + } + } + } + else if ("3".equals(dataScope)) + { + Dept dept = deptMapper.selectDeptById(currentUser.getDeptId()); + if (java.util.Objects.nonNull(dept)) + { + DeptBean deptBean = new DeptBean(); + BeanUtils.copyProperties(dept, deptBean); + deptBeans.add(deptBean); + } + } + else if ("4".equals(dataScope)) + { + List depts = deptMapper.selectSelfAndChildrenById(currentUser.getDeptId()); + if (CollectionUtils.isNotEmpty(depts)) + { + for (Dept dept : depts) + { + DeptBean deptBean = new DeptBean(); + BeanUtils.copyProperties(dept, deptBean); + deptBeans.add(deptBean); + } + } + } + } + return deptBeans; + } + /** * 生成并存储蓝色二维码（带LOGO），同时写入qr_code_generate_history表 * diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterprisePubQrcodeMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterprisePubQrcodeMapper.xml index f2753544..e5bfffa3 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterprisePubQrcodeMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterprisePubQrcodeMapper.xml @@ -88,6 +88,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by import_row_num asc + + insert into enterprise_pub_qrcode