Commit 3fcc1c9c authored by chenyuxi's avatar chenyuxi

feat: bug调整

parent 4de6b6e2
......@@ -114,6 +114,17 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
for (int i = 0; i < excelVOList.size(); i++) {
// 已有验证报错直接下一个
EmpCertificateExcelVO excel = excelVOList.get(i);
// 【是否有职业资格证书】为是,申报年度和职业资格名称必填
if(CommonConstants.ZERO_STRING.equals(excel.getHaveQualification())){
if (Common.isEmpty(excel.getDeclareYear())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"申报年度_字段不可为空"));
continue;
}
if (Common.isEmpty(excel.getQualificationType())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"职业资格名称_字段不可为空"));
continue;
}
}
if (Common.isNotNull(excel.getDeclareYear()) &&
Integer.parseInt(excel.getDeclareYear()) > DateUtil.getYearOfInt(new Date())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_CERTIFICATE_DECLARE_YEAR_ERROR)));
......
......@@ -3889,9 +3889,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpBadRecord.setSettleDomain(deptId);
tPreEmpBadRecord.setProject(dept.getDepartName());
tPreEmpBadRecord.setProjectCode(dept.getDepartNo());
if (employee != null) {
tPreEmpBadRecord.setEmpName(employee.getEmpName());
}
tPreEmpBadRecord.setEmpName(main.getEmpName());
tPreEmpBadRecord.setEmpId(empId);
tPreEmpBadRecord.setEmpIdcard(empIdCard);
tPreEmpBadRecord.setCreateBy(user.getId());
tPreEmpBadRecord.setCreateName(user.getNickname());
......
......@@ -44,6 +44,7 @@
<result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/>
<result property="remark" column="REMARK"/>
<result property="haveQualification" column="HAVE_QUALIFICATION"/>
</resultMap>
<!--删除-->
<delete id="deleteProfessionalByEmpId">
......
......@@ -42,6 +42,7 @@
<result property="updateTime" column="UPDATE_TIME"/>
<result property="settleDomain" column="SETTLE_DOMAIN"/>
<result property="oldId" column="OLD_ID"/>
<result property="badRecordFlag" column="BAD_RECORD_FLAG"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -61,7 +62,8 @@
a.CREATE_TIME,
a.UPDATE_TIME,
a.OLD_ID,
a.SETTLE_DOMAIN
a.SETTLE_DOMAIN,
a.BAD_RECORD_FLAG
</sql>
<sql id="tPreEmpBadRecord_where">
<if test="tPreEmpBadRecord != null">
......
......@@ -46,6 +46,7 @@
<result property="updateTime" column="UPDATE_TIME"/>
<result property="remark" column="REMARK"/>
<result property="oldId" column="OLD_ID"/>
<result property="haveQualification" column="HAVE_QUALIFICATION"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -69,7 +70,8 @@
a.CREATE_TIME,
a.UPDATE_TIME,
a.OLD_ID,
a.REMARK
a.REMARK,
a.HAVE_QUALIFICATION
</sql>
<sql id="tPreEmpProfessionalQualification_where">
<if test="tPreEmpProfessionalQualification != null">
......
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