Commit bebcde76 by huangZW

111

parent 9cd3cb6b
...@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.dao.mapper; ...@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.dao.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.TabHaobanAudit; import com.gic.haoban.manage.service.entity.TabHaobanAudit;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
...@@ -18,7 +20,7 @@ public interface TabHaobanAuditMapper { ...@@ -18,7 +20,7 @@ public interface TabHaobanAuditMapper {
int updateByPrimaryKey(TabHaobanAudit record); int updateByPrimaryKey(TabHaobanAudit record);
Page<TabHaobanAudit> page(Integer auditType, List<String> storeIds,List<String>staffIds,String wxEnterpriseId, String enterpriseId,Integer auditStatus ); Page<TabHaobanAudit> page(@Param("auditType")Integer auditType, @Param("storeIds")List<String> storeIds,@Param("staffIds")List<String>staffIds,@Param("wxEnterpriseId")String wxEnterpriseId, @Param("enterpriseId")String enterpriseId,@Param("auditStatus")Integer auditStatus );
List<TabHaobanAudit> listByStoreId(String storeId); List<TabHaobanAudit> listByStoreId(String storeId);
......
...@@ -69,6 +69,9 @@ public class AuditController extends WebBaseController{ ...@@ -69,6 +69,9 @@ public class AuditController extends WebBaseController{
if(auditStatus == null){ if(auditStatus == null){
return resultResponse(HaoBanErrCode.ERR_2); return resultResponse(HaoBanErrCode.ERR_2);
} }
if(StringUtils.isAnyBlank(wxEnterpriseId)){
return resultResponse(HaoBanErrCode.ERR_2);
}
Page<AuditDTO> page = auditApiService.page(auditType, search, wxEnterpriseId,enterpriseId, auditStatus, pageInfo); Page<AuditDTO> page = auditApiService.page(auditType, search, wxEnterpriseId,enterpriseId, auditStatus, pageInfo);
return resultResponse(HaoBanErrCode.ERR_1,page); return resultResponse(HaoBanErrCode.ERR_1,page);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment