diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html new file mode 100644 index 00000000..6170605e --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html @@ -0,0 +1,332 @@ + + + + + + + + +
+
+
+
+
+
    +
  • +

    企业名称：

    + +
    • +
  • +

    检查次数：

    + +
    • + +
  • +

    检查时间：

    + + - + + +
    • +
  • +  搜索 +  重置 + +
    • +
+
+
+
+
+ 近30天被检查企业数量：家 总检查次数：次 +
+
当筛选起止日期为同年同月时有统计
+
+
+
+
+ × +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java index 941266a2..51e25ec1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java @@ -13,6 +13,8 @@ import java.util.function.Function; import java.util.stream.Collectors; import cn.hutool.core.util.StrUtil; +import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.project.system.dept.service.IDeptService; import com.zdxt.auth.project.system.dict.mapper.DictDataMapper; import com.zdxt.auth.project.system.dict.service.IDictDataService; @@ -26,6 +28,7 @@ import com.zdxt.code.service.EnforcementCheckStatisticsService; import com.zdxt.code.service.ILinkageDictService; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.ExcelUtils; import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.TableDataInfo; @@ -72,6 +75,9 @@ public class EnforcementRegistrationController extends BaseController @Autowired private DictDataMapper dictDataMapper; + @Autowired + private UserApi userApi; + @RequiresPermissions("code:registration:view") @GetMapping() public String registration(Model model) @@ -340,6 +346,48 @@ public class EnforcementRegistrationController extends BaseController List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); return ZDResponse.success("查询成功",list); } + + /** + * 查询执法端-执法登记列表 + */ + @PostMapping("/queryListNew") + @ResponseBody + public TableDataInfo queryListNew(EnforcementRegistration enforcementRegistration) + { + if (StringUtils.isEmpty(enforcementRegistration.getBeginTime()) + && StringUtils.isEmpty(enforcementRegistration.getEndTime())) { + enforcementRegistration.setBeginTime(DateUtils.getPastTimes(30)); + enforcementRegistration.setEndTime(DateUtils.dateTimeNow("yyyy-MM-dd")); + } + //查询检查总次数 + List registrations = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration); + int count = 0; + if (registrations.size() >0) { + count = registrations.stream().map(item -> Integer.valueOf(item.getNum())).reduce(0, Integer::sum); + } + UserBean userByUserId = userApi.getCurrentUser(); + enforcementRegistration.setDeptId(userByUserId == null ? null : userByUserId.getDeptId()); + startPage(); + List list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration); + TableDataInfo dataTable = getDataTable(list); + dataTable.setMsg(count); + return dataTable; + } + + @PostMapping("/queryByEpId") + @ResponseBody + public TableDataInfo queryByEpId(EnforcementRegistration enforcementRegistration) + { + if (StringUtils.isEmpty(enforcementRegistration.getBeginTime()) + && StringUtils.isEmpty(enforcementRegistration.getEndTime())) { + enforcementRegistration.setBeginTime(DateUtils.getPastTimes(30)); + enforcementRegistration.setEndTime(DateUtils.dateTimeNow("yyyy-MM-dd")); + } + startPage(); + List list = enforcementRegistrationService.selectEnforcementRegistrationByEpId(enforcementRegistration); + return getDataTable(list); + } + @RequiresPermissions("code:registration:list") @PostMapping("/echarts1") @ResponseBody diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LawEnforcementWarningListController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LawEnforcementWarningListController.java index 50f5abd1..579632d6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LawEnforcementWarningListController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LawEnforcementWarningListController.java @@ -53,7 +53,7 @@ public class LawEnforcementWarningListController extends BaseController @GetMapping() public String LawEnforcementWarningList() { - return prefix + "/LawEnforcementWarningList"; + return "/project/code/registration/registerView"; } /** diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 64065844..a470e420 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -238,6 +238,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t.num <= #{numRight} + + and t.num >= #{num} +