Commit 221f3e7e authored by huyuchen's avatar huyuchen

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

parents 59b3f49e 6e8f2427
......@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ContentStyle;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import io.swagger.v3.oas.annotations.media.Schema;
......@@ -26,6 +25,12 @@ import java.util.Date;
@Data
public class SocialHandleExportVo implements Serializable {
/**
* 派单ID
*/
@ExcelIgnore
private String id;
/**
* 派单类型:0派增1派减
*/
......
......@@ -26,7 +26,6 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 派单信息记录表
......@@ -80,8 +79,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
* @Param
* @return
**/
int updateSocialRecords(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo,
@Param("idsStr") List<String> idsStr);
int updateSocialRecords(@Param("idsStr") List<String> idsStr);
/**
* 导出社保花名册数据查询count
......
......@@ -52,7 +52,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
import com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseServiceParamListVO;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.*;
......@@ -6087,6 +6086,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
int index = 0;
String userId = user.getId();
String userName = user.getNickname();
List<String> idString = null;
if (count > CommonConstants.ZERO_INT) {
// 加上非办理人,导出只有姓名身份证和异常
......@@ -6102,6 +6102,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
SocialHandleExportVo vo;
for (int i = 0; i <= count; ) {
logList = new ArrayList<>();
idString = new ArrayList<>();
// 获取实际记录
searchVo.setLimitStart(i);
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
......@@ -6110,6 +6111,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
util = new ExcelUtil<>(SocialHandleExportVo.class);
for (int j = 0; j < list.size(); j++) {
vo = list.get(j);
idString.add(vo.getId());
util.convertEntity(vo, null, null, null);
if (Common.isNotNull(vo.getSocialHouseholdName())) {
if (socialHuMap.get(vo.getSocialHouseholdName()) == null) {
......@@ -6139,7 +6141,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(list)) {
list.clear();
}
updateSocialRecords(searchVo, idStr);
if (Common.isNotNull(idString)){
updateSocialRecords(idString);
}
// 新增导出人记录
if (!logList.isEmpty()) {
tDispatchExportLogService.saveBatch(logList);
......@@ -6154,6 +6158,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(list)) {
list.clear();
}
if ( Common.isNotNull(idString)){
idString.clear();
}
out.flush();
} catch (Exception e) {
log.error("执行异常", e);
......@@ -6195,8 +6202,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return baseMapper.getSocialRecordRosterList(searchVo, Common.getList(idStr));
}
private boolean updateSocialRecords(SocialHandleSearchVo searchVo, String idStr) {
return baseMapper.updateSocialRecords(searchVo, Common.getList(idStr)) >= 0;
private boolean updateSocialRecords(List<String> idStr) {
return baseMapper.updateSocialRecords(idStr) >= 0;
}
@Override
......
......@@ -1173,6 +1173,7 @@
</resultMap>
<resultMap id="socialHandleExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleExportVo">
<result property="id" column="id"/>
<result property="empName" column="EMP_NAME"/>
<result property="empIdcard" column="EMP_IDCARD"/>
<result property="empType" column="EMP_TYPE"/>
......@@ -1256,6 +1257,7 @@
<!--tDispatchInfo 社保花名册数据查询-->
<select id="getSocialRecordRosterList" resultMap="socialHandleExportMap">
SELECT
a.id,
a.TYPE,
a.SOCIAL_HANDLE_STATUS,
/*IF(a.TYPE='0',s.PENSION_HANDLE,IF(s.PENSION_HANDLE='2',"--",a.SOCIAL_HANDLE_STATUS)) as "PENSION_HANDLE",
......@@ -1477,7 +1479,7 @@
order by a.AUDIT_TIME desc
</select>
<update id="updateSocialRecords">
<!--<update id="updateSocialRecords">
update
t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
......@@ -1497,8 +1499,21 @@
)
</if>
</update>
</update>-->
<update id="updateSocialRecords">
update
t_dispatch_info a
set a.EXPORT_SOCIAL_FLAG = 1
<where>
a.id in
<foreach item="item" collection="idsStr" separator="," close=")" open="(" index="index">
#{item}
</foreach>
/>
</where>
</update>
<!--tDispatchInfo 社保花名册数据查询count-->
<select id="getSocialRecordRosterListCount" resultType="java.lang.Integer">
SELECT
......
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