fix

zzbusiness-common/src/main/java/org/zhongzheng/common/mybatisplus/MybatisPlusConfig.java

@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@MapperScan("org.zhongzheng.**.mapper.**")
+//@MapperScan("org.zhongzheng.*.domian")
 public class MybatisPlusConfig {
 
 	@Bean

zzbusiness-gateway/src/main/java/org/zhongzheng/gateway/provider/AuthProvider.java

@@ -47,7 +47,7 @@ public class AuthProvider {
 		DEFAULT_SKIP_URL.add("/error/**");
 		DEFAULT_SKIP_URL.add("/assets/**");
 		DEFAULT_SKIP_URL.add("/zzbusiness-user/**");
-		DEFAULT_SKIP_URL.add("/zzbusiness-info/system/company/**");
+		DEFAULT_SKIP_URL.add("/zzbusiness-info/**");
 	}
 
 	/**

zzbusiness-info/src/main/java/org/zhongzheng/info/config/MybatisPlusConfig.java

@@ -0,0 +1,23 @@
+package org.zhongzheng.info.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     * 新增分页拦截器，并设置数据库类型为mysql
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 向Mybatis过滤器链中添加分页拦截器
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+
+}

zzbusiness-info/src/main/java/org/zhongzheng/info/controller/staff/StaffController.java

@@ -2,9 +2,11 @@ package org.zhongzheng.info.controller.staff;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.java.Log;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -12,6 +14,7 @@ import org.zhongzheng.common.utils.R;
 import org.zhongzheng.info.bo.staff.StaffAddBo;
 import org.zhongzheng.info.bo.staff.StaffEditBo;
 import org.zhongzheng.info.bo.staff.StaffQueryBo;
+import org.zhongzheng.info.domain.staff.Staff;
 import org.zhongzheng.info.service.staff.IStaffService;
 import org.zhongzheng.info.vo.staff.StaffVo;
 
@@ -36,7 +39,10 @@ public class StaffController {
      */
     @GetMapping("/staffList")
     public R<IPage<StaffVo>> list(StaffQueryBo bo) {
-        IPage<StaffVo> list = iStaffService.selectStaffList(bo);
+        Page<StaffVo> staffPage = new Page<>();
+        staffPage.setCurrent(bo.getPageNum());
+        staffPage.setSize(bo.getPageSize());
+        IPage<StaffVo> list = iStaffService.selectStaffList(staffPage,bo);
         return R.data(list);
     }
 

zzbusiness-info/src/main/java/org/zhongzheng/info/mapper/company/CompanyCertificateMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.zhongzheng.info.bo.company.CompanyCertificateQueryBo;
 import org.zhongzheng.info.domain.company.CompanyCertificate;
 import org.zhongzheng.info.vo.company.CompanyCertificateVo;
@@ -17,6 +18,6 @@ import org.zhongzheng.info.vo.company.CompanyCertificateVo;
  */
 @Mapper
 public interface CompanyCertificateMapper extends BaseMapper<CompanyCertificate> {
-    IPage<CompanyCertificateVo> selectCompanyCertificate(Page page, CompanyCertificateQueryBo bo);
+    IPage<CompanyCertificateVo> selectCompanyCertificate(@Param("page") IPage<CompanyCertificate> page,@Param("bo") CompanyCertificateQueryBo bo);
 
 }

zzbusiness-info/src/main/java/org/zhongzheng/info/mapper/staff/StaffCertificateMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.zhongzheng.info.bo.staff.StaffCertificateQueryBo;
 import org.zhongzheng.info.domain.staff.StaffCertificate;
 import org.zhongzheng.info.vo.staff.StaffCertificateVo;
@@ -19,6 +20,6 @@ import java.util.List;
  */
 @Mapper
 public interface StaffCertificateMapper extends BaseMapper<StaffCertificate> {
-    IPage<StaffCertificateVo> selectAllByCertificate(StaffCertificateQueryBo bo, Page page);
+    IPage<StaffCertificateVo> selectAllByCertificate( @Param("page") IPage<StaffCertificate> page,@Param("bo") StaffCertificateQueryBo bo);
 
 }

zzbusiness-info/src/main/java/org/zhongzheng/info/mapper/staff/StaffMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.zhongzheng.info.bo.staff.StaffQueryBo;
 import org.zhongzheng.info.domain.staff.Staff;
 import org.zhongzheng.info.vo.staff.StaffVo;
@@ -20,6 +21,6 @@ import java.util.List;
 @Mapper
 public interface StaffMapper extends BaseMapper<Staff> {
 
-    IPage<StaffVo> selectAllStaffList(StaffQueryBo bo, Page page);
+    IPage<StaffVo> selectAllStaffList(@Param("page") IPage<StaffVo> page,@Param("bo") StaffQueryBo bo);
 
 }

zzbusiness-info/src/main/java/org/zhongzheng/info/service/company/impl/CompanyServiceImpl.java

@@ -79,7 +79,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         Page<Company> page = page(new Page<>(bo.getPageNum(), bo.getPageSize()), lqw);
         List<Company> companyList = page.getRecords();
         ArrayList<CompanyVo> companyVos = new ArrayList<>();
-
         if (ObjectUtil.isNotEmpty(companyList)){
             companyList.forEach(item->{
                 CompanyVo bean = BeanUtil.toBean(item, CompanyVo.class);

zzbusiness-info/src/main/java/org/zhongzheng/info/service/staff/IStaffService.java

@@ -50,7 +50,7 @@ public interface IStaffService extends IService<Staff> {
 	 * @param bo 主键集合
 	 * @return
 	 */
-	IPage<StaffVo> selectStaffList(StaffQueryBo bo);
+	IPage<StaffVo> selectStaffList( IPage<StaffVo> page,StaffQueryBo bo);
 	/**
 	 * 文档导入员工列表
 	 * @param file 主键集合

zzbusiness-info/src/main/java/org/zhongzheng/info/service/staff/impl/StaffCertificateServiceImpl.java

@@ -56,7 +56,7 @@ public class StaffCertificateServiceImpl extends ServiceImpl<StaffCertificateMap
 
     @Override
     public IPage<StaffCertificateVo> queryList(StaffCertificateQueryBo bo) {
-        IPage<StaffCertificateVo> staffCertificateVos = this.baseMapper.selectAllByCertificate(bo,new Page(bo.getPageNum(),bo.getPageSize()));
+        IPage<StaffCertificateVo> staffCertificateVos = this.baseMapper.selectAllByCertificate(new Page(bo.getPageNum(),bo.getPageSize()),bo);
         List<StaffCertificateVo> records = staffCertificateVos.getRecords();
         if (CollectionUtils.isEmpty(records)) {
             return new Page<>();

zzbusiness-info/src/main/java/org/zhongzheng/info/service/staff/impl/StaffServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import org.zhongzheng.common.mybatisplus.Condition;
 import org.zhongzheng.common.utils.CustomException;
 import org.zhongzheng.common.utils.DateUtils;
 import org.zhongzheng.common.utils.poi.EasyPoiUtil;
@@ -211,8 +212,10 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
     }
 
     @Override
-    public IPage<StaffVo> selectStaffList(StaffQueryBo bo) {
-        IPage<StaffVo> staffVos = this.baseMapper.selectAllStaffList(bo,new Page(bo.getPageNum(),bo.getPageSize()));
+    public IPage<StaffVo> selectStaffList(IPage<StaffVo> page,StaffQueryBo bo) {
+        page.setCurrent(bo.getPageNum());
+        page.setSize(bo.getPageSize());
+        IPage<StaffVo> staffVos = this.baseMapper.selectAllStaffList(page,bo);
         List<StaffVo> records = staffVos.getRecords();
         records.forEach(item -> {
             List<StaffEduBg> staffEduBgList = iStaffEduBgService.list(new LambdaQueryWrapper<StaffEduBg>().eq(StaffEduBg::getStaffId, item.getStaffId()));

zzbusiness-info/src/main/java/org/zhongzheng/info/wapper/CompanyWrapper.java

@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.zhongzheng.info.wapper;
+
+import org.zhongzheng.common.feignclient.zzbusinessuser.entity.User;
+import org.zhongzheng.common.mybatisplus.BaseEntityWrapper;
+import org.zhongzheng.common.utils.BeanUtil;
+import org.zhongzheng.common.utils.Func;
+import org.zhongzheng.common.utils.SpringUtil;
+import org.zhongzheng.info.domain.company.Company;
+import org.zhongzheng.info.service.company.ICompanyService;
+import org.zhongzheng.info.vo.company.CompanyVo;
+
+import java.util.List;
+
+/**
+ * 包装类,返回视图层所需的字段
+ *
+ * @author Chill
+ */
+public class CompanyWrapper extends BaseEntityWrapper<Company, CompanyVo> {
+
+	private static ICompanyService iCompanyService;
+
+	static {
+		iCompanyService = SpringUtil.getBean(ICompanyService.class);
+	}
+
+	public static CompanyWrapper build() {
+		return new CompanyWrapper();
+	}
+
+
+	@Override
+	public CompanyVo entityVO(Company entity) {
+		CompanyVo userVO = BeanUtil.copy(entity, CompanyVo.class);
+
+		return userVO;
+	}
+}

zzbusiness-info/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: ZZBUSINESS-INfO
   main:
-        allow-bean-definition-overriding: true  # 后来发现的bean会覆盖之前相同名称的bean
+    allow-bean-definition-overriding: true  # 后来发现的bean会覆盖之前相同名称的bean
   datasource:
     url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
@@ -41,6 +41,7 @@ mybatis-plus:
     # 自动驼峰命名规则（camel case）映射
     # 如果您的数据库命名符合规则无需使用 @TableField 注解指定数据库字段名
     mapUnderscoreToCamelCase: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
     # 默认枚举处理类,如果配置了该属性,枚举将统一使用指定处理器进行处理
     # org.apache.ibatis.type.EnumTypeHandler : 存储枚举的名称
     # org.apache.ibatis.type.EnumOrdinalTypeHandler : 存储枚举的索引

zzbusiness-info/src/main/resources/mapper/company/CompanyCertificateMapper.xml

@@ -65,29 +65,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCompanyCertificate" parameterType="org.zhongzheng.info.vo.company.CompanyCertificateVo" resultMap="CompanyCertificateResultVo">
         select *
         from company_certificate cc where cc.status=1
-        <if test="certificateType != null">
-            AND cc.certificate_type = #{certificateType}
+        <if test="bo.certificateType != null">
+            AND cc.certificate_type = #{bo.certificateType}
         </if>
-        <if test="documentType != null">
-            AND cc.document_type = #{documentType}
+        <if test="bo.documentType != null">
+            AND cc.document_type = #{bo.documentType}
         </if>
-        <if test="companyName != null">
-            AND cc.company_name = #{companyName}
+        <if test="bo.companyName != null">
+            AND cc.company_name = #{bo.companyName}
         </if>
-        <if test="creditCode != null">
-            AND cc.credit_code = #{creditCode}
+        <if test="bo.creditCode != null">
+            AND cc.credit_code = #{bo.creditCode}
         </if>
-        <if test="warningStatus != null">
-            AND cc.warning_status = #{warningStatus}
+        <if test="bo.warningStatus != null">
+            AND cc.warning_status = #{bo.warningStatus}
         </if>
-        <if test="legalRepresentative != null">
-            AND cc.legal_representative = #{legalRepresentative}
+        <if test="bo.legalRepresentative != null">
+            AND cc.legal_representative = #{bo.legalRepresentative}
         </if>
-        <if test="certificateName != null">
-            AND cc.certificate_name = #{certificateName}
+        <if test="bo.certificateName != null">
+            AND cc.certificate_name = #{bo.certificateName}
         </if>
-        <if test="certificateNumber != null">
-            AND cc.certificate_number = #{certificateNumber}
+        <if test="bo.certificateNumber != null">
+            AND cc.certificate_number = #{bo.certificateNumber}
         </if>
         order by cc.create_time desc
     </select>

zzbusiness-info/src/main/resources/mapper/staff/StaffCertificateMapper.xml

@@ -53,27 +53,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="staffName" column="staff_name"/>
         <result property="idCard" column="id_card"/>
     </resultMap>
-    <select id="selectAllByCertificate" parameterType="org.zhongzheng.info.bo.staff.StaffCertificateQueryBo" resultMap="StaffCertificateResultVo">
+    <select id="selectAllByCertificate"  resultMap="StaffCertificateResultVo">
         select *,sc.create_time AS addtime
         from staff_certificate sc left join staff s
             on sc.staff_id = s.staff_id where sc.status=1 and s.status=1
-        <if test="certificateType != null and certificateType != ''">
-            AND sc.certificate_type = #{certificateType}
+        <if test="bo.certificateType != null and bo.certificateType != ''">
+            AND sc.certificate_type = #{bo.certificateType}
         </if>
-        <if test="staffName != null and staffName != ''">
-            AND s.staff_name = #{staffName}
+        <if test="bo.staffName != null and bo.staffName != ''">
+            AND s.staff_name = #{bo.staffName}
         </if>
-        <if test="companyName != null and companyName != ''">
-            AND s.company_name = #{companyName}
+        <if test="bo.companyName != null and bo.companyName != ''">
+            AND s.company_name = #{bo.companyName}
         </if>
-        <if test="idCard != null and idCard != ''">
-            AND s.id_card = #{idCard}
+        <if test="bo.idCard != null and bo.idCard != ''">
+            AND s.id_card = #{bo.idCard}
         </if>
-        <if test="warningStatus != null and warningStatus != ''">
-            AND sc.warning_status = #{warningStatus}
+        <if test="bo.warningStatus != null and bo.warningStatus != ''">
+            AND sc.warning_status = #{bo.warningStatus}
         </if>
-        <if test="certificateNumber != null and certificateNumber != ''">
-            AND sc.certificate_number = #{certificateNumber}
+        <if test="bo.certificateNumber != null and bo.certificateNumber != ''">
+            AND sc.certificate_number = #{bo.certificateNumber}
         </if>
         order by sc.create_time desc
     </select>

zzbusiness-info/src/main/resources/mapper/staff/StaffMapper.xml

@@ -74,38 +74,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="degree" column="degree"/>
         <result property="major" column="major"/>
         <result property="updateTime" column="update_time"/>
-
     </resultMap>
-    <select id="selectAllStaffList" parameterType="org.zhongzheng.info.bo.staff.StaffQueryBo" resultMap="StaffVoResult">
+    <select id="selectAllStaffList" resultMap="StaffVoResult">
         select * from staff s where (select count(seb.staff_id) from staff_edu_bg seb where seb.staff_id=s.staff_id
-        <if test="degree != null and degree != ''">
-            AND seb.degree = #{degree}
+        <if test="bo.degree != null and bo.degree != ''">
+            AND seb.degree = #{bo.degree}
         </if>)>0
-        <if test="entryDate != null and entryDate != ''">
-            <if test="leaveDate != null and leaveDate != ''">
-                And s.entry_date between s.entry_date=#{entryDate} And s.leave_date=#{leaveDate}
+        <if test="bo.entryDate != null and bo.entryDate != ''">
+            <if test="bo.leaveDate != null and bo.leaveDate != ''">
+                And s.entry_date between s.entry_date=#{bo.entryDate} And s.leave_date=#{bo.leaveDate}
             </if>
-            <if test="entryDate != null and entryDate != ''">
-                AND s.entry_date = #{entryDate}
+            <if test="bo.entryDate != null and bo.entryDate != ''">
+                AND s.entry_date = #{bo.entryDate}
             </if>
         </if>
-        <if test="leaveDate != null and leaveDate != ''">
-            AND s.leave_date = #{leaveDate}
+        <if test="bo.leaveDate != null and bo.leaveDate != ''">
+            AND s.leave_date = #{bo.leaveDate}
         </if>
-        <if test="companyName != null and companyName != ''">
-            AND s.company_name = #{companyName}
+        <if test="bo.companyName != null and bo.companyName != ''">
+            AND s.company_name = #{bo.companyName}
         </if>
-        <if test="staffName != null and staffName != ''">
-            AND s.staff_name = #{staffName}
+        <if test="bo.staffName != null and bo.staffName != ''">
+            AND s.staff_name = #{bo.staffName}
         </if>
-        <if test="idCard != null and idCard != ''">
-            AND s.id_card = #{idCard}
+        <if test="bo.idCard != null and bo.idCard != ''">
+            AND s.id_card = #{bo.idCard}
         </if>
-        <if test="staffId != null and staffId != ''">
-            AND s.staff_id = #{staffId}
+        <if test="bo.staffId != null and bo.staffId != ''">
+            AND s.staff_id = #{bo.staffId}
         </if>
-        <if test="telephone != null">
-            AND s.telephone = #{telephone}
+        <if test="bo.telephone != null">
+            AND s.telephone = #{bo.telephone}
         </if>
         ORDER BY s.create_time DESC
     </select>