Commit daf0dd93 authored by 李灿灿's avatar 李灿灿

Merge branch 'develop' into feature-licancan

parents f90e76c9 f5e9ac94
...@@ -197,12 +197,14 @@ public class SalaryAccountUtil implements Serializable { ...@@ -197,12 +197,14 @@ public class SalaryAccountUtil implements Serializable {
} }
if (SalaryConstants.PDEDUCTION_JAVA.equals(scs.getJavaFiedName()) if (SalaryConstants.PDEDUCTION_JAVA.equals(scs.getJavaFiedName())
|| SalaryConstants.UDEDUCTION_JAVA.equals(scs.getJavaFiedName()) || SalaryConstants.UDEDUCTION_JAVA.equals(scs.getJavaFiedName())
|| SalaryConstants.ENTERPRISE_ANNUITY_JAVA.equals(scs.getJavaFiedName())
|| SalaryConstants.ENTERPRISE_ANNUITY_UNIT_JAVA.equals(scs.getJavaFiedName())
|| scs.getJavaFiedName().contains(SalaryConstants.WITHHOLIDING)) { || scs.getJavaFiedName().contains(SalaryConstants.WITHHOLIDING)) {
try { try {
new BigDecimal(cellValueStr.replace(",","")); new BigDecimal(cellValueStr.replace(",",""));
} catch (Exception ex) { } catch (Exception ex) {
errorFlag = false; errorFlag = false;
error = "第" + (i + 2) + "行:代扣,只能是金额!"; error = "第" + (i + 2) + "行:代扣、企业年金,只能是金额!";
errorList.add(new ErrorMessage((i + 2), error)); errorList.add(new ErrorMessage((i + 2), error));
continue; continue;
} }
......
...@@ -160,6 +160,7 @@ public class SalaryConstants { ...@@ -160,6 +160,7 @@ public class SalaryConstants {
public static final String EXEMPTION_PERSION_TAX_JAVA = "exemptionPersionTax"; public static final String EXEMPTION_PERSION_TAX_JAVA = "exemptionPersionTax";
//企业(职业)年金 //企业(职业)年金
public static final String ENTERPRISE_ANNUITY_JAVA = "enterpriseAnnuity"; public static final String ENTERPRISE_ANNUITY_JAVA = "enterpriseAnnuity";
public static final String ENTERPRISE_ANNUITY_UNIT_JAVA = "enterpriseAnnuityUnit";
//风险抵押金 //风险抵押金
public static final String RISK_MORTGAGE_MONEY_JAVA = "riskMortgageMoney"; public static final String RISK_MORTGAGE_MONEY_JAVA = "riskMortgageMoney";
//单位补足扣返 //单位补足扣返
......
...@@ -157,7 +157,7 @@ public class FundHandleExportVo implements Serializable { ...@@ -157,7 +157,7 @@ public class FundHandleExportVo implements Serializable {
private String providentHouseholdName; private String providentHouseholdName;
/** /**
* *
*委托备注 *委托备注——2022-11-10 16:54:32与房工讨论,由于派增派减两个委托备注,只能取派单表里的委托备注,社保公积金的委托备注字段废弃
**/ **/
@ExcelAttribute(name = "委托备注",needExport = true) @ExcelAttribute(name = "委托备注",needExport = true)
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
......
...@@ -386,7 +386,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -386,7 +386,7 @@ public class SocialHandleExportVo implements Serializable {
private BigDecimal personalBigailmentMoney; private BigDecimal personalBigailmentMoney;
/** /**
* *
*委托备注 *委托备注——2022-11-10 16:54:32与房工讨论,由于派增派减两个委托备注,只能取派单表里的委托备注,社保公积金的委托备注字段废弃
**/ **/
@ExcelAttribute(name = "委托备注",needExport = true) @ExcelAttribute(name = "委托备注",needExport = true)
@Schema(description = "委托备注") @Schema(description = "委托备注")
......
...@@ -653,7 +653,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -653,7 +653,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
HashMap<String, List<SysBaseSetInfo>> baseFundSetMap = new HashMap<>(); HashMap<String, List<SysBaseSetInfo>> baseFundSetMap = new HashMap<>();
HashMap<String, TPreDispatchInfo> baseSocialTimeMap = new HashMap<>(); HashMap<String, TPreDispatchInfo> baseSocialTimeMap = new HashMap<>();
HashMap<String, TPreDispatchInfo> baseFundTimeMap = new HashMap<>(); HashMap<String, TPreDispatchInfo> baseFundTimeMap = new HashMap<>();
initSocialAndFundBaseSet(listInfo, baseSocialSetMap, baseFundSetMap, baseSocialTimeMap, baseFundTimeMap); initSocialAndFundBaseSet(listInfo, baseSocialSetMap, baseFundSetMap, baseSocialTimeMap, baseFundTimeMap, null);
// 查询当月对应身份证是否已经派增或派减了 后面做判重处理 // 查询当月对应身份证是否已经派增或派减了 后面做判重处理
HashMap<String, TPreDispatchInfo> existsMap = new HashMap<>(); HashMap<String, TPreDispatchInfo> existsMap = new HashMap<>();
initExistsMapByIdCards(listInfo, existsMap, CommonConstants.ZERO_STRING); initExistsMapByIdCards(listInfo, existsMap, CommonConstants.ZERO_STRING);
...@@ -807,8 +807,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -807,8 +807,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
HashMap<String, TPreDispatchInfo> baseFundTimeMap = new HashMap<>(); HashMap<String, TPreDispatchInfo> baseFundTimeMap = new HashMap<>();
HashMap<String,TPreDispatchInfo> existsMap = new HashMap<>(); HashMap<String,TPreDispatchInfo> existsMap = new HashMap<>();
HashMap<String,TPreDispatchInfo> repeatMap = new HashMap<>(); HashMap<String,TPreDispatchInfo> repeatMap = new HashMap<>();
initSocialAndFundBaseSet(listInfo, baseSocialSetMap, baseFundSetMap, baseSocialTimeMap, baseFundTimeMap);
initExistsMapByIds(listInfo,existsMap,repeatMap); initExistsMapByIds(listInfo,existsMap,repeatMap);
initSocialAndFundBaseSet(listInfo, baseSocialSetMap, baseFundSetMap, baseSocialTimeMap, baseFundTimeMap,existsMap);
// 获取所有地市的最迟派单日限制 // 获取所有地市的最迟派单日限制
HashMap<String,Integer> dayConfMap = new HashMap<>(); HashMap<String,Integer> dayConfMap = new HashMap<>();
initDayConfMap(dayConfMap); initDayConfMap(dayConfMap);
...@@ -1056,6 +1056,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1056,6 +1056,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
errorList.add(new ErrorMessage(i, CommonConstants.DATA_CAN_NOT_EMPTY)); errorList.add(new ErrorMessage(i, CommonConstants.DATA_CAN_NOT_EMPTY));
return true; return true;
} }
info.setCompany(temp.getCompany());
info.setType(temp.getType()); info.setType(temp.getType());
if (null != repeat && !repeat.getId().equals(info.getId())){ if (null != repeat && !repeat.getId().equals(info.getId())){
errorList.add(new ErrorMessage(i, "已存在身份证对应缴费地的数据!")); errorList.add(new ErrorMessage(i, "已存在身份证对应缴费地的数据!"));
...@@ -1866,7 +1867,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1866,7 +1867,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
!info.getPensionStart().equals(temp.getPensionStart())); !info.getPensionStart().equals(temp.getPensionStart()));
} }
if (flag) { if (flag) {
dateTime = DateUtil.stringToDate(info.getPensionStart()+"01", DateUtil.ISO_DATE_FORMAT); dateTime = DateUtil.stringToDate(DateUtil.getYearAndMonth(info.getPensionStart(),CommonConstants.ONE_INT)+"01", DateUtil.ISO_DATE_FORMAT);
if (null != dateTime) { if (null != dateTime) {
socialBases = baseSocialSetMap.get(info.getCompany()); socialBases = baseSocialSetMap.get(info.getCompany());
if (Common.isNotNull(socialBases)){ if (Common.isNotNull(socialBases)){
...@@ -1917,7 +1918,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1917,7 +1918,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
!info.getFundStart().equals(temp.getFundStart())); !info.getFundStart().equals(temp.getFundStart()));
} }
if (flag) { if (flag) {
dateTime = DateUtil.stringToDate(info.getFundStart()+"01", DateUtil.ISO_DATE_FORMAT); dateTime = DateUtil.stringToDate(DateUtil.getYearAndMonth(info.getFundStart(),CommonConstants.ONE_INT)+"01", DateUtil.ISO_DATE_FORMAT);
if (null != dateTime) { if (null != dateTime) {
baseSetInfos = baseFundSetMap.get(info.getCompany()); baseSetInfos = baseFundSetMap.get(info.getCompany());
if (Common.isNotNull(baseSetInfos)){ if (Common.isNotNull(baseSetInfos)){
...@@ -2029,6 +2030,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -2029,6 +2030,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
* @param baseFundSetMap * @param baseFundSetMap
* @param baseSocialTimeMap * @param baseSocialTimeMap
* @param baseFundTimeMap * @param baseFundTimeMap
* @param existsMap
* @return * @return
* @Author huyc * @Author huyc
* @Date 2022-07-18 * @Date 2022-07-18
...@@ -2037,12 +2039,20 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -2037,12 +2039,20 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
Map<String, List<SysBaseSetInfo>> baseSocialSetMap, Map<String, List<SysBaseSetInfo>> baseSocialSetMap,
Map<String, List<SysBaseSetInfo>> baseFundSetMap, Map<String, List<SysBaseSetInfo>> baseFundSetMap,
Map<String, TPreDispatchInfo> baseSocialTimeMap, Map<String, TPreDispatchInfo> baseSocialTimeMap,
Map<String, TPreDispatchInfo> baseFundTimeMap) { Map<String, TPreDispatchInfo> baseFundTimeMap, HashMap<String, TPreDispatchInfo> existsMap) {
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
Map<String, String> houseMap = new HashMap<>(); Map<String, String> houseMap = new HashMap<>();
if (Common.isNotNull(listInfo)) { if (Common.isNotNull(listInfo)) {
TPreDispatchInfo temp;
for (TPreDispatchInfo info : listInfo) { for (TPreDispatchInfo info : listInfo) {
houseMap.put(info.getCompany(),info.getCompany()); if (Common.isNotNull(existsMap)){
temp = existsMap.get(info.getId());
if (Common.isNotNull(temp)){
houseMap.put(info.getCompany(),info.getCompany());
}
}else {
houseMap.put(info.getCompany(),info.getCompany());
}
if (Common.isNotNull(info.getPensionStart())) { if (Common.isNotNull(info.getPensionStart())) {
baseSocialTimeMap.put(info.getPensionStart(), info); baseSocialTimeMap.put(info.getPensionStart(), info);
} }
......
...@@ -737,6 +737,7 @@ ...@@ -737,6 +737,7 @@
<result property="fundCity" column="FUND_CITY"/> <result property="fundCity" column="FUND_CITY"/>
<result property="fundTown" column="FUND_TOWN"/> <result property="fundTown" column="FUND_TOWN"/>
<result property="belongUnit" column="BELONG_UNIT_NAME"/> <result property="belongUnit" column="BELONG_UNIT_NAME"/>
<result property="fundTrustRemark" column="TRUST_REMARK"/>
</resultMap> </resultMap>
<!--tDispatchInfo 社保花名册数据查询--> <!--tDispatchInfo 社保花名册数据查询-->
...@@ -785,7 +786,7 @@ ...@@ -785,7 +786,7 @@
s.UNIT_BIGAILMENT_CARDINAL, s.UNIT_BIGAILMENT_CARDINAL,
s.UNIT_BIGAILMENT_MONEY, s.UNIT_BIGAILMENT_MONEY,
s.PERSONAL_BIGAILMENT_MONEY, s.PERSONAL_BIGAILMENT_MONEY,
s.TRUST_REMARK socailTrustRemark, a.TRUST_REMARK,
a.REDUCE_REASON a.REDUCE_REASON
<include refid="where_getSocialRecordRoster"/> <include refid="where_getSocialRecordRoster"/>
</select> </select>
...@@ -844,7 +845,8 @@ ...@@ -844,7 +845,8 @@
f.PERSONAL_PROVIDENT_FEE, f.PERSONAL_PROVIDENT_FEE,
f.FUND_PROVINCE, f.FUND_PROVINCE,
f.FUND_CITY, f.FUND_CITY,
f.FUND_TOWN f.FUND_TOWN,
a.TRUST_REMARK
<include refid="where_getFundRecord"/> <include refid="where_getFundRecord"/>
</select> </select>
...@@ -868,7 +870,7 @@ ...@@ -868,7 +870,7 @@
</if> </if>
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
<where> <where>
1=1 and s.DELETE_FLAG = 0 s.DELETE_FLAG = 0
<if test="idsStr != null and idsStr.size > 0"> <if test="idsStr != null and idsStr.size > 0">
AND a.ID in AND a.ID in
<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")"> <foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">
...@@ -982,7 +984,7 @@ ...@@ -982,7 +984,7 @@
</if> </if>
left join t_provident_fund f on a.FUND_ID = f.id left join t_provident_fund f on a.FUND_ID = f.id
<where> <where>
1=1 and a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
<if test="idsStr != null and idsStr.size > 0"> <if test="idsStr != null and idsStr.size > 0">
AND a.ID in AND a.ID in
<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")"> <foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">
......
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