diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/EnterpriseComplaintController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/EnterpriseComplaintController.java deleted file mode 100644 index 7c33be84..00000000 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/EnterpriseComplaintController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.zdxt.enforcementcode.controller.app.enterprise; - -import com.zdxt.enforcementcode.domain.dto.enterprise.EnterpriseComplatintInsertDTO; -import com.zdxt.enforcementcode.domain.vo.enterprise.EnterpriseComplaintVo; -import com.zdxt.enforcementcode.service.enterprise.IEnterpriseComplaintService; -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.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** - * 企业端-投诉建议 - */ -@Tag(name = "企业端-投诉建议") -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/app-ent/complaint") -public class EnterpriseComplaintController extends BaseController { - - - @Autowired - private IEnterpriseComplaintService enterpriseComplaintService; - - /** - * 企业端-投诉建议-新增 - * @param - * @return - */ - @ApiResponse(description = "新增投诉建议") - @PostMapping("/add") - @ResponseBody - public R addSave(@RequestBody EnterpriseComplatintInsertDTO dto) { - return toAjax(enterpriseComplaintService.insertEnterpriseComplaint(dto)); - - } - - -} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java index 93c24cc2..e997cfe5 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java @@ -3,7 +3,7 @@ package com.zdxt.enforcementcode.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.EnforcementRegistration; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnforcementRegistrationQueryDTO; +import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; import org.apache.ibatis.annotations.Param; @@ -24,6 +24,6 @@ public interface EnforcementRegistrationMapper extends BaseMapperPlus selectEnforcementRegistrationPage(@Param("page") Page page, @Param("dto") AppEnforcementRegistrationQueryDTO dto); + IPage selectEnforcementRegistrationPage(@Param("page") Page page, @Param("dto") EnforcementRegistrationQueryDTO dto); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnforcementRegistrationMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnforcementRegistrationMapper.java index 37c490f4..356efa8f 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnforcementRegistrationMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnforcementRegistrationMapper.java @@ -2,21 +2,20 @@ package com.zdxt.enforcementcode.mapper.enterprise; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.domain.EnforcementRegistration; import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; -import com.zdxt.enforcementcode.domain.entity.enterprise.AppEnforcementRegistration; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo; -import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -public interface AppEnforcementRegistrationMapper extends BaseMapperPlus { +public interface AppEnforcementRegistrationMapper extends BaseMapperPlus { /** - * 分页查询执法登记列表 + * 分页查询执法案件列表 * * @param page 分页参数 * @param dto 查询条件 * @return 执法登记列表 */ - IPage selectEnforcementRegistrationPage(@Param("page") Page page, @Param("dto") EnforcementRegistrationQueryDTO dto); + IPage selectEnforcementRegistrationPage(@Param("page") Page page, @Param("dto") EnforcementRegistrationQueryDTO dto); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java index e101c269..eff0fc22 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java @@ -1,6 +1,6 @@ package com.zdxt.enforcementcode.service; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnforcementRegistrationQueryDTO; +import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; @@ -84,5 +84,5 @@ public interface IEnforcementRegistrationService { * @param pageQuery * @return */ - TableDataInfo queryEnforcementRegistrationPageList(AppEnforcementRegistrationQueryDTO dto, PageQuery pageQuery); + TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery); } 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 3ff22657..b0f54d80 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 @@ -3,7 +3,7 @@ package com.zdxt.enforcementcode.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnforcementRegistrationQueryDTO; +import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -370,7 +370,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } @Override - public TableDataInfo queryEnforcementRegistrationPageList(AppEnforcementRegistrationQueryDTO dto, PageQuery pageQuery) { + public TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery) { Page page = pageQuery.build(); IPage result = baseMapper.selectEnforcementRegistrationPage(page, dto); return TableDataInfo.build(result);