社保

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TAuditInfoMapper.java

@@ -18,8 +18,11 @@
 package com.yifu.cloud.plus.v1.yifu.social.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TAuditInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 审核信息表（社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录）

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchDayConfMapper.java

@@ -18,8 +18,11 @@
 package com.yifu.cloud.plus.v1.yifu.social.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TDispatchDayConf;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchDayConf;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 各个地市派单日期

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java

@@ -18,8 +18,11 @@
 package com.yifu.cloud.plus.v1.yifu.social.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TDispatchInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 派单信息记录表

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TProvidentFundMapper.java

@@ -18,9 +18,11 @@
 package com.yifu.cloud.plus.v1.yifu.social.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TProvidentFund;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TProvidentFund;
 import org.apache.ibatis.annotations.Mapper;
-
+import org.apache.ibatis.annotations.Param;
 /**
  * 公积金信息
  *

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFundHistoryMapper.java

@@ -18,9 +18,11 @@
 package com.yifu.cloud.plus.v1.yifu.social.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TSocialFundHistory;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundHistory;
 import org.apache.ibatis.annotations.Mapper;
-
+import org.apache.ibatis.annotations.Param;
 /**
  * 社保公积金调基历史记录表
  *

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java

@@ -18,9 +18,11 @@
 package com.yifu.cloud.plus.v1.yifu.social.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TSocialFundInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
 import org.apache.ibatis.annotations.Mapper;
-
+import org.apache.ibatis.annotations.Param;
 /**
  * 社保公积金查询表
  *

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialInfoMapper.java

@@ -18,9 +18,11 @@
 package com.yifu.cloud.plus.v1.yifu.social.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TSocialInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
 import org.apache.ibatis.annotations.Mapper;
-
+import org.apache.ibatis.annotations.Param;
 /**
  * 社保明细表
  *

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TAuditInfoService.java

@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoSearchVo;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchDayConfService.java

@@ -20,11 +20,10 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchDayConf;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchDayConfSearchVo;
-
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java

@@ -20,11 +20,10 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo;
-
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TProvidentFundService.java

@@ -20,11 +20,10 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TProvidentFund;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TProvidentFundSearchVo;
-
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFundHistoryService.java

@@ -20,11 +20,10 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundHistory;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundHistorySearchVo;
-
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFundInfoService.java

@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialInfoService.java

@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoSearchVo;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAuditInfoServiceImpl.java

@@ -16,20 +16,37 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TAuditInfo;
-import com.yifu.cloud.plus.v1.yifu.demo.mapper.TAuditInfoMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.service.TAuditInfoService;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TAuditInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoVo;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -38,6 +55,7 @@ import java.util.List;
  * @author fxj
  * @date 2022-07-15 11:38:05
  */
+@Log4j2
 @Service
 public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditInfo> implements TAuditInfoService {
     /**
@@ -49,21 +67,12 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
     public IPage<TAuditInfo> getTAuditInfoPage(Page<TAuditInfo> page, TAuditInfo tAuditInfo){
         return baseMapper.getTAuditInfoPage(page,tAuditInfo);
     }
-    /**
-     * 审核信息表（社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录）批量导入
-     */
-    @Override
-	R<List<ErrorMessage>> importDiy(InputStream inputStream){
-
-    }
-
     /**
      * 审核信息表（社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录）批量导出
-     * @param tAuditInfo 审核信息表（社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录）
      * @return
      */
     @Override
-    void listExport(HttpServletResponse response, TAuditInfoSearchVo searchVo){
+	public void listExport(HttpServletResponse response, TAuditInfoSearchVo searchVo){
         String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
         List<TAuditInfo> list = new ArrayList<>();
@@ -91,7 +100,7 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
                         }
                     }
                     if (Common.isNotNull(list)){
-                        WriteSheet writeSheet = EasyExcel.writerSheet(审核信息表（社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录）+index).build();
+                        WriteSheet writeSheet = EasyExcel.writerSheet("审核信息表（社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录"+index).build();
                         excelWriter.write(list,writeSheet);
                         index++;
                     }
@@ -101,7 +110,7 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
                     }
                 }
             }else {
-                WriteSheet writeSheet = EasyExcel.writerSheet(审核信息表（社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录）+index).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet("审核信息表（社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录"+index).build();
                 excelWriter.write(list,writeSheet);
             }
             if (Common.isNotNull(list)){
@@ -127,7 +136,7 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
         LambdaQueryWrapper<TAuditInfo> wrapper = buildQueryWrapper(searchVo);
         List<String> idList = Common.getList(searchVo.getIds());
         if (Common.isNotNull(idList)){
-            wrapper.in(TEmpBadRecord::getId,idList);
+            wrapper.in(TAuditInfo::getId,idList);
         }
         if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
             wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
@@ -222,7 +231,7 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
             // 数据合法情况 TODO
 
             // 插入
-            insertExcel(excel,emp);
+            insertExcel(excel);
             errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
         }
     }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchDayConfServiceImpl.java

@@ -16,18 +16,45 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TDispatchDayConf;
-import com.yifu.cloud.plus.v1.yifu.demo.mapper.TDispatchDayConfMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.service.TDispatchDayConfService;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchDayConf;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchDayConfMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchDayConfService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchDayConfSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchDayConfVo;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * 各个地市派单日期
  *
  * @author fxj
  * @date 2022-07-15 11:38:05
  */
+@Log4j2
 @Service
 public class TDispatchDayConfServiceImpl extends ServiceImpl<TDispatchDayConfMapper, TDispatchDayConf> implements TDispatchDayConfService {
     /**
@@ -39,21 +66,13 @@ public class TDispatchDayConfServiceImpl extends ServiceImpl<TDispatchDayConfMap
     public IPage<TDispatchDayConf> getTDispatchDayConfPage(Page<TDispatchDayConf> page, TDispatchDayConf tDispatchDayConf){
         return baseMapper.getTDispatchDayConfPage(page,tDispatchDayConf);
     }
-    /**
-     * 各个地市派单日期批量导入
-     */
-    @Override
-    R<List<ErrorMessage>> importDiy(InputStream inputStream){
-
-    }
 
     /**
      * 各个地市派单日期批量导出
-     * @param tDispatchDayConf 各个地市派单日期
      * @return
      */
     @Override
-    void listExport(HttpServletResponse response, TDispatchDayConfSearchVo searchVo){
+    public void listExport(HttpServletResponse response, TDispatchDayConfSearchVo searchVo){
         String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
         List<TDispatchDayConf> list = new ArrayList<>();
@@ -81,7 +100,7 @@ public class TDispatchDayConfServiceImpl extends ServiceImpl<TDispatchDayConfMap
                         }
                     }
                     if (Common.isNotNull(list)){
-                        WriteSheet writeSheet = EasyExcel.writerSheet(各个地市派单日期+index).build();
+                        WriteSheet writeSheet = EasyExcel.writerSheet("各个地市派单日期"+index).build();
                         excelWriter.write(list,writeSheet);
                         index++;
                     }
@@ -91,7 +110,7 @@ public class TDispatchDayConfServiceImpl extends ServiceImpl<TDispatchDayConfMap
                     }
                 }
             }else {
-                WriteSheet writeSheet = EasyExcel.writerSheet(各个地市派单日期+index).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet("各个地市派单日期"+index).build();
                 excelWriter.write(list,writeSheet);
             }
             if (Common.isNotNull(list)){
@@ -117,7 +136,7 @@ public class TDispatchDayConfServiceImpl extends ServiceImpl<TDispatchDayConfMap
         LambdaQueryWrapper<TDispatchDayConf> wrapper = buildQueryWrapper(searchVo);
         List<String> idList = Common.getList(searchVo.getIds());
         if (Common.isNotNull(idList)){
-            wrapper.in(TEmpBadRecord::getId,idList);
+            wrapper.in(TDispatchDayConf::getId,idList);
         }
         if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
             wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
@@ -212,7 +231,7 @@ public class TDispatchDayConfServiceImpl extends ServiceImpl<TDispatchDayConfMap
             // 数据合法情况 TODO
 
             // 插入
-            insertExcel(excel,emp);
+            insertExcel(excel);
             errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
         }
     }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -21,7 +21,38 @@ import com.yifu.cloud.plus.v1.yifu.demo.entity.TDispatchInfo;
 import com.yifu.cloud.plus.v1.yifu.demo.mapper.TDispatchInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.demo.service.TDispatchInfoService;
 import org.springframework.stereotype.Service;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TAuditInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoVo;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * 派单信息记录表
  *

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TProvidentFundServiceImpl.java

@@ -16,18 +16,45 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TProvidentFund;
-import com.yifu.cloud.plus.v1.yifu.demo.mapper.TProvidentFundMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.service.TProvidentFundService;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TProvidentFund;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TProvidentFundMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TProvidentFundService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TProvidentFundSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TProvidentFundVo;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * 公积金信息
  *
  * @author fxj
  * @date 2022-07-15 11:38:05
  */
+@Log4j2
 @Service
 public class TProvidentFundServiceImpl extends ServiceImpl<TProvidentFundMapper, TProvidentFund> implements TProvidentFundService {
     /**
@@ -39,21 +66,13 @@ public class TProvidentFundServiceImpl extends ServiceImpl<TProvidentFundMapper,
     public IPage<TProvidentFund> getTProvidentFundPage(Page<TProvidentFund> page, TProvidentFund tProvidentFund){
         return baseMapper.getTProvidentFundPage(page,tProvidentFund);
     }
-    /**
-     * 公积金信息批量导入
-     */
-    @Override
-    R<List<ErrorMessage>> importDiy(InputStream inputStream){
-
-    }
 
     /**
      * 公积金信息批量导出
-     * @param tProvidentFund 公积金信息
      * @return
      */
     @Override
-    void listExport(HttpServletResponse response, TProvidentFundSearchVo searchVo){
+    public void listExport(HttpServletResponse response, TProvidentFundSearchVo searchVo){
         String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
         List<TProvidentFund> list = new ArrayList<>();
@@ -81,7 +100,7 @@ public class TProvidentFundServiceImpl extends ServiceImpl<TProvidentFundMapper,
                         }
                     }
                     if (Common.isNotNull(list)){
-                        WriteSheet writeSheet = EasyExcel.writerSheet(公积金信息+index).build();
+                        WriteSheet writeSheet = EasyExcel.writerSheet("公积金信息"+index).build();
                         excelWriter.write(list,writeSheet);
                         index++;
                     }
@@ -91,7 +110,7 @@ public class TProvidentFundServiceImpl extends ServiceImpl<TProvidentFundMapper,
                     }
                 }
             }else {
-                WriteSheet writeSheet = EasyExcel.writerSheet(公积金信息+index).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet("公积金信息"+index).build();
                 excelWriter.write(list,writeSheet);
             }
             if (Common.isNotNull(list)){
@@ -117,7 +136,7 @@ public class TProvidentFundServiceImpl extends ServiceImpl<TProvidentFundMapper,
         LambdaQueryWrapper<TProvidentFund> wrapper = buildQueryWrapper(searchVo);
         List<String> idList = Common.getList(searchVo.getIds());
         if (Common.isNotNull(idList)){
-            wrapper.in(TEmpBadRecord::getId,idList);
+            wrapper.in(TProvidentFund::getId,idList);
         }
         if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
             wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
@@ -212,7 +231,7 @@ public class TProvidentFundServiceImpl extends ServiceImpl<TProvidentFundMapper,
             // 数据合法情况 TODO
 
             // 插入
-            insertExcel(excel,emp);
+            insertExcel(excel);
             errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
         }
     }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundHistoryServiceImpl.java

@@ -16,18 +16,45 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TSocialFundHistory;
-import com.yifu.cloud.plus.v1.yifu.demo.mapper.TSocialFundHistoryMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.service.TSocialFundHistoryService;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundHistory;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFundHistoryMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TSocialFundHistoryService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundHistorySearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundHistoryVo;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * 社保公积金调基历史记录表
  *
  * @author fxj
  * @date 2022-07-15 11:38:05
  */
+@Log4j2
 @Service
 public class TSocialFundHistoryServiceImpl extends ServiceImpl<TSocialFundHistoryMapper, TSocialFundHistory> implements TSocialFundHistoryService {
     /**
@@ -39,21 +66,13 @@ public class TSocialFundHistoryServiceImpl extends ServiceImpl<TSocialFundHistor
     public IPage<TSocialFundHistory> getTSocialFundHistoryPage(Page<TSocialFundHistory> page, TSocialFundHistory tSocialFundHistory){
         return baseMapper.getTSocialFundHistoryPage(page,tSocialFundHistory);
     }
-    /**
-     * 社保公积金调基历史记录表批量导入
-     */
-    @Override
-    R<List<ErrorMessage>> importDiy(InputStream inputStream){
-
-    }
 
     /**
      * 社保公积金调基历史记录表批量导出
-     * @param tSocialFundHistory 社保公积金调基历史记录表
      * @return
      */
     @Override
-    void listExport(HttpServletResponse response, TSocialFundHistorySearchVo searchVo){
+    public void listExport(HttpServletResponse response, TSocialFundHistorySearchVo searchVo){
         String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
         List<TSocialFundHistory> list = new ArrayList<>();
@@ -81,7 +100,7 @@ public class TSocialFundHistoryServiceImpl extends ServiceImpl<TSocialFundHistor
                         }
                     }
                     if (Common.isNotNull(list)){
-                        WriteSheet writeSheet = EasyExcel.writerSheet(社保公积金调基历史记录表+index).build();
+                        WriteSheet writeSheet = EasyExcel.writerSheet("社保公积金调基历史记录表"+index).build();
                         excelWriter.write(list,writeSheet);
                         index++;
                     }
@@ -91,7 +110,7 @@ public class TSocialFundHistoryServiceImpl extends ServiceImpl<TSocialFundHistor
                     }
                 }
             }else {
-                WriteSheet writeSheet = EasyExcel.writerSheet(社保公积金调基历史记录表+index).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet("社保公积金调基历史记录表"+index).build();
                 excelWriter.write(list,writeSheet);
             }
             if (Common.isNotNull(list)){
@@ -117,7 +136,7 @@ public class TSocialFundHistoryServiceImpl extends ServiceImpl<TSocialFundHistor
         LambdaQueryWrapper<TSocialFundHistory> wrapper = buildQueryWrapper(searchVo);
         List<String> idList = Common.getList(searchVo.getIds());
         if (Common.isNotNull(idList)){
-            wrapper.in(TEmpBadRecord::getId,idList);
+            wrapper.in(TSocialFundHistory::getId,idList);
         }
         if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
             wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
@@ -212,7 +231,7 @@ public class TSocialFundHistoryServiceImpl extends ServiceImpl<TSocialFundHistor
             // 数据合法情况 TODO
 
             // 插入
-            insertExcel(excel,emp);
+            insertExcel(excel);
             errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
         }
     }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java

@@ -16,18 +16,45 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TSocialFundInfo;
-import com.yifu.cloud.plus.v1.yifu.demo.mapper.TSocialFundInfoMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.service.TSocialFundInfoService;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFundInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TSocialFundInfoService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoVo;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * 社保公积金查询表
  *
  * @author fxj
  * @date 2022-07-15 11:38:05
  */
+@Log4j2
 @Service
 public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMapper, TSocialFundInfo> implements TSocialFundInfoService {
     /**
@@ -39,21 +66,13 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
     public IPage<TSocialFundInfo> getTSocialFundInfoPage(Page<TSocialFundInfo> page, TSocialFundInfo tSocialFundInfo){
         return baseMapper.getTSocialFundInfoPage(page,tSocialFundInfo);
     }
-    /**
-     * 社保公积金查询表批量导入
-     */
-    @Override
-    R<List<ErrorMessage>> importDiy(InputStream inputStream){
-
-    }
 
     /**
      * 社保公积金查询表批量导出
-     * @param tSocialFundInfo 社保公积金查询表
      * @return
      */
     @Override
-    void listExport(HttpServletResponse response, TSocialFundInfoSearchVo searchVo){
+    public void listExport(HttpServletResponse response, TSocialFundInfoSearchVo searchVo){
         String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
         List<TSocialFundInfo> list = new ArrayList<>();
@@ -81,7 +100,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
                         }
                     }
                     if (Common.isNotNull(list)){
-                        WriteSheet writeSheet = EasyExcel.writerSheet(社保公积金查询表+index).build();
+                        WriteSheet writeSheet = EasyExcel.writerSheet("社保公积金查询表"+index).build();
                         excelWriter.write(list,writeSheet);
                         index++;
                     }
@@ -91,7 +110,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
                     }
                 }
             }else {
-                WriteSheet writeSheet = EasyExcel.writerSheet(社保公积金查询表+index).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet("社保公积金查询表"+index).build();
                 excelWriter.write(list,writeSheet);
             }
             if (Common.isNotNull(list)){
@@ -117,7 +136,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
         LambdaQueryWrapper<TSocialFundInfo> wrapper = buildQueryWrapper(searchVo);
         List<String> idList = Common.getList(searchVo.getIds());
         if (Common.isNotNull(idList)){
-            wrapper.in(TEmpBadRecord::getId,idList);
+            wrapper.in(TSocialFundInfo::getId,idList);
         }
         if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
             wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
@@ -212,7 +231,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
             // 数据合法情况 TODO
 
             // 插入
-            insertExcel(excel,emp);
+            insertExcel(excel);
             errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
         }
     }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java

@@ -16,18 +16,45 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.yifu.demo.entity.TSocialInfo;
-import com.yifu.cloud.plus.v1.yifu.demo.mapper.TSocialInfoMapper;
-import com.yifu.cloud.plus.v1.yifu.demo.service.TSocialInfoService;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoVo;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * 社保明细表
  *
  * @author fxj
  * @date 2022-07-15 11:38:05
  */
+@Log4j2
 @Service
 public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSocialInfo> implements TSocialInfoService {
     /**
@@ -39,21 +66,12 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
     public IPage<TSocialInfo> getTSocialInfoPage(Page<TSocialInfo> page, TSocialInfo tSocialInfo){
         return baseMapper.getTSocialInfoPage(page,tSocialInfo);
     }
-    /**
-     * 社保明细表批量导入
-     */
-    @Override
-    R<List<ErrorMessage>> importDiy(InputStream inputStream){
-
-    }
-
     /**
      * 社保明细表批量导出
-     * @param tSocialInfo 社保明细表
      * @return
      */
     @Override
-    void listExport(HttpServletResponse response, TSocialInfoSearchVo searchVo){
+    public void listExport(HttpServletResponse response, TSocialInfoSearchVo searchVo){
         String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
         List<TSocialInfo> list = new ArrayList<>();
@@ -81,7 +99,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
                         }
                     }
                     if (Common.isNotNull(list)){
-                        WriteSheet writeSheet = EasyExcel.writerSheet(社保明细表+index).build();
+                        WriteSheet writeSheet = EasyExcel.writerSheet("社保明细表"+index).build();
                         excelWriter.write(list,writeSheet);
                         index++;
                     }
@@ -91,7 +109,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
                     }
                 }
             }else {
-                WriteSheet writeSheet = EasyExcel.writerSheet(社保明细表+index).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet("社保明细表"+index).build();
                 excelWriter.write(list,writeSheet);
             }
             if (Common.isNotNull(list)){
@@ -117,7 +135,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
         LambdaQueryWrapper<TSocialInfo> wrapper = buildQueryWrapper(searchVo);
         List<String> idList = Common.getList(searchVo.getIds());
         if (Common.isNotNull(idList)){
-            wrapper.in(TEmpBadRecord::getId,idList);
+            wrapper.in(TSocialInfo::getId,idList);
         }
         if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
             wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
@@ -212,7 +230,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
             // 数据合法情况 TODO
 
             // 插入
-            insertExcel(excel,emp);
+            insertExcel(excel);
             errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
         }
     }

yifu-visual/yifu-codegen/src/main/resources/template/Service.java.vm

@@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import ${package}.${moduleName}.entity.${className};
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import ${package}.${moduleName}.vo.${className}SearchVo;
 import javax.servlet.http.HttpServletResponse;

yifu-visual/yifu-codegen/src/main/resources/template/ServiceImpl.java.vm

@@ -18,23 +18,48 @@ package ${package}.${moduleName}.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import ${package}.${moduleName}.entity.${className};
+import ${package}.${moduleName}.vo.${className}Vo;
 import ${package}.${moduleName}.mapper.${className}Mapper;
 import ${package}.${moduleName}.service.${className}Service;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import ${package}.${moduleName}.vo.${className}SearchVo;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * ${comments}
  *
  * @author ${author}
  * @date ${datetime}
  */
+@Log4j2
 @Service
 public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${className}> implements ${className}Service {
     /**
@@ -46,13 +71,6 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
     public IPage<${className}> get${className}Page(Page<${className}> page, ${className}SearchVo ${classname}){
         return baseMapper.get${className}Page(page,${classname});
     }
-    /**
-     * ${comments}批量导入
-     */
-    @Override
-    R<List<ErrorMessage>> importDiy(InputStream inputStream){
-
-    }
 
     /**
      * ${comments}批量导出
@@ -60,7 +78,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
      * @return
      */
     @Override
-    void listExport(HttpServletResponse response, ${className}SearchVo searchVo){
+    public void listExport(HttpServletResponse response, ${className}SearchVo searchVo){
         String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
         List<${className}> list = new ArrayList<>();
@@ -88,7 +106,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
                         }
                     }
                     if (Common.isNotNull(list)){
-                        WriteSheet writeSheet = EasyExcel.writerSheet(${comments}+index).build();
+                        WriteSheet writeSheet = EasyExcel.writerSheet("${comments}"+index).build();
                         excelWriter.write(list,writeSheet);
                         index++;
                     }
@@ -98,7 +116,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
                     }
                 }
             }else {
-                WriteSheet writeSheet = EasyExcel.writerSheet(${comments}+index).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet("${comments}"+index).build();
                 excelWriter.write(list,writeSheet);
             }
             if (Common.isNotNull(list)){
@@ -124,7 +142,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
         LambdaQueryWrapper<${className}> wrapper = buildQueryWrapper(searchVo);
         List<String> idList = Common.getList(searchVo.getIds());
         if (Common.isNotNull(idList)){
-            wrapper.in(TEmpBadRecord::getId,idList);
+            wrapper.in(${className}::getId,idList);
         }
         if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
             wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
@@ -219,7 +237,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
             // 数据合法情况 TODO
 
             // 插入
-            insertExcel(excel,emp);
+            insertExcel(excel);
             errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
         }
     }