Merge remote-tracking branch 'origin/master'

Alan

2021-02-19 7e172d1de04d55caafd86489fa81c06c142adab2

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java

@@ -2,6 +2,10 @@

import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
*
@@ -10,9 +14,50 @@
* description:员工合同信息实体Mapper
*
* @author luoyibo
* @date 2021-01-24 20:35:42
* @date 2021-01-31 11:28:23
* @since JDK1.8
*/
public interface EmpContractInfoMapper extends BaseMapper<EmpContractInfo> {

}
/**
*
* 根据Id批量逻辑删除记录
*
* date luoyibo
* @author: 2021-01-31 11:28:23
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
*/
@Update("<script> " +
    " UPDATE t_emp_contractinfo SET delFlag = 1,\n" +
    " modifyTime = NOW(),\n" +
    " modifier = #{operatorId}, \n" +
    " version = version+1 \n" +
    " WHERE contractId IN \n" +
    "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
    "            #{delId} \n" +
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
    /**
     *
     * 暂存记录提交
     *
     * date luoyibo
     * @author: 2021-01-31 11:28:23
     * @param list 待删除Id
     * @param operatorId 操作员Id
     * @return void
     */
    @Update("<script> " +
            " UPDATE t_emp_contractinfo SET delFlag = 0,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE contractId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    int momentToNormal(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}