Commit af91a863 authored by hongguangwu's avatar hongguangwu

MVP1.6.5-社保士兵实缴:

parent 603daa7f
......@@ -7,7 +7,7 @@ import java.io.Serializable;
/**
* @Author hgw
* @Description 社保士兵实缴3张表查询2_合肥-社保-人员缴费明细打印
* @Description 社保士兵实缴3张表查询2_合肥-社保-单位个人缴费信息查询
* @Date 2024-5-29 18:20:26
**/
@Data
......@@ -16,20 +16,13 @@ public class SocialSoldierPaymentSelectTwoVo implements Serializable {
// 企业名称 参险类型 业务年月 回传信息 回传信息1 回传信息2
// 2024-6-7 11:29:15 变模版:
// 企业名称 证件号码 姓名 险种类型 人员状态 开始日期 结束日期 回传信息 回传信息1 回传信息2
// 2024-6-11 15:20:59 陈红确认 使用 B社会保险-单位个人缴费信息查询 => 合肥-社保-单位个人缴费信息查询
@ExcelProperty("企业名称")
private String companyName;
@ExcelProperty("证件号码")
private String idCard;
@ExcelProperty("姓名")
private String empName;
@ExcelProperty("险种类型")
@ExcelProperty("参险类型")
private String paymentType;
@ExcelProperty("人员状态")
private String userStatus;
@ExcelProperty("开始日期")
private String startDate;
@ExcelProperty("结束日期")
private String endDate;
@ExcelProperty("业务年月")
private String payMonth;
@ExcelProperty("回传信息")
private String returnInfo;
......
......@@ -117,8 +117,8 @@ public class SocialConfig {
sheMap.put("社保减员", sheBaoArrObj.getString("value"));
} else if ("审核数据查询".equals(sheBaoArrObj.get("label"))) {
sheMap.put("审核数据查询", sheBaoArrObj.getString("value"));
} else if ("人员缴费明细打印".equals(sheBaoArrObj.get("label"))) {
sheMap.put("人员缴费明细打印", sheBaoArrObj.getString("value"));
} else if ("单位个人缴费信息查询".equals(sheBaoArrObj.get("label"))) {
sheMap.put("单位个人缴费信息查询", sheBaoArrObj.getString("value"));
}
}
} else if ("医保".equals(childrenArrObj.get("label"))) {
......
......@@ -194,4 +194,16 @@ public class TSocialSoldierController {
return tSocialSoldierService.getReHandle(parentId);
}
/**
* @Description: 文件组装zip的Demo
* @Author: hgw
* @Date: 2024-6-11 14:27:50
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
/*@Operation(description = "文件组装zip的Demo")
@GetMapping("/getZip")
public R<String> getZip() {
return tSocialSoldierService.getZip();
}*/
}
......@@ -472,8 +472,8 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
// 实缴3张表之2:人员缴费明细打印
List<SocialSoldierPaymentSelectTwoVo> shenBaoTwolist = baseMapper.getSoldierPaymentSelectTwoList();
log.info("实缴3张表之2:人员缴费明细打印list="+shenBaoTwolist);
sheetName = "人员缴费明细打印";
log.info("实缴3张表之2:单位个人缴费信息查询list="+shenBaoTwolist);
sheetName = "单位个人缴费信息查询";
if (shenBaoTwolist != null && !shenBaoTwolist.isEmpty()) {
MultipartFile file = this.getFile(shenBaoTwolist, SocialSoldierPaymentSelectTwoVo.class, sheetName);
if (Common.isNotNull(file)) {
......
......@@ -95,7 +95,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
mainAuto.setRepeatReviewFlag(CommonConstants.ZERO_STRING);
tAutoPaymentInfoService.updateById(mainAuto);
}
// 3:实缴1日常申报导出;4:实缴2人员缴费明细打印;5:实缴3单位缴费明细查询
// 3:实缴1日常申报导出;4:实缴2单位个人缴费信息查询;5:实缴3单位缴费明细查询
int type = 7;
TSocialSoldierShenBaoTask addIdOneTask = tSocialSoldierShenBaoTaskService.getSoldierTaskAddIdByType(String.valueOf(type));
type++;
......@@ -125,7 +125,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
InputStream inRenYuan = null;
InputStream inDanWei = null;
InputStream inDanWeiXiaZai = null;
// 1日常申报导出;2人员缴费明细打印;3单位缴费明细查询
// 1日常申报导出;2单位个人缴费信息查询;3单位缴费明细查询
R<String> resultFile = socialConfig.getFiveJob(restTemplate, addIdOne, RESULT_ANNEX);
R<String> resultFileTwo = socialConfig.getFiveJob(restTemplate, addIdOTwo, RESULT_ANNEX);
R<String> resultFileThree = socialConfig.getFiveJob(restTemplate, addIdThree, RESULT_ANNEX);
......@@ -217,7 +217,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
conn.setConnectTimeout(30 * 1000);
inRenYuan = conn.getInputStream();
// 原表ZIP-2人员缴费明细打印
// 原表ZIP-2单位个人缴费信息查询
mainAuto.setAttaUrlTwo(fileTeturnUrl);
/*if (inRenYuan != null) {
entry = new ZipEntry("renYuanMingXi_file.zip");
......@@ -396,7 +396,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
**/
@Override
public R<String> doInnerGetPaymentThree() {
// 3:实缴1日常申报导出;4:实缴2人员缴费明细打印;5:实缴3单位缴费明细查询
// 3:实缴1日常申报导出;4:实缴2单位个人缴费信息查询;5:实缴3单位缴费明细查询
TSocialSoldierShenBaoTask addIdOneTask = tSocialSoldierShenBaoTaskService.getSoldierTaskAddIdByType(CommonConstants.THREE_STRING);
TSocialSoldierShenBaoTask addIdTwoTask = tSocialSoldierShenBaoTaskService.getSoldierTaskAddIdByType(CommonConstants.FOUR_STRING);
TSocialSoldierShenBaoTask addIdThreeTask = tSocialSoldierShenBaoTaskService.getSoldierTaskAddIdByType(CommonConstants.FIVE_STRING);
......@@ -422,7 +422,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
InputStream inRenYuan = null;
InputStream inDanWei = null;
InputStream inDanWeiXiaZai = null;
// 1日常申报导出;2人员缴费明细打印;3单位缴费明细查询
// 1日常申报导出;2单位个人缴费信息查询;3单位缴费明细查询
R<String> resultFile = socialConfig.getFiveJob(restTemplate, addIdOne, RESULT_ANNEX);
R<String> resultFileTwo = socialConfig.getFiveJob(restTemplate, addIdOTwo, RESULT_ANNEX);
R<String> resultFileThree = socialConfig.getFiveJob(restTemplate, addIdThree, RESULT_ANNEX);
......@@ -527,7 +527,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
conn.setConnectTimeout(30 * 1000);
inRenYuan = conn.getInputStream();
// 原表ZIP-2人员缴费明细打印
// 原表ZIP-2单位个人缴费信息查询
mainAuto.setAttaUrlTwo(fileTeturnUrl);
/*if (inRenYuan != null) {
entry = new ZipEntry("renYuanMingXi_file.zip");
......@@ -690,7 +690,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
/**
* @param reFlag true :复核
* @param oldMap 被标记的map
* @param type 1日常申报导出;2人员缴费明细打印;3单位缴费明细查询
* @param type 1日常申报导出;2单位个人缴费信息查询;3单位缴费明细查询
* @Description: 读取实缴3张表
* @Author: hgw
* @Date: 2024/6/3 18:17
......@@ -712,7 +712,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
BufferedInputStream bs = null;
// 塞生成月份所用
String nowMonth = DateUtil.getThisMonth();
// 资源类型:1日常申报导出;2人员缴费明细打印;3单位缴费明细查询
// 资源类型:1日常申报导出;2单位个人缴费信息查询;3单位缴费明细查询
String sourceType = String.valueOf(type);
try {
zin = new ZipInputStream(inputStream, CharsetUtil.CHARSET_GBK);
......@@ -872,7 +872,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
} else if ("参保身份".equals(cellValue)) {
shenFenNum = cellNum;
}
// 2人员缴费明细打印 独有
// 2单位个人缴费信息查询 独有
else if ("单位缴费额".equals(cellValue) || "单位实缴金额".equals(cellValue)) {
unitLimitNum = cellNum;
} else if ("单位利息".equals(cellValue)) {
......@@ -1097,7 +1097,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
} else if ("参保身份".equals(cellValue)) {
shenFenNum = cellNum;
}
// 2人员缴费明细打印 独有
// 2单位个人缴费信息查询 独有
else if ("单位缴费额".equals(cellValue) || "单位实缴金额".equals(cellValue)) {
unitLimitNum = cellNum;
} else if ("单位利息".equals(cellValue)) {
......@@ -1138,9 +1138,13 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
if (Common.isNotNull(shenFenNum)) {
shenFen = getCellValue(row97, shenFenNum);
if (Common.isNotNull(shenFen) && "退休".equals(shenFen.trim())) {
if (Common.isNotNull(shenFen)) {
if ("退休".equals(shenFen.trim())) {
continue;
}
} else {
break;
}
}
if (Common.isNotNull(empNameNum)) {
empName = getCellValue(row97, empNameNum);
......
......@@ -291,22 +291,9 @@
<!-- 社保士兵实缴3张表查询2_合肥-社保-人员缴费明细打印 -->
<select id="getSoldierPaymentSelectTwoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierPaymentSelectTwoVo">
select
a.companyName,a.empIdCard idCard,a.empName,'' paymentType,'' userStatus,'' startDate,'' endDate,'' returnInfo,'' returnInfoOne,'' returnInfoTwo
from (
select
s.SOCIAL_HOUSEHOLD_NAME companyName,s.EMP_NAME empName,s.EMP_IDCARD empIdCard
from t_social_info s
left join t_dispatch_info d on s.id=d.SOCIAL_ID
where DATE_FORMAT(d.CREATE_TIME,'%Y%m') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 MONTH),'%Y%m')
and s.HANDLE_STATUS in ('1','5','6','7') and d.type = '0' and DATE_FORMAT(s.SOCIAL_START_DATE,'%Y%m') <![CDATA[ < ]]> DATE_FORMAT(now(),'%Y%m')
union all
select
s.SOCIAL_HOUSEHOLD_NAME companyName,s.EMP_NAME empName,s.EMP_IDCARD empIdCard
from t_social_info s
left join t_dispatch_info d on s.id=d.SOCIAL_ID
where DATE_FORMAT(d.CREATE_TIME,'%Y%m') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 MONTH),'%Y%m')
and s.HANDLE_STATUS = '3' and d.type = '1' and DATE_FORMAT(s.SOCIAL_START_DATE,'%Y%m') <![CDATA[ < ]]> DATE_FORMAT(now(),'%Y%m')
) a GROUP BY a.empIdCard
s.NAME companyName,'' paymentType,'' payMonth,'' returnInfo ,'' returnInfoOne ,'' returnInfoTwo
from sys_house_hold_info s
where s.DEL_FLAG='0' and s.TYPE = '0' and s.AUTO_STATUS = '0'
</select>
<!-- 社保士兵实缴3张表查询3_合肥-医保-单位缴费明细查询 -->
<select id="getSoldierPaymentSelectThreeList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierPaymentSelectThreeVo">
......
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