Commit 3e18fa65 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents a0398312 14113e5e
...@@ -13,6 +13,7 @@ public class EmployeeConstants { ...@@ -13,6 +13,7 @@ public class EmployeeConstants {
public static final String VALIDITY_END = "身份证截止日期必填"; public static final String VALIDITY_END = "身份证截止日期必填";
public static final String VALIDITY_END_FORMAT = "身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期"; public static final String VALIDITY_END_FORMAT = "身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期";
public static final String EMP_VALIDITY_END_START_DATE = "身份证截止日期不能小于等于身份证开始日期"; public static final String EMP_VALIDITY_END_START_DATE = "身份证截止日期不能小于等于身份证开始日期";
public static final String EMP_VALIDITY_DATE_ERROR = "身份证截止日期或开始日期有误,请检查修改后导入";
public static final String EMP_NATIONAL = "民族必填"; public static final String EMP_NATIONAL = "民族必填";
public static final String ID_PROVINCE = "户籍所在地必填"; public static final String ID_PROVINCE = "户籍所在地必填";
public static final String FILE_PROVINCE = "档案所在地(省市)必填"; public static final String FILE_PROVINCE = "档案所在地(省市)必填";
......
...@@ -1148,12 +1148,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1148,12 +1148,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg.add(EmployeeConstants.VALIDITY_END_FORMAT); errorMsg.add(EmployeeConstants.VALIDITY_END_FORMAT);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.VALIDITY_END_FORMAT)); errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.VALIDITY_END_FORMAT));
} }
// 身份证起止有效期 都有值 且 截止日期正常
if (Common.isNotNull(employeeInfo.getValidityStart()) && Common.isNotNull(employeeInfo.getValidityEnd())
&& !"长期".equals(employeeInfo.getValidityEnd())
&& DateUtil.checkStringToDate(employeeInfo.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT)
&& employeeInfo.getValidityStart().after(DateUtil.stringToDate(employeeInfo.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
}
} }
@Override @Override
......
...@@ -3333,6 +3333,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3333,6 +3333,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
Map<String, String> parentAreaMap = new HashMap<>(); Map<String, String> parentAreaMap = new HashMap<>();
Map<String, Date> startDateMap; Map<String, Date> startDateMap;
int lineNum = 2; int lineNum = 2;
Date date1;
Date date2;
for (Map<String, String> rowMap : vo.getContentList()) { for (Map<String, String> rowMap : vo.getContentList()) {
curVo = null; curVo = null;
errorMust = new StringBuilder(); errorMust = new StringBuilder();
...@@ -3502,12 +3504,21 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3502,12 +3504,21 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
// 身份证起止有效期 都有值 且 截止日期正常 // 身份证起止有效期 都有值 且 截止日期正常
if (Common.isNotNull(detail.getValidityStart()) if (Common.isNotNull(detail.getValidityStart())
&& Common.isNotNull(detail.getValidityEnd()) && Common.isNotNull(detail.getValidityEnd())){
&& !"长期".equals(detail.getValidityEnd()) date1 = DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT);
date2 = DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT);
if (null == date1 || null == date2){
detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_DATE_ERROR);
}else {
if (!"长期".equals(detail.getValidityEnd())
&& !DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT) && !DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)
.after(DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){ .after(DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_END_START_DATE); detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_END_START_DATE);
} }
}
}
excelList.add(detail); excelList.add(detail);
} }
......
...@@ -17,7 +17,7 @@ import java.util.Date; ...@@ -17,7 +17,7 @@ import java.util.Date;
* @date 2025-02-25 14:48:11 * @date 2025-02-25 14:48:11
*/ */
@Data @Data
@ColumnWidth(12) @ColumnWidth(15)
public class EmployeeRegistrationExportVo implements Serializable { public class EmployeeRegistrationExportVo implements Serializable {
@ExcelAttribute(name = "员工姓名") @ExcelAttribute(name = "员工姓名")
......
...@@ -17,7 +17,7 @@ import java.util.Date; ...@@ -17,7 +17,7 @@ import java.util.Date;
* @date 2025-02-25 14:48:11 * @date 2025-02-25 14:48:11
*/ */
@Data @Data
@ColumnWidth(12) @ColumnWidth(15)
public class EmployeeRegistrationHrExportVo implements Serializable { public class EmployeeRegistrationHrExportVo implements Serializable {
@ExcelAttribute(name = "项目编码") @ExcelAttribute(name = "项目编码")
......
...@@ -26,7 +26,7 @@ mybatis-plus: ...@@ -26,7 +26,7 @@ mybatis-plus:
logic-not-delete-value: 0 logic-not-delete-value: 0
configuration: configuration:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# spring security 配置 # spring security 配置
security: security:
......
...@@ -1476,7 +1476,6 @@ ...@@ -1476,7 +1476,6 @@
1=1 1=1
<include refid="tPaymentInfo_where"/> <include refid="tPaymentInfo_where"/>
</where> </where>
ORDER BY a.CREATE_TIME desc
</select> </select>
<select id="getTPaymentInfoPageIds" resultType="java.lang.String"> <select id="getTPaymentInfoPageIds" resultType="java.lang.String">
SELECT SELECT
...@@ -1682,18 +1681,18 @@ ...@@ -1682,18 +1681,18 @@
<choose> <choose>
<when test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != '' and tPaymentInfo.socialHousehold == null"> <when test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != '' and tPaymentInfo.socialHousehold == null">
CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH) AS keyGroup, CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH) AS keyGroup,
a.PROVIDENT_PAY_MONTH as SOCIAL_PAY_MONTH, IFNULL(a.PROVIDENT_PAY_MONTH,a.SOCIAL_PAY_MONTH) as SOCIAL_PAY_MONTH,
a.PROVIDENT_CREATE_MONTH as SOCIAL_CREATE_MONTH, IFNULL(a.PROVIDENT_CREATE_MONTH,a.SOCIAL_CREATE_MONTH) as SOCIAL_CREATE_MONTH,
</when> </when>
<when test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"> <when test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup, CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup,
a.SOCIAL_PAY_MONTH, IFNULL(a.SOCIAL_PAY_MONTH,a.PROVIDENT_PAY_MONTH) as SOCIAL_PAY_MONTH,
a.SOCIAL_CREATE_MONTH, IFNULL(a.SOCIAL_CREATE_MONTH,a.PROVIDENT_CREATE_MONTH) as SOCIAL_CREATE_MONTH,
</when> </when>
<otherwise> <otherwise>
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup, CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup,
a.SOCIAL_PAY_MONTH, IFNULL(a.SOCIAL_PAY_MONTH,a.PROVIDENT_PAY_MONTH) as SOCIAL_PAY_MONTH,
a.SOCIAL_CREATE_MONTH, IFNULL(a.SOCIAL_CREATE_MONTH,a.PROVIDENT_CREATE_MONTH) as SOCIAL_CREATE_MONTH,
</otherwise> </otherwise>
</choose> </choose>
a.EMP_NAME, a.EMP_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