Commit f653e429 authored by fangxinjiang's avatar fangxinjiang

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

parents 3b34790b dd1dadb8
package com.yifu.cloud.plus.v1.yifu.archives.vo; package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
...@@ -53,6 +54,7 @@ public class EmployeeRegistrationPreInfoExportVo implements Serializable { ...@@ -53,6 +54,7 @@ public class EmployeeRegistrationPreInfoExportVo implements Serializable {
@ExcelAttribute(name = "入职日期", isDate = true) @ExcelAttribute(name = "入职日期", isDate = true)
@Schema(description = "入职日期") @Schema(description = "入职日期")
@ExcelProperty("入职日期") @ExcelProperty("入职日期")
@DateTimeFormat("yyyy-MM-dd")
private Date joinLeaveDate; private Date joinLeaveDate;
@ExcelAttribute(name = "确认人") @ExcelAttribute(name = "确认人")
......
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
a.server_item, a.server_item,
a.emp_nature, a.emp_nature,
a.contract_type, a.contract_type,
concat(a.file_province,a.file_city,a.file_town) as fileAdress concat(a.file_province,'/',a.file_city,if(a.file_town is null,'',concat('/',a.file_town))) as fileAdress
FROM employee_registration_pre a FROM employee_registration_pre a
<where> <where>
1=1 1=1
......
...@@ -186,6 +186,7 @@ ...@@ -186,6 +186,7 @@
a.delete_flag = '0' and a.IS_COMPLETE = '1' a.delete_flag = '0' and a.IS_COMPLETE = '1'
<include refid="employeeRegistrationPre_where"/> <include refid="employeeRegistrationPre_where"/>
</where> </where>
order by a.CREATE_TIME desc
</select> </select>
...@@ -234,6 +235,7 @@ ...@@ -234,6 +235,7 @@
a.delete_flag = '0' and a.IS_COMPLETE = '1' a.delete_flag = '0' and a.IS_COMPLETE = '1'
<include refid="employeeRegistrationPre_where"/> <include refid="employeeRegistrationPre_where"/>
</where> </where>
order by a.CREATE_TIME desc
</select> </select>
<!--tCompleteMonitor简单分页查询--> <!--tCompleteMonitor简单分页查询-->
......
...@@ -8,6 +8,7 @@ import com.alibaba.excel.read.listener.ReadListener; ...@@ -8,6 +8,7 @@ import com.alibaba.excel.read.listener.ReadListener;
import com.alibaba.excel.read.metadata.holder.ReadRowHolder; import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.util.ListUtils;
import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -738,14 +739,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -738,14 +739,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
@Override @Override
public Boolean updateRegistCustomerUserInfo(EmployeeRegistrationCustomerUserUpdateVo updateVo) { public Boolean updateRegistCustomerUserInfo(EmployeeRegistrationCustomerUserUpdateVo updateVo) {
EmployeeRegistration registration = baseMapper.selectOne(Wrappers.<EmployeeRegistration>query().lambda() LambdaUpdateWrapper<EmployeeRegistration> updateWrapper = new LambdaUpdateWrapper<>();
.eq(EmployeeRegistration::getDeptNo, updateVo.getDeptNo()) updateWrapper.eq(EmployeeRegistration::getDeptNo,updateVo.getDeptNo())
.eq(EmployeeRegistration::getFeedbackType, CommonConstants.ONE_STRING) .eq(EmployeeRegistration::getFeedbackType, CommonConstants.ONE_STRING)
.last(CommonConstants.LAST_ONE_SQL)); .set(EmployeeRegistration::getCustomerUsernameNew, updateVo.getCustomerUserName());
if (Common.isNotNull(registration)) { this.update(updateWrapper);
registration.setCustomerUsernameNew(updateVo.getCustomerUserName());
baseMapper.updateById(registration);
}
return true; return true;
} }
......
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