Merge remote-tracking branch 'origin/MVP1.6.4' into MVP1.6.4

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

@@ -16,23 +16,13 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
-import cn.hutool.core.util.ArrayUtil;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.annotation.ExcelProperty;
-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.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.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
-import com.yifu.cloud.plus.v1.yifu.salary.vo.ExcelColumnVo;
-import com.yifu.cloud.plus.v1.yifu.salary.vo.ExcelSheetVo;
 import com.yifu.cloud.plus.v1.yifu.social.config.SocialConfig;
 import com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
@@ -44,7 +34,10 @@ import com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierService;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialSoldierReturnErrorVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.CellType;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;

yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialSoldierMapper.xml

@@ -75,14 +75,20 @@
 
 	<sql id="where_getSocialSoldier_base_handler">
 		<where>
-		s.DELETE_FLAG = 0
-		/** 社保办理状态：0待办理/1已办理2办理失败3已派减4 办理中 5 部分办理失败 派单社保办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败）  3 部分办理成功 4 办理中  **/
-		/*社保代办理 1.派单审核通过 2.派增(type=0)：待办理(social_handle_status='0')  or 派减(type=1)：已办理完成或部分办理失败 且已派减*/
-		AND a.social_id is not null
-		AND a.STATUS = "2"
-		and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1'  AND (if(ifnull(h.id,0) != '0',h.HANDLE_STATUS,s.HANDLE_STATUS) in ('1','5','6','3','7') or (s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1'))  ))
-		and a.SOCIAL_HANDLE_STATUS in ('0','4')
-		and a.AUTO_FLAG = '0'
+			s.DELETE_FLAG = 0
+			<if test="idsStr != null and idsStr.size > 0">
+				AND a.ID in
+				<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">
+					#{items}
+				</foreach>
+			</if>
+			/** 社保办理状态：0待办理/1已办理2办理失败3已派减4 办理中 5 部分办理失败 派单社保办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败）  3 部分办理成功 4 办理中  **/
+			/*社保代办理 1.派单审核通过 2.派增(type=0)：待办理(social_handle_status='0')  or 派减(type=1)：已办理完成或部分办理失败 且已派减*/
+			AND a.social_id is not null
+			AND a.STATUS = "2"
+			and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1'  AND (if(ifnull(h.id,0) != '0',h.HANDLE_STATUS,s.HANDLE_STATUS) in ('1','5','6','3','7') or (s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1'))  ))
+			and a.SOCIAL_HANDLE_STATUS in ('0','4')
+			and a.AUTO_FLAG = '0'
 		</where>
 	</sql>