投诉建议优化

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<AppEnterpriseComplaintVo> list(@ModelAttribute AppEnterpriseComplaintBo bo, PageQuery pageQuery) {
+        EnterpriseInformationVo enterpriseInformationVo =  enterpriseInformationService.queryById(LoginHelper.getDeptId());
+        if(enterpriseInformationVo !=  null){
+            bo.setEnterpriseNumber(enterpriseInformationVo.getEnterpriseNumber());
+        }
         TableDataInfo<AppEnterpriseComplaintVo> list = appEnterpriseComplaintService.queryPageList(bo, pageQuery);
         return list;
     }

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<AppEnterpriseComplaintVo> queryPageList(AppEnterpriseComplaintBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<EnterpriseComplaint> 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<AppEnterpriseComplaintVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }