Commit c7b11685 authored by hongguangwu's avatar hongguangwu

MVP1.6.7-薪资导入相关

parent 1d06b323
...@@ -794,6 +794,26 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -794,6 +794,26 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
vo.setTpreEmpProfessionalQualificationList(tPreEmpProfessionalQualificationList); vo.setTpreEmpProfessionalQualificationList(tPreEmpProfessionalQualificationList);
// 预入职-其他附件
List<TPreEmpOtherFile> tPreEmpOtherFileList = tPreEmpOtherFileService.getTPreEmpOtherFileList(id);
if (tPreEmpOtherFileList != null && !tPreEmpOtherFileList.isEmpty()) {
List<TAttaInfo> attaInfoList;
URL url;
for (TPreEmpOtherFile info : tPreEmpOtherFileList) {
// 附件
attaInfoList = tAttaInfoService.getTAttaInfoListByDoMainId(info.getId());
if (attaInfoList != null) {
for (TAttaInfo atta : attaInfoList) {
url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
atta.setAttaUrl(String.valueOf(url));
}
}
info.setAttaList(attaInfoList);
}
}
vo.setTpreEmpOtherFileList(tPreEmpOtherFileList);
// 预入职-员工工作履历信息表 // 预入职-员工工作履历信息表
List<TPreEmpWorkRecording> tPreEmpWorkRecording = tPreEmpWorkRecordingService.getTPreEmpWorkRecordingList(id); List<TPreEmpWorkRecording> tPreEmpWorkRecording = tPreEmpWorkRecordingService.getTPreEmpWorkRecordingList(id);
vo.setTpreEmpWorkRecordingList(tPreEmpWorkRecording); vo.setTpreEmpWorkRecordingList(tPreEmpWorkRecording);
...@@ -824,6 +844,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -824,6 +844,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
public R<String> doImproveInformation(PreEmpMainDetailVo vo) { public R<String> doImproveInformation(PreEmpMainDetailVo vo) {
TPreEmpMain preMain = vo.getMain(); TPreEmpMain preMain = vo.getMain();
TPreEmployeeInfo tPreEmployee = vo.getTpreEmployeeInfo(); TPreEmployeeInfo tPreEmployee = vo.getTpreEmployeeInfo();
TPreEmployeeInfo oldPreEmployee = tPreEmployeeInfoService.getTPreEmployeeInfoList(preMain.getId());
TPreEmployeeProject project = vo.getTpreEmployeeProject(); TPreEmployeeProject project = vo.getTpreEmployeeProject();
if (preMain == null || tPreEmployee == null || project == null || if (preMain == null || tPreEmployee == null || project == null ||
Common.isEmpty(preMain.getId()) || Common.isEmpty(tPreEmployee.getId()) || Common.isEmpty(project.getId())) { Common.isEmpty(preMain.getId()) || Common.isEmpty(tPreEmployee.getId()) || Common.isEmpty(project.getId())) {
...@@ -843,6 +864,21 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -843,6 +864,21 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isNotNull(errorInfo)) { if (Common.isNotNull(errorInfo)) {
return R.failed(errorInfo + "不可为空!"); return R.failed(errorInfo + "不可为空!");
} }
// 计税月份
if (Common.isNotNull(tPreEmployee.getBankNo()) && Common.isEmpty(tPreEmployee.getTaxMonth())) {
return R.failed("有银行卡号,计税月份必填!");
}
if (Common.isNotNull(tPreEmployee.getTaxMonth())) {
String taxMonth = tPreEmployee.getTaxMonth().trim();
if (!taxMonth.matches(taxMonthRegex)) {
return R.failed("计税月份为6位年月,例如:202407!");
}
if (Common.isNotNull(tPreEmployee.getTaxMonthFlag()) && CommonConstants.ZERO_STRING.equals(tPreEmployee.getTaxMonthFlag())
&& oldPreEmployee != null && !oldPreEmployee.getTaxMonth().equals(tPreEmployee.getTaxMonth()) ) {
return R.failed("本年度有发薪纪录,计税月份不可编辑!");
}
}
tPreEmployeeInfoService.updateById(tPreEmployee); tPreEmployeeInfoService.updateById(tPreEmployee);
project.setEmpNatrue(tPreEmployee.getEmpNatrue()); project.setEmpNatrue(tPreEmployee.getEmpNatrue());
tPreEmployeeProjectService.updateById(project); tPreEmployeeProjectService.updateById(project);
......
...@@ -482,6 +482,14 @@ public class TSalaryStandard extends BaseEntity { ...@@ -482,6 +482,14 @@ public class TSalaryStandard extends BaseEntity {
@ExcelProperty("表格类型 0 薪资原表 1 系统模板") @ExcelProperty("表格类型 0 薪资原表 1 系统模板")
private String excelType; private String excelType;
/**
* 新员工是否更新
*/
@ExcelAttribute(name = "新员工是否更新")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("新员工是否更新:0否;1是")
private String newEmpUpdateFlag;
/** /**
* 工资月份-起 * 工资月份-起
*/ */
......
...@@ -50,4 +50,7 @@ public class SalaryUploadParamVo { ...@@ -50,4 +50,7 @@ public class SalaryUploadParamVo {
// 原表类型 // 原表类型
String originalSetName; String originalSetName;
// 新员工是否更新:0否;1是
String newEmpUpdateFlag;
} }
...@@ -229,7 +229,7 @@ public class TSalaryEmployeeController { ...@@ -229,7 +229,7 @@ public class TSalaryEmployeeController {
* @param empIdCard 身份证 * @param empIdCard 身份证
* @Description: 根据身份证获取计税月份 * @Description: 根据身份证获取计税月份
* @Author: hgw * @Author: hgw
* @Date: 2022/8/10 17:01 * @Date: 2024-7-18 10:48:15
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo>
**/ **/
@Inner @Inner
...@@ -241,7 +241,7 @@ public class TSalaryEmployeeController { ...@@ -241,7 +241,7 @@ public class TSalaryEmployeeController {
/** /**
* @Description: 预入职保存薪资人员 * @Description: 预入职保存薪资人员
* @Author: hgw * @Author: hgw
* @Date: 2022/8/10 17:01 * @Date: 2024-7-18 10:48:12
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo>
**/ **/
@Inner @Inner
......
...@@ -229,7 +229,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -229,7 +229,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
} }
//劳务费和稿酬导入 //劳务费和稿酬导入
if (CommonConstants.THREE_STRING.equals(salaryType) || CommonConstants.FOUR_STRING.equals(salaryType)) { if (CommonConstants.THREE_STRING.equals(salaryType) || CommonConstants.FOUR_STRING.equals(salaryType)) {
return this.saveLaborSubmit(configSalary, saList, dept, salaryType, orderId); return this.saveLaborSubmit(configSalary, saList, vo, dept);
} }
} else { } else {
return R.failed("导入数据不可为空"); return R.failed("导入数据不可为空");
...@@ -254,13 +254,16 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -254,13 +254,16 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
* @return: com.yifu.cloud.v1.hrms.api.entity.TSalaryStandard * @return: com.yifu.cloud.v1.hrms.api.entity.TSalaryStandard
**/ **/
public R<TSalaryStandard> saveNewTSalary(TConfigSalary configSalary, TSalaryAccountVo sav, TSettleDomainSelectVo dept public R<TSalaryStandard> saveNewTSalary(TConfigSalary configSalary, TSalaryAccountVo sav, TSettleDomainSelectVo dept
, YifuUser user, LocalDateTime nowTime, String invoiceTitle) { , YifuUser user, LocalDateTime nowTime, String invoiceTitle, String newEmpUpdateFlag) {
TSalaryStandard s = null; TSalaryStandard s = null;
if (sav != null) { if (sav != null) {
if (null == user || null == user.getId()) { if (null == user || null == user.getId()) {
return null; return null;
} }
s = new TSalaryStandard(); s = new TSalaryStandard();
if (Common.isNotNull(newEmpUpdateFlag)) {
s.setNewEmpUpdateFlag(newEmpUpdateFlag);
}
s.setInvoiceTitle(invoiceTitle); s.setInvoiceTitle(invoiceTitle);
s.setType(CommonConstants.ZERO_INT); s.setType(CommonConstants.ZERO_INT);
s.setBelongDeptId(String.valueOf(user.getDeptId())); s.setBelongDeptId(String.valueOf(user.getDeptId()));
...@@ -335,7 +338,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -335,7 +338,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
TSalaryStandard salary; TSalaryStandard salary;
//工资主表 //工资主表
R<TSalaryStandard> sr = this.saveNewTSalary(configSalary, salaryAccountVo, dept, user, nowTime, invoiceTitle); //工资主表 R<TSalaryStandard> sr = this.saveNewTSalary(configSalary, salaryAccountVo, dept, user, nowTime, invoiceTitle
, vo.getNewEmpUpdateFlag()); //工资主表
if (sr == null || sr.getCode() == CommonConstants.FAIL) { if (sr == null || sr.getCode() == CommonConstants.FAIL) {
return sr; return sr;
} else { } else {
...@@ -1524,7 +1528,11 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1524,7 +1528,11 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
* @Date: 2022/8/16 * @Date: 2022/8/16
* @return: com.yifu.cloud.v1.common.core.util.R * @return: com.yifu.cloud.v1.common.core.util.R
**/ **/
public R saveLaborSubmit(TConfigSalary configSalary, List<TSalaryAccountVo> savList, TSettleDomainSelectVo dept, String salaryType, String orderId) { public R saveLaborSubmit(TConfigSalary configSalary, List<TSalaryAccountVo> savList, SalaryUploadParamVo vo
, TSettleDomainSelectVo dept) {
String orderId = vo.getOrderId();
String salaryType = vo.getSalaryType();
String newEmpUpdateFlag = vo.getNewEmpUpdateFlag();
if (Common.isNotNull(savList) && !savList.isEmpty()) { if (Common.isNotNull(savList) && !savList.isEmpty()) {
TSalaryAccountVo salaryAccountVo = savList.get(0); TSalaryAccountVo salaryAccountVo = savList.get(0);
List<TSalaryAccountItem> saiList = null; //报账明细List List<TSalaryAccountItem> saiList = null; //报账明细List
...@@ -1533,7 +1541,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1533,7 +1541,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
//工资主表 //工资主表
String invoiceTitle = dept.getBusinessSubjectName(); String invoiceTitle = dept.getBusinessSubjectName();
R<TSalaryStandard> sr = this.saveNewTSalary(configSalary, salaryAccountVo, dept, user, nowTime, invoiceTitle); R<TSalaryStandard> sr = this.saveNewTSalary(configSalary, salaryAccountVo, dept, user, nowTime, invoiceTitle
, newEmpUpdateFlag);
if (sr == null || sr.getCode() == CommonConstants.FAIL) { if (sr == null || sr.getCode() == CommonConstants.FAIL) {
return sr; return sr;
......
...@@ -74,6 +74,11 @@ public class SalaryAccountUtil implements Serializable { ...@@ -74,6 +74,11 @@ public class SalaryAccountUtil implements Serializable {
, Map<String, Integer> ownDeptMap, TSalaryAccountService tSalaryAccountService, Map<String, String> bankMap) { , Map<String, Integer> ownDeptMap, TSalaryAccountService tSalaryAccountService, Map<String, String> bankMap) {
String jsonStr = vo.getJsonString(); String jsonStr = vo.getJsonString();
String salaryType = vo.getSalaryType(); String salaryType = vo.getSalaryType();
// 新员工是否更新:0否;1是 hgw 2024-7-18 16:36:31
String newEmpUpdateFlag = vo.getNewEmpUpdateFlag();
if (Common.isEmpty(newEmpUpdateFlag)) {
newEmpUpdateFlag = CommonConstants.ZERO_STRING;
}
Integer isIssue = vo.getIsIssue(); Integer isIssue = vo.getIsIssue();
if (Common.isEmpty(isIssue)) { if (Common.isEmpty(isIssue)) {
isIssue = 0; isIssue = 0;
...@@ -468,9 +473,11 @@ public class SalaryAccountUtil implements Serializable { ...@@ -468,9 +473,11 @@ public class SalaryAccountUtil implements Serializable {
otherIdCard.add(newEmp.getEmpIdcard()); otherIdCard.add(newEmp.getEmpIdcard());
} }
if (emp != null) { if (emp != null) {
// 新员工是否更新:0否;1是 hgw 2024-7-18 16:36:31
// newEmpUpdateFlag = CommonConstants.ZERO_STRING
if (setEntityByEmpInfo(dept, ownEmployeeMap, ownDeptMap, salaryType, isIssue, errorList if (setEntityByEmpInfo(dept, ownEmployeeMap, ownDeptMap, salaryType, isIssue, errorList
, entity, emp, saiList, salaryGiveTimeFlag, isNewEmployee, empName, salaryStyle , entity, emp, saiList, salaryGiveTimeFlag, isNewEmployee, empName, salaryStyle
, nowMonth, updateEmpList, checkBankInfoEmpList, i + dataRow, bankMap)) , nowMonth, updateEmpList, checkBankInfoEmpList, i + dataRow, bankMap, newEmpUpdateFlag))
continue; continue;
} }
if (saiList != null && !saiList.isEmpty()) { if (saiList != null && !saiList.isEmpty()) {
...@@ -566,7 +573,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -566,7 +573,7 @@ public class SalaryAccountUtil implements Serializable {
, CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime()) , CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime())
, CommonConstants.ONE_STRING.equals(entity.getIsNewEmployee()) , CommonConstants.ONE_STRING.equals(entity.getIsNewEmployee())
, otherEmp.getEmpName(), entity.getSalaryStyle() , otherEmp.getEmpName(), entity.getSalaryStyle()
, nowMonth, updateEmpList, checkBankInfoEmpList, newEmps.getLineNums() + dataRow, bankMap)) { , nowMonth, updateEmpList, checkBankInfoEmpList, newEmps.getLineNums() + dataRow, bankMap, newEmpUpdateFlag)) {
isContinue = false; isContinue = false;
} }
} }
...@@ -613,7 +620,8 @@ public class SalaryAccountUtil implements Serializable { ...@@ -613,7 +620,8 @@ public class SalaryAccountUtil implements Serializable {
, Map<String, Integer> ownDeptMap, String salaryType, Integer isIssue, List<ErrorMessage> errorList , Map<String, Integer> ownDeptMap, String salaryType, Integer isIssue, List<ErrorMessage> errorList
, TSalaryAccountVo entity, TSalaryEmployee emp, List<TSalaryAccountItemVo> saiList , TSalaryAccountVo entity, TSalaryEmployee emp, List<TSalaryAccountItemVo> saiList
, boolean salaryGiveTimeFlag, boolean isNewEmployee, String empName, String salaryStyle, String nowMonth , boolean salaryGiveTimeFlag, boolean isNewEmployee, String empName, String salaryStyle, String nowMonth
, List<TSalaryEmployee> updateEmpList, List<TSalaryEmployee> checkBankInfoEmpList, int i, Map<String, String> bankMap) { , List<TSalaryEmployee> updateEmpList, List<TSalaryEmployee> checkBankInfoEmpList, int i
, Map<String, String> bankMap, String newEmpUpdateFlag) {
TSalaryAccountItemVo sai; TSalaryAccountItemVo sai;
String error; String error;
if (Common.isEmpty(emp.getEmpName())) { if (Common.isEmpty(emp.getEmpName())) {
...@@ -683,7 +691,54 @@ public class SalaryAccountUtil implements Serializable { ...@@ -683,7 +691,54 @@ public class SalaryAccountUtil implements Serializable {
entity.setEmpIdcard(emp.getEmpIdcard()); entity.setEmpIdcard(emp.getEmpIdcard());
entity.setEmpName(emp.getEmpName()); entity.setEmpName(emp.getEmpName());
entity.setEmpPhone(emp.getEmpPhone()); entity.setEmpPhone(emp.getEmpPhone());
if (SalaryConstants.SALARY_STYLE_BANK.equals(salaryStyle) && salaryGiveTimeFlag) { // hgs 2024-7-19 09:33:29 新增按照页面开关与新员工字段,来更新员工信息:
if (SalaryConstants.SALARY_STYLE_BANK.equals(salaryStyle)) {
if (CommonConstants.ONE_STRING.equals(newEmpUpdateFlag) && isNewEmployee) {
if (Common.isEmpty(entity.getBankName())) {
if (Common.isEmpty(emp.getBankName())) {
error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-发放方式为银行发放,但是-开户行总行-为空,请在工资模板填写!";
errorList.add(new ErrorMessage(i, error));
return true;
} else {
entity.setBankName(emp.getBankName());
}
}
if (Common.isEmpty(entity.getBankNo())) {
if (Common.isEmpty(emp.getBankNo())) {
error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-发放方式为银行发放,但是-银行卡号-为空,请在工资模板填写!";
errorList.add(new ErrorMessage(i, error));
return true;
} else {
entity.setBankNo(emp.getBankNo());
}
}
if (Common.isEmpty(entity.getBankProvince())) {
if (Common.isEmpty(emp.getBankProvince())) {
error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-发放方式为银行发放,但是-开户行省-为空,请在工资模板填写!";
errorList.add(new ErrorMessage(i, error));
return true;
} else {
entity.setBankProvince(String.valueOf(emp.getBankProvince()));
}
}
if (Common.isEmpty(emp.getBankCity())) {
if (Common.isEmpty(emp.getBankCity())) {
error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-发放方式为银行发放,但是-开户行市-为空,请在工资模板填写!";
errorList.add(new ErrorMessage(i, error));
return true;
} else {
entity.setBankCity(String.valueOf(emp.getBankCity()));
}
}
if (Common.isEmpty(entity.getBankSubName()) && Common.isNotNull(emp.getBankSubName())) {
entity.setBankSubName(emp.getBankSubName());
}
if (bankMap.get(entity.getBankName()) == null) {
error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-发放方式为银行发放,但是-开户行总行-不符合财务要求,请在工资模板填写!";
errorList.add(new ErrorMessage(i, error));
return true;
}
} else if (salaryGiveTimeFlag) {
if (Common.isEmpty(emp.getBankName())) { if (Common.isEmpty(emp.getBankName())) {
error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-发放方式为银行发放,但是-开户行-为空,请去薪酬人员查询处更新!"; error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-发放方式为银行发放,但是-开户行-为空,请去薪酬人员查询处更新!";
errorList.add(new ErrorMessage(i, error)); errorList.add(new ErrorMessage(i, error));
...@@ -746,6 +801,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -746,6 +801,7 @@ public class SalaryAccountUtil implements Serializable {
entity.setBankCity(null); entity.setBankCity(null);
} }
} }
}
if (!"3".equals(salaryType) && !"4".equals(salaryType)) { if (!"3".equals(salaryType) && !"4".equals(salaryType)) {
if (emp.getTaxMonth().length() > CommonConstants.dingleDigitIntArray[6]) { if (emp.getTaxMonth().length() > CommonConstants.dingleDigitIntArray[6]) {
entity.setTaxMonth(emp.getTaxMonth().substring(0, 6)); entity.setTaxMonth(emp.getTaxMonth().substring(0, 6));
......
...@@ -41,6 +41,8 @@ security: ...@@ -41,6 +41,8 @@ security:
- /swagger-ui/** - /swagger-ui/**
- /taveragesalary/getAverageSalary - /taveragesalary/getAverageSalary
- /tbankset/getWebcBankSetIdNameList - /tbankset/getWebcBankSetIdNameList
- /tsalaryemployee/inner/getEmpTaxMonth
- /tsalaryemployee/inner/savePreNewEmpInfo
......
...@@ -69,11 +69,10 @@ ...@@ -69,11 +69,10 @@
</if> </if>
</sql> </sql>
<!--获取IdName--> <!--tBankSet简单分页查询-->
<select id="getTBankSetIdNameList" resultMap="tBankSetMap"> <select id="getTBankSetPage" resultMap="tBankSetMap">
SELECT SELECT
a.ID, <include refid="Base_Column_List"/>
a.BANK_NAME
FROM t_bank_set a FROM t_bank_set a
<where> <where>
a.DELETE_FLAG = '0' a.DELETE_FLAG = '0'
...@@ -82,15 +81,16 @@ ...@@ -82,15 +81,16 @@
order by a.CREATE_TIME desc order by a.CREATE_TIME desc
</select> </select>
<!--list--> <!--获取IdName-->
<select id="getTBankSetList" resultType="java.lang.String"> <select id="getTBankSetIdNameList" resultMap="tBankSetMap">
SELECT SELECT
a.ID,
a.BANK_NAME a.BANK_NAME
FROM t_bank_set a FROM t_bank_set a
where a.DELETE_FLAG = '0' <where>
<if test="bankName != null and bankName.trim() != ''"> a.DELETE_FLAG = '0'
and a.BANK_NAME = #{bankName} <include refid="tBankSet_where"/>
</if> </where>
order by a.CREATE_TIME desc order by a.CREATE_TIME desc
</select> </select>
......
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
<result property="excelType" column="EXCEL_TYPE"/> <result property="excelType" column="EXCEL_TYPE"/>
<result property="setName" column="SET_NAME"/> <result property="setName" column="SET_NAME"/>
<result property="originalSetName" column="ORIGINAL_SET_NAME"/> <result property="originalSetName" column="ORIGINAL_SET_NAME"/>
<result property="newEmpUpdateFlag" column="NEW_EMP_UPDATE_FLAG"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -151,7 +152,8 @@ ...@@ -151,7 +152,8 @@
a.DELETE_DATE, a.DELETE_DATE,
a.EXCEL_TYPE, a.EXCEL_TYPE,
a.SET_NAME, a.SET_NAME,
a.ORIGINAL_SET_NAME a.ORIGINAL_SET_NAME,
a.NEW_EMP_UPDATE_FLAG
</sql> </sql>
<sql id="tSalaryStandard_where"> <sql id="tSalaryStandard_where">
<if test="tSalaryStandard != null"> <if test="tSalaryStandard != 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