Commit a2842082 authored by huyuchen's avatar huyuchen

优化修改

parent 27c8779e
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.social.entity; package com.yifu.cloud.plus.v1.yifu.social.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
...@@ -548,6 +549,14 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -548,6 +549,14 @@ public class TPreDispatchInfo extends BaseEntity {
@ExcelAttribute(name = "员工类型") @ExcelAttribute(name = "员工类型")
private String empTypeAdd; private String empTypeAdd;
/**
* 0 是 1 否
*/
@ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1,readConverterExp = "0=是,1=否")
@Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee")
@ExcelProperty("是否同步终止合同、减项、减档" )
private String changeContractAndEmployee;
/** /**
* 所属单位ID * 所属单位ID
*/ */
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.social.vo; package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
...@@ -697,6 +698,14 @@ public class TPreDispatchReduceVo { ...@@ -697,6 +698,14 @@ public class TPreDispatchReduceVo {
@ExcelAttribute(name = "是否派单") @ExcelAttribute(name = "是否派单")
private String dispatchFlag; private String dispatchFlag;
/**
* 0 是 1 否
*/
@ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1,readConverterExp = "0=是,1=否")
@Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee")
@ExcelProperty("是否同步终止合同、减项、减档" )
private String changeContractAndEmployee;
/** /**
* 取消原因:不派单时填写 * 取消原因:不派单时填写
*/ */
......
...@@ -431,6 +431,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -431,6 +431,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
dispatchReduceVo.setFundReduceDate(DateUtil.getFirstDay(preInfo.getFundEndReduce())); dispatchReduceVo.setFundReduceDate(DateUtil.getFirstDay(preInfo.getFundEndReduce()));
} }
dispatchReduceVo.setRowIndex(CommonConstants.ONE_INT); dispatchReduceVo.setRowIndex(CommonConstants.ONE_INT);
dispatchReduceVo.setChangeContractAndEmployee(preInfo.getChangeContractAndEmployee());
List<TDispatchReduceVo> dispatchImportList = new ArrayList<>(); List<TDispatchReduceVo> dispatchImportList = new ArrayList<>();
dispatchImportList.add(dispatchReduceVo); dispatchImportList.add(dispatchReduceVo);
dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList, user, null); dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList, user, null);
...@@ -616,6 +617,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -616,6 +617,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
dispatchReduceVo.setRowIndex(i); dispatchReduceVo.setRowIndex(i);
// 处理派减派单时间 // 处理派减派单时间
dispatchReduce(dispatchReduceVo, pre); dispatchReduce(dispatchReduceVo, pre);
dispatchReduceVo.setChangeContractAndEmployee(pre.getChangeContractAndEmployee());
List<TDispatchReduceVo> dispatchImportList = new ArrayList<>(); List<TDispatchReduceVo> dispatchImportList = new ArrayList<>();
dispatchImportList.add(dispatchReduceVo); dispatchImportList.add(dispatchReduceVo);
dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList, user, null); dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList, user, null);
......
...@@ -600,8 +600,11 @@ ...@@ -600,8 +600,11 @@
<if test="contractTypeAdd != null"> <if test="contractTypeAdd != null">
contract_type_add = #{contractTypeAdd}, contract_type_add = #{contractTypeAdd},
</if> </if>
<if test="contractStartAdd != null"> <if test="contractTypeAdd != null">
contract_start_add = #{contractStartAdd}, contract_type_add = #{contractTypeAdd},
</if>
<if test="changeContractAndEmployee != null">
CHANGE_CONTRACT_AND_EMPLOYEE = #{changeContractAndEmployee},
</if> </if>
<if test="contractEndAdd != null"> <if test="contractEndAdd != null">
contract_end_add = #{contractEndAdd}, contract_end_add = #{contractEndAdd},
......
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