Commit 75f56954 authored by hongguangwu's avatar hongguangwu

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

parents 50a6ea84 4e4dd37d
...@@ -1263,6 +1263,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1263,6 +1263,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp.setIdTown(Integer.parseInt(areaStr)); saveEmp.setIdTown(Integer.parseInt(areaStr));
} }
} }
// 档案所在地
if (Common.isNotNull(excel.getFileProvince())) {
saveEmp.setFileProvince(Integer.parseInt(excel.getFileProvince()));
}
if (Common.isNotNull(excel.getFileCity())) {
saveEmp.setFileCity(Integer.parseInt(excel.getFileCity()));
}
if (Common.isNotNull(excel.getFileTown())) {
saveEmp.setFileTown(Integer.parseInt(excel.getFileTown()));
}
if (Common.isNotNull(excel.getIsCollege())) { if (Common.isNotNull(excel.getIsCollege())) {
if (CommonConstants.IS_TRUE.equals(excel.getIsCollege())) { if (CommonConstants.IS_TRUE.equals(excel.getIsCollege())) {
saveEmp.setIsCollege(CommonConstants.ONE_INT); saveEmp.setIsCollege(CommonConstants.ONE_INT);
...@@ -1781,6 +1791,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1781,6 +1791,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
} }
} }
// 档案所在地
if (Common.isNotNull(excel.getFileProvince())) {
saveEmp.setFileProvince(Integer.parseInt(excel.getFileProvince()));
}
if (Common.isNotNull(excel.getFileCity())) {
saveEmp.setFileCity(Integer.parseInt(excel.getFileCity()));
}
if (Common.isNotNull(excel.getFileTown())) {
saveEmp.setFileTown(Integer.parseInt(excel.getFileTown()));
}
// 邮箱 // 邮箱
if (Common.isNotNull(excel.getEmpEmail())) { if (Common.isNotNull(excel.getEmpEmail())) {
if (excel.getEmpEmail().contains("@")) { if (excel.getEmpEmail().contains("@")) {
......
...@@ -20,5 +20,7 @@ public class ResultConstants { ...@@ -20,5 +20,7 @@ public class ResultConstants {
public static final String DATA_IMPORT_PARSING_RESULT = "数据导入解析!数据行数:"; public static final String DATA_IMPORT_PARSING_RESULT = "数据导入解析!数据行数:";
public static final String NO_SELECT_DATA = "请选择数据"; public static final String NO_SELECT_DATA = "请选择数据";
public static final String NO_GETLOCK_DATA = "当前用户操作处理中,请稍后重试!"; public static final String NO_GETLOCK_DATA = "当前用户操作处理中,请稍后重试!";
public static final String NO_GETLOCK_DATA_SEARCH = "多用户同时请求中,请稍后重试!";
public static final String NO_ID = "操作失败,id不能为空!"; public static final String NO_ID = "操作失败,id不能为空!";
} }
...@@ -5168,11 +5168,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -5168,11 +5168,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
&& Common.isEmpty(searchVo.getSecondIndicatorBelong())){ && Common.isEmpty(searchVo.getSecondIndicatorBelong())){
// 只有社保户 // 只有社保户
if (Common.isNotNull(searchVo.getSocialHousehold())){ if (Common.isNotNull(searchVo.getSocialHousehold())){
return R.ok(baseMapper.selectCountPaymentSearchInfoSocial(searchVo)); return R.ok(baseMapper.selectCountPaymentSearchInfoSocialByLimit(searchVo));
} }
//只有公积金户 //只有公积金户
if (Common.isNotNull(searchVo.getProvidentHousehold())){ if (Common.isNotNull(searchVo.getProvidentHousehold())){
return R.ok(baseMapper.selectCountPaymentSearchInfoFund(searchVo)); return R.ok(baseMapper.selectCountPaymentSearchInfoSocialByLimit(searchVo));
} }
} }
return R.ok(baseMapper.selectCountSumPaymentInfo(searchVo)); return R.ok(baseMapper.selectCountSumPaymentInfo(searchVo));
...@@ -5266,7 +5266,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -5266,7 +5266,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//查询数据 //查询数据
return new R<>(this.getTPaymentInfoNewPage(page, tPaymentInfo)); return new R<>(this.getTPaymentInfoNewPage(page, tPaymentInfo));
} else { } else {
return R.failed(ResultConstants.NO_GETLOCK_DATA); return R.failed(ResultConstants.NO_GETLOCK_DATA_SEARCH);
} }
}finally { }finally {
//主动释放锁 //主动释放锁
...@@ -5287,7 +5287,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -5287,7 +5287,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//查询数据 //查询数据
return new R<>(this.getTPaymentInfoPage(page, tPaymentInfo)); return new R<>(this.getTPaymentInfoPage(page, tPaymentInfo));
} else { } else {
return R.failed(ResultConstants.NO_GETLOCK_DATA); return R.failed(ResultConstants.NO_GETLOCK_DATA_SEARCH);
} }
}finally { }finally {
//主动释放锁 //主动释放锁
......
...@@ -941,6 +941,21 @@ ...@@ -941,6 +941,21 @@
${tPaymentInfo.authSql} ${tPaymentInfo.authSql}
</if> </if>
<!-- 区域 默认精准查询 0 包含下级查询 1 结束 2023-03-02 fxj --> <!-- 区域 默认精准查询 0 包含下级查询 1 结束 2023-03-02 fxj -->
<if test="tPaymentInfo.pushStatus != null and tPaymentInfo.pushStatus.trim() != ''">
AND a.PUSH_STATUS = #{tPaymentInfo.pushStatus}
</if>
<if test="tPaymentInfo.createName != null and tPaymentInfo.createName.trim() != ''">
AND a.CREATE_NAME = #{tPaymentInfo.createName}
</if>
<if test="tPaymentInfo.createTimeStart != null and tPaymentInfo.createTimeEnd != null">
AND a.CREATE_TIME BETWEEN #{tPaymentInfo.createTimeStart} AND #{tPaymentInfo.createTimeEnd}
</if>
<if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
</if>
<if test="tPaymentInfo.createBy != null and tPaymentInfo.createBy.trim() != ''">
AND a.CREATE_BY = #{tPaymentInfo.createBy}
</if>
</if> </if>
</if> </if>
</sql> </sql>
...@@ -1113,6 +1128,21 @@ ...@@ -1113,6 +1128,21 @@
${tPaymentInfo.authSql} ${tPaymentInfo.authSql}
</if> </if>
<!-- 区域 默认精准查询 0 包含下级查询 1 结束 2023-03-02 fxj --> <!-- 区域 默认精准查询 0 包含下级查询 1 结束 2023-03-02 fxj -->
<if test="tPaymentInfo.pushStatus != null and tPaymentInfo.pushStatus.trim() != ''">
AND a.PUSH_STATUS = #{tPaymentInfo.pushStatus}
</if>
<if test="tPaymentInfo.createName != null and tPaymentInfo.createName.trim() != ''">
AND a.CREATE_NAME = #{tPaymentInfo.createName}
</if>
<if test="tPaymentInfo.createTimeStart != null and tPaymentInfo.createTimeEnd != null">
AND a.CREATE_TIME BETWEEN #{tPaymentInfo.createTimeStart} AND #{tPaymentInfo.createTimeEnd}
</if>
<if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
</if>
<if test="tPaymentInfo.createBy != null and tPaymentInfo.createBy.trim() != ''">
AND a.CREATE_BY = #{tPaymentInfo.createBy}
</if>
</if> </if>
</if> </if>
</sql> </sql>
......
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