Commit ef4ad0cd authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent 50078eba
......@@ -349,12 +349,12 @@ public class TAutoContractScheme extends BaseEntity {
@Schema(description = "用工单位名称")
private String workingCompany;
/**
* 工资形式 0 计时工资 1计件工资 2 其他
* 工资形式 1.计时工资 2.计件工资 3.其他
*/
@ExcelAttribute(name = "工资形式", maxLength = 2)
@Length(max = 1, message = "工资形式不能超过2个字符")
@ExcelProperty("工资形式")
@Schema(description = "工资形式 0 计时工资 1计件工资 2 其他")
@Schema(description = "工资形式 1.计时工资 2.计件工资 3.其他")
private String salaryType;
/**
* 购买补充保险说明
......
......@@ -544,8 +544,8 @@ public class TEmployeeContractInfo extends BaseEntity {
/**
* preName
*/
@ExcelAttribute(name = "preName")
@ExcelProperty(value ="preName")
@Schema(description = "合同待签订列表preName")
@TableField(exist = false)
private String preName;
/**
......
......@@ -142,12 +142,12 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelProperty("前端客服登录名")
private String customerUserLoginname;
/**
* 签署方式0线下签1电子签
* 签署方式1线下签0电子签
*/
@Length(max = 1, message = "签署方式0线下签1电子签 不能超过1 个字符")
@ExcelAttribute(name = "签署方式0线下签1电子签", maxLength = 1)
@Schema(description = "签署方式0线下签1电子签")
@ExcelProperty("签署方式0线下签1电子签")
@Length(max = 1, message = "签署方式1线下签0电子签 不能超过1 个字符")
@ExcelAttribute(name = "签署方式1线下签0电子签", maxLength = 1)
@Schema(description = "签署方式1线下签0电子签")
@ExcelProperty("签署方式1线下签0电子签")
private String signType;
/**
* 法大大模版名称
......
......@@ -247,7 +247,7 @@
AND a.period_end = #{tEmployeeContractPre.periodEnd}
</if>
<if test="tEmployeeContractPre.expectedConfirmTime != null">
AND a.expected_confirm_time = #{tEmployeeContractPre.expectedConfirmTime}
AND DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") = DATE_FORMAT(#{tEmployeeContractPre.expectedConfirmTime},"%Y-%m-%d")
</if>
<if test="tEmployeeContractPre.configName != null and tEmployeeContractPre.configName.trim() != ''">
AND a.config_name = #{tEmployeeContractPre.configName}
......
......@@ -268,6 +268,5 @@
a.del_flag = '0'
<include refid="tGzOfferInfo_where"/>
</where>
ORDER by a.create_time desc,a.id desc
</select>
</mapper>
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