Commit 8a94f937 authored by hongguangwu's avatar hongguangwu

MVP1.7.9-20

parent e6bdbbed
......@@ -141,7 +141,7 @@ public class SocialFriendConfig {
}
json.put("ywblzhlb", ywblzhlbArr);
// type 1社保增 2社保减 3医保增 4医保减
setEmpInfo(json, listVo, type);
setEmpInfo(json, listVo, type, vo.getQyzgjbylbxcbdjb());
if (Common.isNotNull(vo.getQyzgshbxzyhmc())) {
JSONArray qyzgshbxzyhmclbArr = new JSONArray();
qyzgshbxzyhmclbArr.add(vo.getQyzgshbxzyhmc());
......@@ -267,11 +267,11 @@ public class SocialFriendConfig {
* @Date: 2024/12/11 10:24
* @return: void
**/
private void setEmpInfo(JSONObject json, List<SociaFriendYgsAddVo> listVo, int type) {
private void setEmpInfo(JSONObject json, List<SociaFriendYgsAddVo> listVo, int type, String qyzgjbylbxcbdjb) {
if (type == 1 || type == 3) {
setEmpInfoAdd(json, listVo, type);
setEmpInfoAdd(json, listVo, type, qyzgjbylbxcbdjb);
} else {
setEmpInfoReduce(json, listVo, type);
setEmpInfoReduce(json, listVo, type, qyzgjbylbxcbdjb);
}
}
......@@ -282,7 +282,7 @@ public class SocialFriendConfig {
* @Date: 2024/12/10 18:05
* @return: void
**/
private void setEmpInfoAdd(JSONObject json, List<SociaFriendYgsAddVo> listVo, int type) {
private void setEmpInfoAdd(JSONObject json, List<SociaFriendYgsAddVo> listVo, int type, String qyzgjbylbxcbdjb) {
// 参保人员名单 数组
JSONArray cbrymdArr = new JSONArray();
JSONObject cbrymdOne;
......@@ -407,7 +407,7 @@ public class SocialFriendConfig {
tszdxx.put("qyzgshbxzyhmc", vo.getQyzgshbxzyhmc());
} else {
// 企业职工基本医疗保险参保登记表 安徽非必填! 数组
String[] arr = {vo.getQyzgjbylbxcbdjb()};
String[] arr = {qyzgjbylbxcbdjb};
// 增员、减员必填
tszdxx.put("qyzgjbylbxcbdjb", arr);
}
......@@ -436,7 +436,7 @@ public class SocialFriendConfig {
* @Date: 2024/12/10 18:05
* @return: void
**/
private void setEmpInfoReduce(JSONObject json, List<SociaFriendYgsAddVo> listVo, int type) {
private void setEmpInfoReduce(JSONObject json, List<SociaFriendYgsAddVo> listVo, int type, String qyzgjbylbxcbdjb) {
// 参保人员名单 数组
// 参保人员名单 数组
JSONArray cbrymdArr = new JSONArray();
......@@ -478,7 +478,7 @@ public class SocialFriendConfig {
// tszdxx.put("zgshbxjshmc", )
if (type > 2) {
// 职工基本医疗保险参保登记表
String[] arr = {vo.getQyzgjbylbxcbdjb()};
String[] arr = {qyzgjbylbxcbdjb};
tszdxx.put("zgjbylbxcbdjb", arr);
}
cbrymdOne.put("tszdxx", tszdxx);
......
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