Commit d1aad24f authored by huyuchen's avatar huyuchen

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

parents 8abe2817 7b95a980
...@@ -421,5 +421,6 @@ public class InsuredListVo implements Serializable { ...@@ -421,5 +421,6 @@ public class InsuredListVo implements Serializable {
@ExcelProperty(value = "备注") @ExcelProperty(value = "备注")
private String remark; private String remark;
@ExcelIgnore
private String insuranceTypeId; private String insuranceTypeId;
} }
...@@ -2111,7 +2111,7 @@ ...@@ -2111,7 +2111,7 @@
and a.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%') and a.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
</if> </if>
<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"> <if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName} and a.INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
</if> </if>
<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''"> <if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%') and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
...@@ -2149,7 +2149,7 @@ ...@@ -2149,7 +2149,7 @@
and a.POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%') and a.POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
</if> </if>
<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"> <if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName} and a.INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
</if> </if>
<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''"> <if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%') and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
......
...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.social.config; ...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.social.config;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException; import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
...@@ -26,6 +27,8 @@ import java.util.Date; ...@@ -26,6 +27,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.TreeMap; import java.util.TreeMap;
import static com.alibaba.fastjson.serializer.SerializerFeature.*;
/** /**
* @Author: hgw * @Author: hgw
* @Date: 2024-12-6 17:01:23 * @Date: 2024-12-6 17:01:23
...@@ -68,6 +71,10 @@ public class SocialFriendConfig { ...@@ -68,6 +71,10 @@ public class SocialFriendConfig {
private static final String X_REQ_NONCE = "xReqNonce"; private static final String X_REQ_NONCE = "xReqNonce";
private static final String VERSION = "version"; private static final String VERSION = "version";
private static final SerializerFeature[] features = new SerializerFeature[] {
WriteMapNullValue, WriteNullNumberAsZero, WriteNullListAsEmpty,
WriteNullStringAsEmpty,WriteDateUseDateFormat
};
/** /**
* @param : listVo 同一类(户、增减)的前100个 * @param : listVo 同一类(户、增减)的前100个
* @param : vo 第一个,存账密等信息 * @param : vo 第一个,存账密等信息
...@@ -156,7 +163,7 @@ public class SocialFriendConfig { ...@@ -156,7 +163,7 @@ public class SocialFriendConfig {
TSocialFriendBackLog backLogPush = new TSocialFriendBackLog(); TSocialFriendBackLog backLogPush = new TSocialFriendBackLog();
backLogPush.setSocialId(vo.getSocialId()); backLogPush.setSocialId(vo.getSocialId());
backLogPush.setType(5); backLogPush.setType(5);
backLogPush.setLogInfo(json.toString()); backLogPush.setLogInfo(JSON.toJSONString(json, features));
backLogPush.setCreateTime(LocalDateTime.now()); backLogPush.setCreateTime(LocalDateTime.now());
backLogList.add(backLogPush); backLogList.add(backLogPush);
String dataResultList = restTemplate.postForObject(appAddUrl, formEntity, String.class); String dataResultList = restTemplate.postForObject(appAddUrl, formEntity, String.class);
......
...@@ -325,7 +325,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -325,7 +325,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
} }
} else { } else {
// 派减离职原因转化: // 派减离职原因转化:
if (type == 2 && Common.isNotNull(vo.getTbyy())) { if (type == 4 && Common.isNotNull(vo.getTbyy())) {
reduceSet = reduceMap.get(vo.getTbyy()); reduceSet = reduceMap.get(vo.getTbyy());
if (reduceSet != null) { if (reduceSet != null) {
vo.setTbyy(reduceSet.getTbyy()); vo.setTbyy(reduceSet.getTbyy());
......
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