Commit 6ea16477 authored by hongguangwu's avatar hongguangwu

合同优化-待提交

parent e1eaf909
......@@ -135,7 +135,7 @@ public class TEmployeeContractInfo extends BaseEntity {
* 签订类型(字典也是汉字
*/
@NotBlank(message = "签订类型不能为空")
@Length(max = 1, message = "签订类型不能超过1个字符")
@Length(max = 100, message = "签订类型不能超过1个字符")
@ExcelAttribute(name = "签订类型", isNotEmpty = true, errorInfo = "签订类型不能为空", maxLength = 100)
@Schema(description = "签订类型(字典也是汉字)", name = "situation")
private String situation;
......@@ -435,6 +435,12 @@ public class TEmployeeContractInfo extends BaseEntity {
@Schema(description = "原因说明", name = "reason")
private String reason;
/**
* 是否附件 0是/1否
*/
@Schema(description = "是否附件 0是/1否")
@TableField(exist = false)
private String isAtta;
@Schema(description = "附件idList")
@TableField(exist = false)
......
......@@ -69,6 +69,7 @@ public class TEmployeeContractInfoController {
@Operation(summary = "归档分页查询(审核通过的数据(后面加上权限:自己创建的))", description = "归档分页查询")
@GetMapping("/filingPage")
public R<IPage<TEmployeeContractInfo>> getFilingPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
tEmployeeContractInfo.setSituation(CommonConstants.ZERO_STRING);
tEmployeeContractInfo.setAuditStatus(CommonConstants.dingleDigitIntArray[2]);
return new R<>(tEmployeeContractInfoService.getTEmployeeContractInfoPage(page, tEmployeeContractInfo));
}
......
......@@ -240,7 +240,12 @@
AND a.SUBJECT_UNIT = #{tEmployeeContractInfo.subjectUnit}
</if>
<if test="tEmployeeContractInfo.situation != null and tEmployeeContractInfo.situation.trim() != ''">
AND a.SITUATION = #{tEmployeeContractInfo.situation}
<if test="tEmployeeContractInfo.situation == '0' ">
AND a.SITUATION != '作废' AND a.SITUATION != '终止'
</if>
<if test="tEmployeeContractInfo.situation != '0' ">
AND a.SITUATION = #{tEmployeeContractInfo.situation}
</if>
</if>
<if test="tEmployeeContractInfo.contractTerm != null">
AND a.CONTRACT_TERM = #{tEmployeeContractInfo.contractTerm}
......@@ -257,6 +262,9 @@
<if test="tEmployeeContractInfo.isFile != null and tEmployeeContractInfo.isFile.trim() != ''">
AND a.IS_FILE = #{tEmployeeContractInfo.isFile}
</if>
<if test="tEmployeeContractInfo.isAtta != null and tEmployeeContractInfo.isAtta.trim() != ''">
AND a.IS_FILE = #{tEmployeeContractInfo.isAtta}
</if>
<if test="tEmployeeContractInfo.oldId != null">
AND a.OLD_ID = #{tEmployeeContractInfo.oldId}
</if>
......
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