张延森 3 anos atrás
pai
commit
af8902e066

+ 4
- 4
pom.xml Ver arquivo

262
 						<directory>src/main/resources</directory>
262
 						<directory>src/main/resources</directory>
263
 						<filtering>true</filtering>
263
 						<filtering>true</filtering>
264
 						<includes>
264
 						<includes>
265
-<!--							<include>**/*.p12</include>-->
266
-<!--							<include>**/*.pem</include>-->
265
+							<include>**/*.p12</include>
266
+							<include>**/*.pem</include>
267
 <!--							<include>**/*.xml</include>-->
267
 <!--							<include>**/*.xml</include>-->
268
 <!--							<include>*.xlsx</include>-->
268
 <!--							<include>*.xlsx</include>-->
269
 							<include>application.yml</include>
269
 							<include>application.yml</include>
275
 						<directory>src/main/resources</directory>
275
 						<directory>src/main/resources</directory>
276
 						<filtering>true</filtering>
276
 						<filtering>true</filtering>
277
 						<includes>
277
 						<includes>
278
-							<include>**/*.p12</include>
279
-							<include>**/*.pem</include>
278
+<!--							<include>**/*.p12</include>-->
279
+<!--							<include>**/*.pem</include>-->
280
 							<include>**/*.xml</include>
280
 							<include>**/*.xml</include>
281
 							<!--							<include>*.xlsx</include>-->
281
 							<!--							<include>*.xlsx</include>-->
282
 <!--							<include>application.yml</include>-->
282
 <!--							<include>application.yml</include>-->

+ 5
- 1
src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java Ver arquivo

82
                                           @ApiParam("犬主") @RequestParam(value ="personName", required = false) String personName,
82
                                           @ApiParam("犬主") @RequestParam(value ="personName", required = false) String personName,
83
                                           @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
83
                                           @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
84
                                           @ApiParam("犬名") @RequestParam(value ="petName", required = false) String petName,
84
                                           @ApiParam("犬名") @RequestParam(value ="petName", required = false) String petName,
85
-                                          @ApiParam("卡号") @RequestParam(value ="originCardNo", required = false) String originCardNo) throws Exception{
85
+                                          @ApiParam("卡号") @RequestParam(value ="originCardNo", required = false) String originCardNo,
86
+                                          @ApiParam("是否企业") @RequestParam(value ="isOrg", required = false) Boolean isOrg,
87
+                                          @ApiParam("企业名称") @RequestParam(value ="orgName", required = false) String orgName) throws Exception{
86
 
88
 
87
         SysUser sysUser = currentUser();
89
         SysUser sysUser = currentUser();
88
 
90
 
93
         queryWrapper.eq(null != applyMethod, "apply_method", applyMethod);
95
         queryWrapper.eq(null != applyMethod, "apply_method", applyMethod);
94
         queryWrapper.eq(null != payStatus, "pay_status", payStatus);
96
         queryWrapper.eq(null != payStatus, "pay_status", payStatus);
95
         queryWrapper.eq(null != verifyStatus, "verify_status", verifyStatus);
97
         queryWrapper.eq(null != verifyStatus, "verify_status", verifyStatus);
98
+        queryWrapper.eq(null != isOrg, "is_org", isOrg);
99
+        queryWrapper.like(!StringUtils.isEmpty(orgName), "org_name", "%" + orgName + "%");
96
         queryWrapper.like(!StringUtils.isEmpty(personName), "person_name", "%" + personName + "%");
100
         queryWrapper.like(!StringUtils.isEmpty(personName), "person_name", "%" + personName + "%");
97
         queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%" + phone + "%");
101
         queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%" + phone + "%");
98
         queryWrapper.like(!StringUtils.isEmpty(petName), "pet_name", "%" + petName + "%");
102
         queryWrapper.like(!StringUtils.isEmpty(petName), "pet_name", "%" + petName + "%");

+ 12
- 0
src/main/java/com/njyunzhi/pet_identity/entity/TaApplication.java Ver arquivo

133
     @ApiModelProperty(value = "快递单号",notes = "")
133
     @ApiModelProperty(value = "快递单号",notes = "")
134
     private String trackingNo ;
134
     private String trackingNo ;
135
 
135
 
136
+    @ApiModelProperty(value = "是否企业",notes = "")
137
+    private Boolean isOrg ;
138
+    @ApiModelProperty(value = "企业ID",notes = "")
139
+    private String orgId ;
140
+    @ApiModelProperty(value = "企业名称",notes = "")
141
+    private String orgName ;
142
+    @ApiModelProperty(value = "营业执照",notes = "")
143
+    private String orgLicense ;
144
+    @ApiModelProperty(value = "伤人信息",notes = "")
145
+    private String criminalInfo ;
146
+    @ApiModelProperty(value = "处罚信息",notes = "")
147
+    private String penaltyInfo ;
136
 }
148
 }