diff --git a/script/sql/zfjd-refactoring-v1/其他/njy/njy.sql b/script/sql/zfjd-refactoring-v1/其他/njy/njy.sql index 2d45a038..3fde0389 100644 --- a/script/sql/zfjd-refactoring-v1/其他/njy/njy.sql +++ b/script/sql/zfjd-refactoring-v1/其他/njy/njy.sql @@ -1,3 +1,5 @@ ALTER TABLE enterprise_complaint ADD COLUMN detailed_address varchar(200) DEFAULT NULL COMMENT '详细地址' AFTER enterprise_address; + +ALTER TABLE enforcement_inspection_program ADD COLUMN create_by_name VARCHAR(64) COMMENT '创建人姓名'; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfEvaluateController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfEvaluateController.java index 0538699b..2d10ecdc 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfEvaluateController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfEvaluateController.java @@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -37,6 +38,7 @@ public class AppEnfEvaluateController extends BaseController { */ @GetMapping("/queryEvaluateList") public TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryBo bo, PageQuery pageQuery) { + bo.setLawEnforcementId(LoginHelper.getDeptId()); return enforcementRegistrationService.queryEnforcementRegistrationPageList(bo, pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementInspectionProgramController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementInspectionProgramController.java index 2ab112e4..333962ba 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementInspectionProgramController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementInspectionProgramController.java @@ -64,6 +64,7 @@ public class AppEnforcementInspectionProgramController extends BaseController { @SaIgnore @GetMapping("/selectInspectionProgramList") public TableDataInfo selectInspectionProgramList(EnforcementInspectionProgramBo bo, PageQuery pageQuery) { + bo.setEnforcementDepartmentId(LoginHelper.getDeptId()); return enforcementInspectionProgramService.selectEnforcementInspectionProgramPage(bo, pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java index ee6bf117..abaaee95 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java @@ -542,7 +542,6 @@ public class AppEnforcementRegistrationController extends BaseController { @GetMapping("/list") public TableDataInfo list(EnforcementRegistrationBo bo, PageQuery pageQuery) { long startTime = System.currentTimeMillis(); - // 校验分页参数，防止全量查询 if (pageQuery.getPageSize() == null || pageQuery.getPageSize() <= 0) { pageQuery.setPageSize(10); @@ -551,6 +550,7 @@ public class AppEnforcementRegistrationController extends BaseController { pageQuery.setPageNum(1); } + bo.setLawEnforcementId(LoginHelper.getDeptId()); // 使用标准的分页查询方法 TableDataInfo pageResult = DataPermissionHelper.ignore(() -> enforcementRegistrationService.queryPageList(bo, pageQuery) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java index 38aca724..f7b70e1f 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java @@ -8,6 +8,7 @@ import com.zdxt.enforcementcode.service.enterprise.IAppLawEnforcementCaseService import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; @@ -60,7 +61,8 @@ public class AppEntLawEnforcementCaseController extends BaseController { @ApiResponse(description = "企业端-执法信息详情") @GetMapping("/lawDetail") public AppEnforcementRegistrationVo lawDetail(AppLawEnforcementCaseBo bo) { - return appLawEnforcementCaseService.selectAppLawEnforcementLawDetailById(bo); + return null; +// return appLawEnforcementCaseService.selectAppLawEnforcementLawDetailById(bo); } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java index 8c3c4834..71fd3e46 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java @@ -2,8 +2,10 @@ package com.zdxt.enforcementcode.controller.app.enterprise; import com.zdxt.enforcementcode.domain.bo.MssqOrderFlowBo; import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseComplaintBo; +import com.zdxt.enforcementcode.domain.vo.EnterpriseInformationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo; +import com.zdxt.enforcementcode.service.IEnterpriseInformationService; import com.zdxt.enforcementcode.service.enterprise.IAppEnterpriseComplaintService; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; @@ -12,6 +14,7 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -32,6 +35,8 @@ public class AppEnterpriseComplaintController extends BaseController { @Autowired private IAppEnterpriseComplaintService appEnterpriseComplaintService; + @Autowired + private IEnterpriseInformationService enterpriseInformationService; /** * 企业端-投诉建议-新增 * @param @@ -53,6 +58,10 @@ public class AppEnterpriseComplaintController extends BaseController { @ApiResponse(description = "投诉建议列表") @GetMapping("/list") public TableDataInfo list(@ModelAttribute AppEnterpriseComplaintBo bo, PageQuery pageQuery) { + EnterpriseInformationVo enterpriseInformationVo = enterpriseInformationService.queryById(LoginHelper.getDeptId()); + if(enterpriseInformationVo != null){ + bo.setEnterpriseNumber(enterpriseInformationVo.getEnterpriseNumber()); + } TableDataInfo list = appEnterpriseComplaintService.queryPageList(bo, pageQuery); return list; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationQueryBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationQueryBo.java index f7806883..1a4eaafc 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationQueryBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationQueryBo.java @@ -11,6 +11,11 @@ public class EnforcementRegistrationQueryBo implements Serializable { */ private String lawEnforcement; + /** + * 执法部门ID + */ + private String lawEnforcementId; + /** * 执法事项 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java index 683cf668..9bb995da 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java @@ -104,7 +104,9 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain @Override public TableDataInfo queryPageList(AppEnterpriseComplaintBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getRelId()), EnterpriseComplaint::getRelId, bo.getRelId()).orderByDesc(EnterpriseComplaint::getCreateTime); + lqw.eq(StringUtils.isNotBlank(bo.getRelId()), EnterpriseComplaint::getRelId, bo.getRelId()) + .eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), EnterpriseComplaint::getEnterpriseNumber, bo.getEnterpriseNumber()) + .orderByDesc(EnterpriseComplaint::getCreateTime); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index 05a6ef86..cba310b8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -873,6 +873,10 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), EnforcementRegistration::getBureauDeptId, bo.getBureauDeptId()); + // 执法部门ID过滤 + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementId()), + EnforcementRegistration::getLawEnforcementId, bo.getLawEnforcementId()); + // 按执法时间倒序 lqw.orderByDesc(EnforcementRegistration::getEnforcementTime); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml index 4c27dee4..46ada94d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml @@ -147,6 +147,10 @@ AND law_enforcement = #{bo.lawEnforcement} + + + AND law_enforcement_id = #{bo.lawEnforcementId} + AND law_enforcement_item LIKE CONCAT('%', #{bo.lawEnforcementItem}, '%') diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue index 35b39a6e..b5ee604c 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementEvaluateList.vue @@ -161,6 +161,7 @@ const onClickLeft = () => { // ========== 组件挂载时加载数据 ========== onMounted(() => { + loading.value = true; fetchList(); });