Commit 04b5900f authored by hongguangwu's avatar hongguangwu

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

parents 35668e1b 73820b1c
......@@ -52,17 +52,15 @@ public class TAutoContractRuleInfo extends BaseEntity {
/**
* 是否自动触发申请:0自动生成合同申请 1手动发起合同申请
*/
@ExcelAttribute(name = "是否自动触发申请", isNotEmpty = true, errorInfo = "是否自动触发申请不能为空", maxLength = 1)
@ExcelAttribute(name = "是否自动触发申请", isNotEmpty = true, errorInfo = "是否自动触发申请不能为空")
@NotBlank(message = "是否自动触发申请不能为空")
@Length(max = 1, message = "是否自动触发申请不能超过1个字符")
@ExcelProperty("是否自动触发申请")
@Schema(description = "是否自动触发申请:0自动生成合同申请 1手动发起合同申请")
private String autoFlag;
/**
* 新签合同发起时间类型 0 入职日期 3入职3天后 7入职1周后 14入职2周后 21入职3周后
*/
@ExcelAttribute(name = "新签合同发起时间类型 ", maxLength = 1)
@Length(max = 1, message = "新签合同发起时间类型 不能超过1个字符")
@ExcelAttribute(name = "新签合同发起时间类型 ")
@ExcelProperty("新签合同发起时间类型 ")
@Schema(description = "新签合同发起时间类型 0 入职日期 3入职3天后 7入职1周后 14入职2周后 21入职3周后")
private String newSignType;
......@@ -77,8 +75,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
/**
* 确认签署时间类型 0 签订发起日
*/
@ExcelAttribute(name = "确认签署时间类型 ", maxLength = 1)
@Length(max = 1, message = "确认签署时间类型 不能超过1个字符")
@ExcelAttribute(name = "确认签署时间类型 ")
@ExcelProperty("确认签署时间类型 ")
@Schema(description = "确认签署时间类型 0 签订发起日")
private String confirmSignType;
......@@ -93,8 +90,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
/**
* 续签合同发起时间类型 0 上一份合同到期前一个月
*/
@ExcelAttribute(name = "续签合同发起时间类型 ", maxLength = 1)
@Length(max = 1, message = "续签合同发起时间类型 不能超过1个字符")
@ExcelAttribute(name = "续签合同发起时间类型 ")
@ExcelProperty("续签合同发起时间类型 ")
@Schema(description = "续签合同发起时间类型 0 上一份合同到期前一个月")
private String renewalDateType;
......@@ -109,25 +105,22 @@ public class TAutoContractRuleInfo extends BaseEntity {
/**
* 入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义
*/
@ExcelAttribute(name = "入职确认选择", maxLength = 1)
@Length(max = 1, message = "入职确认选择不能超过1个字符")
@ExcelAttribute(name = "入职确认选择")
@ExcelProperty("入职确认选择")
@Schema(description = "入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义")
private String confirmEmpSelect;
/**
* 超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发
*/
@ExcelAttribute(name = "超时未确认是否触发签署任务(电子签)", maxLength = 1)
@Length(max = 1, message = "超时未确认是否触发签署任务(电子签)不能超过1个字符")
@ExcelAttribute(name = "超时未确认是否触发签署任务(电子签)")
@ExcelProperty("超时未确认是否触发签署任务(电子签)")
@Schema(description = "超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发")
private String timeoutElecSign;
/**
* 签署方式 0 电子签 1 线下签
*/
@ExcelAttribute(name = "签署方式", isNotEmpty = true, errorInfo = "签署方式不能为空", maxLength = 1)
@ExcelAttribute(name = "签署方式", isNotEmpty = true, errorInfo = "签署方式不能为空")
@NotBlank(message = "签署方式不能为空")
@Length(max = 1, message = "签署方式不能超过1个字符")
@ExcelProperty("签署方式")
@Schema(description = "签署方式 0 电子签 1 线下签")
private String signType;
......
......@@ -7,7 +7,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
......@@ -152,17 +151,14 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "试用期(单位月)")
private String tryPeriod;
@Schema(description = "试用期工资 元/月")
private BigDecimal periodSalaryPerMonth;
@Schema(description = "工资形式 1.计时工资 2.计件工资 3.其他")
private String salaryType;
@Schema(description = "计时工资 工资标准 元/月 ")
private BigDecimal salaryStandardPerHour;
private String salaryStandardPerHour;
@Schema(description = "计件工资 工资标准单价/元 ")
private BigDecimal salaryStandardPerPiece;
private String salaryStandardPerPiece;
@Schema(description = "配置id")
private String configId;
......
......@@ -8,7 +8,6 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
......@@ -298,13 +297,6 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@Schema(description = "试用期月份数字 1、2、3、4...")
@ExcelProperty("试用期月份数字")
private String tryPeriodNum;
/**
* 试用期工资 元/月
*/
@ExcelAttribute(name = "试用期工资 元/月")
@Schema(description = "试用期工资 元/月")
@ExcelProperty("试用期工资 元/月")
private BigDecimal periodSalaryPerMonth;
/**
* 工资形式 1.计时工资 2.计件工资 3.其他
*/
......@@ -319,7 +311,7 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "计时工资 工资标准 元/月 ")
@Schema(description = "计时工资 工资标准 元/月 ")
@ExcelProperty("计时工资 工资标准 元/月 ")
private BigDecimal salaryStandardPerHour;
private String salaryStandardPerHour;
/**
* 入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义
*/
......@@ -342,7 +334,7 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "计件工资 工资标准单价/元 ")
@Schema(description = "计件工资 工资标准单价/元 ")
@ExcelProperty("计件工资 工资标准单价/元 ")
private BigDecimal salaryStandardPerPiece;
private String salaryStandardPerPiece;
/**
* 配置id
*/
......@@ -384,8 +376,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
/**
* 其他 (工资形式其他时的工资)
*/
@Length(max = 20, message = "其他 (工资形式其他时的工资) 不能超过20 个字符")
@ExcelAttribute(name = "其他 (工资形式其他时的工资)", maxLength = 20)
@Length(max = 50, message = "其他 (工资形式其他时的工资) 不能超过50 个字符")
@ExcelAttribute(name = "其他 (工资形式其他时的工资)", maxLength = 50)
@Schema(description = "其他 (工资形式其他时的工资)")
@ExcelProperty("其他 (工资形式其他时的工资)")
private String otherWage;
......@@ -432,16 +424,16 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
/**
* 派遣期限
*/
@Length(max = 1, message = "派遣期限-年 不能超过1 个字符")
@ExcelAttribute(name = "派遣期限-年", maxLength = 1)
@Length(max = 3, message = "派遣期限-年 不能超过3 个字符")
@ExcelAttribute(name = "派遣期限-年", maxLength = 3)
@Schema(description = "派遣期限-年")
@ExcelProperty("派遣期限-年")
private String dispatchPeriodYear;
/**
* 派遣期限
*/
@Length(max = 1, message = "派遣期限-月 不能超过1 个字符")
@ExcelAttribute(name = "派遣期限-月", maxLength = 1)
@Length(max = 3, message = "派遣期限-月 不能超过3 个字符")
@ExcelAttribute(name = "派遣期限-月", maxLength = 3)
@Schema(description = "派遣期限-月")
@ExcelProperty("派遣期限-月")
private String dispatchPeriodMonth;
......
......@@ -696,6 +696,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return R.failed("该项目下存在在途/有效的合同数据,请“是否已签署合同”是否调整为“是”");
}
initContractPreInfo(employeeRegistrationPre,employeeContractPreVo, user, id);
employeeRegistrationPre.setEmployeeContractPre(employeeContractPreVo);
}
//操作记录中字典值的转化
......@@ -864,6 +865,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//是否撤销签署
employeeContractPreVo.setSignFlag(CommonConstants.ONE_STRING);
employeeContractPreVo.setRevokeReason(CommonConstants.EMPTY_STRING);
//实习开始日期、实习结束日期赋值合同开始、截止日期
if (Common.isNotNull(employeeContractPreVo.getInternshipPeriodStart())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getInternshipPeriodStart());
}
if (Common.isNotNull(employeeContractPreVo.getInternshipPeriodEnd())) {
employeeContractPreVo.setContractEnd(employeeContractPreVo.getInternshipPeriodEnd());
}
}
/**
......
......@@ -88,6 +88,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
@Override
public List<TEmployeeContractPre> getTEmployeeContractPreNoPage(TEmployeeContractPreSearchVo tEmployeeContractPre) {
//权限赋值
tEmployeeContractPre.setType(CommonConstants.ONE_STRING);
initSearchVo(tEmployeeContractPre);
if (Common.isEmpty(tEmployeeContractPre.getStatusList())) {
tEmployeeContractPre.setStatusList(Stream.of("0").collect(Collectors.toList()));
......@@ -103,6 +104,9 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
@Override
public long getTEmployeeContractCount(TEmployeeContractPreSearchVo tEmployeeContractPre) {
//权限赋值
if (Common.isEmpty(tEmployeeContractPre.getType())) {
tEmployeeContractPre.setType(CommonConstants.ONE_STRING);
}
initSearchVo(tEmployeeContractPre);
if (Common.isEmpty(tEmployeeContractPre.getProcessStatus())&& Common.isEmpty(tEmployeeContractPre.getStatusList())) {
tEmployeeContractPre.setStatusList(Stream.of("0","1","2","3","4","5","6","7","8").collect(Collectors.toList()));
......@@ -414,12 +418,26 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
@Override
public Boolean checkContractPreIsExit(EmpProjectStatusVo vo) {
return baseMapper.selectCount(Wrappers.<TEmployeeContractPre>query().lambda()
TEmployeeContractPre contractPre = baseMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getEmpIdcard, vo.getEmpIdcard())
.eq(TEmployeeContractPre::getDeptNo, vo.getDeptNo())
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.NINE_STRING)
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.TEN_STRING)
.last(CommonConstants.LAST_ONE_SQL)) > 0;
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(contractPre)) {
//如果是已完结判断合同申请数据在不在用
if (CommonConstants.NINE_STRING.equals(contractPre.getProcessStatus()) && Common.isNotNull(contractPre.getContractId())) {
TEmployeeContractInfo contractInfo = contractInfoService.getOne(Wrappers.<TEmployeeContractInfo>query()
.lambda().eq(TEmployeeContractInfo::getId, contractPre.getContractId())
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
return Common.isNotNull(contractInfo);
} else {
return true;
}
} else {
return false;
}
}
//发送企业微信待办
......
......@@ -342,18 +342,18 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
if (!detailList.isEmpty()) {
tEmployeePreLogDetailService.saveBatch(detailList);
}
//保存合同待签订数据
if (contractOld != null && employeeContractPre != null) {
TEmployeeContractPreVo preVo = new TEmployeeContractPreVo();
BeanUtils.copyProperties(employeeContractPre,preVo);
if (Common.isNotNull(employeeContractPre.getExpectedCollectionTime()) ) {
preVo.setExpectedCollectionTime(LocalDateTimeUtils.convertLDTToDate(employeeContractPre.getExpectedCollectionTime()));
}
if (Common.isNotNull(employeeContractPre.getExpectedConfirmTime()) ) {
preVo.setExpectedConfirmTime(LocalDateTimeUtils.convertLDTToDate(employeeContractPre.getExpectedConfirmTime()));
}
contractPreService.saveContractPreInfo(preVo);
}
//保存合同待签订数据
if (employeeContractPre != null) {
TEmployeeContractPreVo preVo = new TEmployeeContractPreVo();
BeanUtils.copyProperties(employeeContractPre,preVo);
if (Common.isNotNull(employeeContractPre.getExpectedCollectionTime()) ) {
preVo.setExpectedCollectionTime(LocalDateTimeUtils.convertLDTToDate(employeeContractPre.getExpectedCollectionTime()));
}
if (Common.isNotNull(employeeContractPre.getExpectedConfirmTime()) ) {
preVo.setExpectedConfirmTime(LocalDateTimeUtils.convertLDTToDate(employeeContractPre.getExpectedConfirmTime()));
}
contractPreService.saveContractPreInfo(preVo);
}
if (!saveOrUpdateList.isEmpty()) {
HttpDaprUtil.invokeMethodPost(daprInsurancesProperties.getAppUrl(), daprInsurancesProperties.getAppId()
......
......@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzOfferInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TRegisteWarningEmployee;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper;
......@@ -61,9 +60,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
......
......@@ -42,7 +42,6 @@
<result property="updateFlag" column="update_flag"/>
<result property="tryPeriodType" column="TRY_PERIOD_TYPE"/>
<result property="tryPeriod" column="TRY_PERIOD"/>
<result property="periodSalaryPerMonth" column="PERIOD_SALARY_PER_MONTH"/>
<result property="salaryType" column="SALARY_TYPE"/>
<result property="salaryStandardPerHour" column="SALARY_STANDARD_PER_HOUR"/>
<result property="salaryStandardPerPiece" column="SALARY_STANDARD_PER_PIECE"/>
......@@ -115,7 +114,6 @@
,update_flag
,try_period_type
,try_period
,period_salary_per_month
,salary_type
,salary_standard_per_hour
,salary_standard_per_piece
......
......@@ -143,6 +143,12 @@
'${item}'
</foreach>
</if>
<if test="tGzOfferInfo.statusList != null and tGzOfferInfo.statusList.size() > 0">
AND a.offer_status in
<foreach item="item" index="index" collection="tGzOfferInfo.statusList" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
<if test="tGzOfferInfo.updateBy != null and tGzOfferInfo.updateBy.trim() != ''">
AND a.update_by = #{tGzOfferInfo.updateBy}
</if>
......
......@@ -731,7 +731,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
TEmployeeContractDateVo vo = new TEmployeeContractDateVo();
//合同开始日期、合同截止日期--
//合同开始日期、合同截止日期
if (Common.isEmpty(employeeContractPreVo.getContractStart())
&& Common.isEmpty(employeeContractPreVo.getContractEnd())
&& Common.isEmpty(employeeContractPreVo.getContractDurationYear())
......@@ -745,10 +745,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
EkpDeptContractInfoVo returnVo = info.getData();
employeeContractPreVo.setContractEnd(returnVo.getContractEndTime());
employeeContractPreVo.setContractEndType(returnVo.getContractType());
} else {
employeeContractPreVo.setContractEnd(null);
employeeContractPreVo.setContractEndType(null);
}
}
//合同年限推算
......@@ -772,7 +770,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
//试用期开始日期、试用期截止日期
if (Common.isEmpty(employeeContractPreVo.getTryPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getTryPeriodNum())) {
&& Common.isNotNull(employeeContractPreVo.getTryPeriodNum())
&& CommonConstants.ZERO_STRING.equals(employeeContractPreVo.getSignType())) {
employeeContractPreVo.setTryPeriodStart(employeeContractPreVo.getJoinLeaveDate());
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getTryPeriodNum()));
vo.setYearAfter(0);
......@@ -789,9 +788,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo.setRegistDate(employeeContractPreVo.getDispatchPeriodStart());
employeeContractPreVo.setDispatchPeriodEnd(this.addYearsMonths(vo));
}
//实习开始日期、实习结束日期赋值合同开始、截止日期
if (Common.isNotNull(employeeContractPreVo.getInternshipPeriodStart())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getInternshipPeriodStart());
}
if (Common.isNotNull(employeeContractPreVo.getInternshipPeriodEnd())) {
employeeContractPreVo.setContractEnd(employeeContractPreVo.getInternshipPeriodEnd());
}
//实习开始日期、实习结束日期
if (Common.isEmpty(employeeContractPreVo.getInternshipPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getInternshipPeriodNum())) {
......@@ -801,6 +804,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo.setYearAfter(0);
vo.setRegistDate(employeeContractPreVo.getInternshipPeriodStart());
employeeContractPreVo.setInternshipPeriodEnd(this.addYearsMonths(vo));
employeeContractPreVo.setContractEnd(employeeContractPreVo.getInternshipPeriodEnd());
}
//合同岗位名称
if (CommonConstants.ONE_STRING.equals(employeeContractPreVo.getPostType())
......@@ -906,34 +910,21 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
//1.9.12合同自动化校验逻辑
if (preVo.getServerItem().contains("合同") && null != preVo.getEmployeeContractPreVos()) {
TEmployeeContractPreVo employeeContractPreVo = preVo.getEmployeeContractPreVos();
//根据身份证号码和项目编号查询合同
TEmployeeAutoRegistCheckVo cardVo = new TEmployeeAutoRegistCheckVo();
cardVo.setEmpIdcard(registration.getEmpIdcard());
cardVo.setDeptNo(registration.getDeptNo());
flag = archivesDaprUtil.selectExitEmpCopntract(cardVo);
//是否已签署为是需要判断合同是否在用或者流程中
if (CommonConstants.ZERO_STRING.equals(employeeContractPreVo.getContractFlag()) &&
(Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData()))) {
TEmployeeAutoRegistCheckVo exitCheckVo = new TEmployeeAutoRegistCheckVo();
exitCheckVo.setEmployeeName(registration.getEmployeeName());
exitCheckVo.setEmpIdcard(registration.getEmpIdcard());
exitCheckVo.setDeptName(registration.getDeptName());
exitCheckVo.setDeptNo(registration.getDeptNo());
exitCheckVo.setType("合同");
exitCheckVo.setErrorMsg("未找到流程中或者在用的合同!");
continue;
}
//是否已签署为否需要判断是否在用或者流程中的合同
if (CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag()) &&
Common.isNotNull(flag) && Boolean.TRUE.equals(flag.getData())) {
if (Common.isNotNull(flag) && Boolean.TRUE.equals(flag.getData())) {
TEmployeeAutoRegistCheckVo exitCheckVo = new TEmployeeAutoRegistCheckVo();
exitCheckVo.setEmployeeName(registration.getEmployeeName());
exitCheckVo.setEmpIdcard(registration.getEmpIdcard());
exitCheckVo.setDeptName(registration.getDeptName());
exitCheckVo.setDeptNo(registration.getDeptNo());
exitCheckVo.setType("合同");
exitCheckVo.setErrorMsg("该项目下存在在途/有效的合同数据,请“是否已签署合同”是否调整为“是”");
exitCheckVo.setErrorMsg("该项目下存在在途/有效的合同数据");
errorList.add(exitCheckVo);
continue;
}
}
......@@ -971,9 +962,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insuranceDaprUtil.saveInsurancePreInfo(preVo);
}
TEmployeeContractPreVo employeeContractPreVo = preVo.getEmployeeContractPreVos();
if (preVo.getServerItem().contains("合同") && Common.isNotNull(employeeContractPreVo) &&
Common.isNotNull(employeeContractPreVo.getContractFlag()) &&
CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag())) {
if (preVo.getServerItem().contains("合同") && Common.isNotNull(employeeContractPreVo)) {
//生成合同待购买数据
initContractPreInfo(registration, employeeContractPreVo, user, domainR.getData());
}
......@@ -1115,8 +1104,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insuranceDaprUtil.saveInsurancePreInfo(preVo);
}
TEmployeeContractPreVo employeeContractPreVo = preVo.getEmployeeContractPreVos();
if (Common.isNotNull(employeeContractPreVo) && Common.isNotNull(employeeContractPreVo.getContractFlag())
&& CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag())) {
if (preVo.getServerItem().contains("合同") && null != preVo.getEmployeeContractPreVos() &&
((Common.isNotNull(preVo.getEmployeeContractPreVos().getContractFlag()) &&
CommonConstants.ONE_STRING.equals(preVo.getEmployeeContractPreVos().getContractFlag())) ||
Common.isEmpty(preVo.getEmployeeContractPreVos().getContractFlag()))) {
//生成合同待购买数据
initContractPreInfo(registrationNow, employeeContractPreVo, user, domainR.getData());
}
......
......@@ -127,7 +127,7 @@
<!--ekp1.9.12查询近七天的所有入账记录数据, 查账号和流水号-->
<select id="getAllserioNoLsatSevenDays" resultType="Map">
SELECT fd_3b573843db30ce as onlySequence,fd_3b62f3470beb30 as receiveBkNo from ekp_79c234bf64d412294f23
where DATE_FORMAT(fd_3aa4531d3b86e0, '%Y-%m-%d') between DATE_SUB(curdate(), INTERVAL 8 day) and DATE_ADD(now(), INTERVAL 1 day)
where DATE_FORMAT(fd_3aa4531d3b86e0, '%Y-%m-%d') between DATE_SUB(curdate(), INTERVAL 7 day) and DATE_ADD(now(), INTERVAL 1 day)
and fd_3b57f8de9df354 = '是'
</select>
......
......@@ -220,8 +220,8 @@ public class THolidayInfoController {
**/
@Inner
@PostMapping("/inner/selectBeforeOrAfterWorkDayCommon")
public R selectBeforeOrAfterWorkDayInnerCommon(@RequestBody TEmployeeInsuranceWorkDayVo vo) {
return R.ok(tHolidayInfoService.selectBeforeOrAfterWorkDayCommon(vo));
public TEmployeeInsuranceWorkDayVo selectBeforeOrAfterWorkDayInnerCommon(@RequestBody TEmployeeInsuranceWorkDayVo vo) {
return tHolidayInfoService.selectBeforeOrAfterWorkDayCommon(vo);
}
/**
......
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