feats

pom.xml

 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
 						<includes>
-<!--							<include>**/*.p12</include>-->
-<!--							<include>**/*.pem</include>-->
+							<include>**/*.p12</include>
+							<include>**/*.pem</include>
 <!--							<include>**/*.xml</include>-->
 <!--							<include>*.xlsx</include>-->
 							<include>application.yml</include>
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
 						<includes>
-							<include>**/*.p12</include>
-							<include>**/*.pem</include>
+<!--							<include>**/*.p12</include>-->
+<!--							<include>**/*.pem</include>-->
 							<include>**/*.xml</include>
 							<!--							<include>*.xlsx</include>-->
 <!--							<include>application.yml</include>-->

src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java

                                           @ApiParam("犬主") @RequestParam(value ="personName", required = false) String personName,
                                           @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
                                           @ApiParam("犬名") @RequestParam(value ="petName", required = false) String petName,
-                                          @ApiParam("卡号") @RequestParam(value ="originCardNo", required = false) String originCardNo) throws Exception{
+                                          @ApiParam("卡号") @RequestParam(value ="originCardNo", required = false) String originCardNo,
+                                          @ApiParam("是否企业") @RequestParam(value ="isOrg", required = false) Boolean isOrg,
+                                          @ApiParam("企业名称") @RequestParam(value ="orgName", required = false) String orgName) throws Exception{
 
         SysUser sysUser = currentUser();
 
         queryWrapper.eq(null != applyMethod, "apply_method", applyMethod);
         queryWrapper.eq(null != payStatus, "pay_status", payStatus);
         queryWrapper.eq(null != verifyStatus, "verify_status", verifyStatus);
+        queryWrapper.eq(null != isOrg, "is_org", isOrg);
+        queryWrapper.like(!StringUtils.isEmpty(orgName), "org_name", "%" + orgName + "%");
         queryWrapper.like(!StringUtils.isEmpty(personName), "person_name", "%" + personName + "%");
         queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%" + phone + "%");
         queryWrapper.like(!StringUtils.isEmpty(petName), "pet_name", "%" + petName + "%");

src/main/java/com/njyunzhi/pet_identity/entity/TaApplication.java

     @ApiModelProperty(value = "快递单号",notes = "")
     private String trackingNo ;
 
+    @ApiModelProperty(value = "是否企业",notes = "")
+    private Boolean isOrg ;
+    @ApiModelProperty(value = "企业ID",notes = "")
+    private String orgId ;
+    @ApiModelProperty(value = "企业名称",notes = "")
+    private String orgName ;
+    @ApiModelProperty(value = "营业执照",notes = "")
+    private String orgLicense ;
+    @ApiModelProperty(value = "伤人信息",notes = "")
+    private String criminalInfo ;
+    @ApiModelProperty(value = "处罚信息",notes = "")
+    private String penaltyInfo ;
 }