Commit 0039186d authored by fangxinjiang's avatar fangxinjiang

薪資配置

parent 829737d6
......@@ -30,6 +30,7 @@ public class ChecksUtil {
private static final String API_URL = "https://api.253.com/open/idcard/id-card-auth";
private static final String API_URL_MOBILE = "https://api.253.com/open/unn/batch-ucheck";
private static final String API_URL_BANK_NO ="https://api.253.com/open/bankcard/card-auth";
private static final String API_URL_BANK_NO_THREE ="https://api.253.com/open/bankcard/card-two-auth";
private static JsonParser jsonParser = new JsonParser();
public static void checkIdCard(TCheckIdCard checkIdCard, boolean canCheck) {
......
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -27,7 +28,7 @@ import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true)
@TableName("t_min_salary")
@Tag(name = "薪资配置-最低工资配置")
public class TMinSalary extends Model<TMinSalary> {
public class TMinSalary extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* id
......@@ -80,17 +81,4 @@ public class TMinSalary extends Model<TMinSalary> {
@ExcelAttribute(name = "终止时间")
@ExcelProperty(value = "终止时间")
private LocalDate endDate;
/**
* 创建人
*/
@Length(max = 32, message = "创建人不能超过32个字符")
@ExcelAttribute(name = "创建人", maxLength = 32)
@ExcelProperty(value = "创建人")
private String createUser;
/**
* 创建时间
*/
@ExcelAttribute(name = "创建时间")
@ExcelProperty(value = "创建时间")
private LocalDateTime createDate;
}
......@@ -73,8 +73,8 @@ public class TMinSalaryController {
if (null == user || null == user.getId()) {
return R.failed("获取登录用户信息失败!");
}
tMinSalary.setCreateDate(LocalDateTime.now());
tMinSalary.setCreateUser(String.valueOf(user.getId()));
tMinSalary.setCreateTime(LocalDateTime.now());
tMinSalary.setCreateBy(String.valueOf(user.getId()));
return new R<>(tMinSalaryService.save(tMinSalary));
}
......
......@@ -13,8 +13,8 @@
<result property="status" column="status"/>
<result property="startDate" column="start_date"/>
<result property="endDate" column="end_date"/>
<result property="createUser" column="create_user"/>
<result property="createDate" column="create_date"/>
<result property="createBy" column="create_user"/>
<result property="createTime" column="CREATE_TIME"/>
</resultMap>
<!--tMinSalary简单分页查询-->
......@@ -28,8 +28,8 @@
status,
start_date,
end_date,
create_user,
create_date
create_by,
CREATE_TIME
FROM t_min_salary
<where>
1=1
......@@ -57,11 +57,8 @@
<if test="tMinSalary.endDate != null">
AND end_date = #{tMinSalary.endDate}
</if>
<if test="tMinSalary.createUser != null and tMinSalary.createUser.trim() != ''">
AND create_user = #{tMinSalary.createUser}
</if>
<if test="tMinSalary.createDate != null">
AND create_date = #{tMinSalary.createDate}
<if test="tMinSalary.createBy != null and tMinSalary.createBy.trim() != ''">
AND create_user = #{tMinSalary.createBy}
</if>
</where>
</select>
......
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