Commit c30ecab0 authored by fangxinjiang's avatar fangxinjiang

公积金自动化-fxj

parent 934c0521
......@@ -1096,6 +1096,8 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
SysPayProportion fundPro = null;
String[] split = null;
String[] splitSub = null;
String startDateTemp = null;
String doMonthTemp = null;
// 执行数据插入操作 组装
for (int i = 0; i < excelVOList.size(); i++) {
excel = excelVOList.get(i);
......@@ -1131,14 +1133,14 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
errorMessageList.add(errorMsg);
continue;
}
excel.setApplyStartDate(excel.getApplyStartDate()
startDateTemp = excel.getApplyStartDate()
.replace("-", CommonConstants.EMPTY_STRING)
.replace("/", CommonConstants.EMPTY_STRING));
excel.setDoMonth(excel.getDoMonth()
.replace("/", CommonConstants.EMPTY_STRING);
doMonthTemp = excel.getDoMonth()
.replace("-", CommonConstants.EMPTY_STRING)
.replace("/", CommonConstants.EMPTY_STRING));
.replace("/", CommonConstants.EMPTY_STRING);
//适用起始月份
dateFormat = DateUtil.stringToDate2(excel.getApplyStartDate()+"01", DateUtil.ISO_DATE_FORMAT);
dateFormat = DateUtil.stringToDate2(startDateTemp+"01", DateUtil.ISO_DATE_FORMAT);
if (null != dateFormat){
infoVo.setApplyStartDate(dateFormat);
}else {
......@@ -1166,7 +1168,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
temp.setApplyEndDate(DateUtil.addDayByDate(dateFormat,-1));
}
//执行月份校验
dateUse = DateUtil.stringToDate2(excel.getDoMonth()+"01", DateUtil.ISO_DATE_FORMAT);
dateUse = DateUtil.stringToDate2(doMonthTemp+"01", DateUtil.ISO_DATE_FORMAT);
if (null != dateUse){
infoVo.setDoMonth(DateUtil.getYearAndMonth(dateFormat,0));
}else {
......
......@@ -639,8 +639,8 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
@Override
public void pushWxConfrimMessage() {
//获取所有预计派单时间为当天而且状态是待确认的合同待签署数据
List<TDispatchInfoPre> unConfirmList = baseMapper.getAllUnDisData();
//获取所有预计派单时间为当天而且状态是待确认的社保待签署数据
List<TDispatchInfoPre> unConfirmList = baseMapper.getAllUnDisSocialData();
if (Common.isNotNull(unConfirmList) && !unConfirmList.isEmpty()) {
for (TDispatchInfoPre pre : unConfirmList) {
try {
......@@ -650,6 +650,17 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
}
}
}
//获取所有预计派单时间为当天而且状态是待确认的公积金待签署数据
List<TDispatchInfoPre> unConfirmFundList = baseMapper.getAllUnDisFundData();
if (Common.isNotNull(unConfirmFundList) && !unConfirmFundList.isEmpty()) {
for (TDispatchInfoPre pre : unConfirmFundList) {
try {
sendMessageToWx(pre);
} catch (Exception e) {
log.error("执行异常", e);
}
}
}
}
@Override
......
......@@ -563,12 +563,23 @@
</foreach>
</where>
</select>
<select id="getAllUnDisData" resultMap="tDispatchInfoPreMap">
<select id="getAllUnDisSocialData" resultMap="tDispatchInfoPreMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_dispatch_info_pre a
where
a.expected_collection_time is not null
a.expected_collection_time is not null and type_sub = '0'
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status = '0'
group by a.customer_user_login_name
</select>
<select id="getAllUnDisFundData" resultMap="tDispatchInfoPreMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_dispatch_info_pre a
where
a.expected_collection_time is not null and type_sub = '1'
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status = '0'
group by a.customer_user_login_name
......
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