Merge branch 'lal' into develop

src/main/java/cn/timer/api/bean/htzz/HtzzAdminZzda.java

@@ -92,6 +92,9 @@ public class HtzzAdminZzda extends Model<HtzzAdminZzda> {
 	@ApiModelProperty(value = "0：未发；1：已发", example = "0")
 	@ApiModelProperty(value = "0：未发；1：已发", example = "0")
 	private Integer sendingStatus;
 	private Integer sendingStatus;
 	
 	
+	@ApiModelProperty(value = "1：合同；2：证照", example = "1")
+	private Integer documentType;
+	
 	@Transient
 	@Transient
 	@TableField(exist = false)
 	@TableField(exist = false)
 	private List<NotifyPersonDto> ids;
 	private List<NotifyPersonDto> ids;

src/main/java/cn/timer/api/controller/htzz/HtzzController.java

@@ -162,7 +162,7 @@ public class HtzzController {
 
 
 		QueryWrapper<HtzzAdminZzda> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<HtzzAdminZzda> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("org_code", userBean.getOrgCode())
 		queryWrapper.eq("org_code", userBean.getOrgCode())
-				.select("id", "zjmc", "czry", "czrdh", "fzrq", "yxdqr", "txkg_type").eq("is_delete", 0)
+				.select("id", "zjmc", "czry", "czrdh", "fzrq", "yxdqr", "txkg_type").eq("is_delete", 0).eq("document_type", htzzQueryDto.getDocumentType())
 				.gt(!StrUtil.hasBlank(e), "yxdqr", !StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
 				.gt(!StrUtil.hasBlank(e), "yxdqr", !StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
 				.and(!StrUtil.hasBlank(q), wq -> wq.like("zjmc", q).or().like("czry", q)).orderByDesc("lrsj_time");
 				.and(!StrUtil.hasBlank(q), wq -> wq.like("zjmc", q).or().like("czry", q)).orderByDesc("lrsj_time");
 
 

src/main/java/cn/timer/api/dto/htzz/HtzzQueryDto.java

@@ -23,5 +23,8 @@ public class HtzzQueryDto extends Page implements Serializable{
 	@ApiModelProperty(value="名称、型号、供应商",example="张三")
 	@ApiModelProperty(value="名称、型号、供应商",example="张三")
 	private String query;
 	private String query;
 	
 	
+	@ApiModelProperty(value="1：合同；2：证照",example="1")
+	private Integer documentType;
+	
 }
 }
 
 

src/main/resources/mapping/htzz/HtzzAdminZzdaMapper.xml

@@ -21,6 +21,7 @@
                 <result column="is_delete" property="isDelete" />
                 <result column="is_delete" property="isDelete" />
                 <result column="template_id" property="templateId" />
                 <result column="template_id" property="templateId" />
                 <result column="sending_status" property="sendingStatus" />
                 <result column="sending_status" property="sendingStatus" />
+                <result column="document_type" property="documentType" />
     </resultMap>
     </resultMap>
 
 
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
@@ -40,7 +41,8 @@
                 zjmc,
                 zjmc,
                 is_delete,
                 is_delete,
                 template_id,
                 template_id,
-                sending_status
+                sending_status,
+                document_type
     </sql>
     </sql>