Commit 6828011b authored by hongguangwu's avatar hongguangwu

MVP1.6.9-社保自动化日志

parent bbb67e48
......@@ -232,7 +232,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo.setId(vo.getSocialId());
socialIdList.add(socialInfo);
ygsAddlistCopy.add(vo);
remark = "提交成功!";
remark = "已推送提交任务!";
} else {
if (0 == canPushType) {
remark = "未到时间,不推送!";
......@@ -299,7 +299,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo.setId(vo.getSocialId());
socialIdList.add(socialInfo);
ysdAddlistCopy.add(vo);
remark = "提交成功!";
remark = "已推送提交任务!";
} else {
if (0 == canPushType) {
remark = "未到时间,不推送!";
......@@ -459,7 +459,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
List<SocialSoldierYgsAuditVo> ygsAddByGroupBylist = baseMapper.getSocialSoldierYgsAuditVoListByGroupBy();
String sheetName = "审核数据查询";
String type = "审核";
String remark = "推送审核成功!";
String remark = "已推送审核任务!";
String errorRemark = "推送社保士兵审核异常!";
TSocialSoldierLog socialLog;
List<TSocialSoldierLog> logList = new ArrayList<>();
......
......@@ -2384,8 +2384,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
&& Common.isNotNull(configTemp.getReplaceLeft())
&& Common.isNotNull(configTemp.getReplaceRight())
) {
configReturn = new FailReasonConfig();
BeanUtil.copyProperties(configTemp, configReturn);
String[] leftRes = msg.split(configTemp.getReplaceLeft());
if (leftRes.length>1) {
String result = null;
......@@ -2401,12 +2399,15 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
result = leftRes[1];
}
if (Common.isNotNull(result)) {
configReturn = new FailReasonConfig();
BeanUtil.copyProperties(configTemp, configReturn);
configReturn.setSimpleReason(configReturn.getSimpleReason()
+ configReturn.getReplaceLeft() + result + configReturn.getReplaceRight());
return configReturn;
}
}
}
return configTemp;
}
}
}
......
......@@ -221,7 +221,7 @@
SELECT
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','增员','减员') type,
DATE_FORMAT(a.AUDIT_TIME,'%Y%m01') startDate,
DATE_FORMAT(min(a.AUDIT_TIME),'%Y%m%d') startDate,
DATE_FORMAT(now(),'%Y%m%d') endDate,
'' backInfo,'' backInfoOne,'' backInfoTwo
FROM t_dispatch_info a
......@@ -236,7 +236,7 @@
SELECT
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','参保人员增员申报','参保人员减员申报') type,
DATE_FORMAT(a.AUDIT_TIME,'%Y%m01') startDate,
DATE_FORMAT(min(a.AUDIT_TIME),'%Y%m%d') startDate,
DATE_FORMAT(now(),'%Y%m%d') endDate,
'' backInfo,'' backInfoOne,'' backInfoTwo
FROM t_dispatch_info a
......@@ -269,7 +269,7 @@
SELECT
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','职工新参保登记','参保人员减员申报') type,
DATE_FORMAT(a.AUDIT_TIME,'%Y%m01') startDate,
DATE_FORMAT(min(a.AUDIT_TIME),'%Y%m%d') startDate,
DATE_FORMAT(now(),'%Y%m%d') endDate,
'' backInfo,'' backInfoOne,'' backInfoTwo
FROM t_dispatch_info a
......
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