Commit 7a047c1a7206b82cf94a46890fa0ae77357dea3f
1 parent
18afea43
update
Showing
4 changed files
with
520 additions
and
473 deletions
src/main/java/com/bsth/entity/Cars.java
| 1 | package com.bsth.entity; | 1 | package com.bsth.entity; |
| 2 | 2 | ||
| 3 | +import com.bsth.entity.sys.SysUser; | ||
| 4 | + | ||
| 3 | import javax.persistence.*; | 5 | import javax.persistence.*; |
| 4 | import java.util.Date; | 6 | import java.util.Date; |
| 5 | 7 | ||
| @@ -42,7 +44,7 @@ public class Cars { | @@ -42,7 +44,7 @@ public class Cars { | ||
| 42 | /** 分公司 */ | 44 | /** 分公司 */ |
| 43 | private String brancheCompany; | 45 | private String brancheCompany; |
| 44 | 46 | ||
| 45 | - /** 车辆编码 */ | 47 | + /** 车辆编码(TODO:在原系统里没有,这里暂时留着) */ |
| 46 | @Column(nullable = false) | 48 | @Column(nullable = false) |
| 47 | private String carCode; | 49 | private String carCode; |
| 48 | /** 车牌号 */ | 50 | /** 车牌号 */ |
| @@ -94,52 +96,49 @@ public class Cars { | @@ -94,52 +96,49 @@ public class Cars { | ||
| 94 | private Date closeDate; | 96 | private Date closeDate; |
| 95 | 97 | ||
| 96 | /** 是否空调车 */ | 98 | /** 是否空调车 */ |
| 97 | - private boolean hvacCar; | 99 | + @Column(nullable = true) |
| 100 | + private Boolean hvacCar; | ||
| 98 | /** 有无人售票 */ | 101 | /** 有无人售票 */ |
| 99 | - private boolean ticketType; | 102 | + @Column(nullable = true) |
| 103 | + private Boolean ticketType; | ||
| 100 | /** 是否有LED服务屏 */ | 104 | /** 是否有LED服务屏 */ |
| 101 | - private boolean ledScreen; | 105 | + @Column(nullable = true) |
| 106 | + private Boolean ledScreen; | ||
| 102 | /** 是否有TV视频 */ | 107 | /** 是否有TV视频 */ |
| 103 | - private boolean tvVideoType; | 108 | + @Column(nullable = true) |
| 109 | + private Boolean tvVideoType; | ||
| 104 | 110 | ||
| 105 | /** 车辆类型 */ | 111 | /** 车辆类型 */ |
| 106 | private String carType; | 112 | private String carType; |
| 107 | /** 是否机动车(机动车类型选择)*/ | 113 | /** 是否机动车(机动车类型选择)*/ |
| 108 | - private String VehicleStats; | 114 | + private String vehicleStats; |
| 109 | /** 营运状态 */ | 115 | /** 营运状态 */ |
| 110 | - private Integer operatorsState; | ||
| 111 | - /** 是否电车 */ | ||
| 112 | - private boolean sfdc; | 116 | + private String operatorsState; |
| 117 | + /** 是否电车(TODO:在原系统里没有,这里暂时留着) */ | ||
| 118 | + private Boolean sfdc; | ||
| 113 | /** 备注/描述 */ | 119 | /** 备注/描述 */ |
| 114 | private String descriptions; | 120 | private String descriptions; |
| 115 | 121 | ||
| 116 | - | ||
| 117 | - | ||
| 118 | - // 车辆序号 | 122 | + /** 车辆序号(TODO:在原系统里没有,这里暂时留着) */ |
| 119 | private String carOrdinal; | 123 | private String carOrdinal; |
| 120 | - // 视频编号 | 124 | + /** 视频编号 */ |
| 121 | private String videoCode; | 125 | private String videoCode; |
| 122 | - // 是否报废 | ||
| 123 | - private boolean scrapState; | ||
| 124 | - // 是否切换 | 126 | + /** 是否报废 */ |
| 127 | + @Column(nullable = true) | ||
| 128 | + private Boolean scrapState; | ||
| 129 | + /** 是否切换(TODO:在原系统里没有,这里暂时留着)*/ | ||
| 125 | private Integer isSwitch; | 130 | private Integer isSwitch; |
| 131 | + /** 线路名称(TODO:在原系统里没有,这里暂时留着,并且不做线路关联,只保留个名字) */ | ||
| 132 | + private String xlmc; | ||
| 126 | 133 | ||
| 127 | - public String getXlmc() { | ||
| 128 | - return xlmc; | ||
| 129 | - } | ||
| 130 | - | ||
| 131 | - public void setXlmc(String xlmc) { | ||
| 132 | - this.xlmc = xlmc; | ||
| 133 | - } | ||
| 134 | 134 | ||
| 135 | - /** 线路名称(这里不做关联,只是登记的时候使用) */ | ||
| 136 | - private String xlmc; | ||
| 137 | - | ||
| 138 | - // 创建人 | ||
| 139 | - private Integer createBy; | 135 | + /** 创建人 */ |
| 136 | + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) | ||
| 137 | + private SysUser createBy; | ||
| 140 | 138 | ||
| 141 | - // 修改人 | ||
| 142 | - private Integer updateBy; | 139 | + /** 修改人 */ |
| 140 | + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) | ||
| 141 | + private SysUser updateBy; | ||
| 143 | 142 | ||
| 144 | // 创建日期 | 143 | // 创建日期 |
| 145 | @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP") | 144 | @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP") |
| @@ -149,363 +148,371 @@ public class Cars { | @@ -149,363 +148,371 @@ public class Cars { | ||
| 149 | @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP") | 148 | @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP") |
| 150 | private Date updateDate; | 149 | private Date updateDate; |
| 151 | 150 | ||
| 152 | - public Integer getId() { | ||
| 153 | - return id; | ||
| 154 | - } | 151 | + public Integer getId() { |
| 152 | + return id; | ||
| 153 | + } | ||
| 155 | 154 | ||
| 156 | - public void setId(Integer id) { | ||
| 157 | - this.id = id; | ||
| 158 | - } | 155 | + public void setId(Integer id) { |
| 156 | + this.id = id; | ||
| 157 | + } | ||
| 159 | 158 | ||
| 160 | - public String getCarCode() { | ||
| 161 | - return carCode; | ||
| 162 | - } | 159 | + public String getInsideCode() { |
| 160 | + return insideCode; | ||
| 161 | + } | ||
| 163 | 162 | ||
| 164 | - public void setCarCode(String carCode) { | ||
| 165 | - this.carCode = carCode; | ||
| 166 | - } | 163 | + public void setInsideCode(String insideCode) { |
| 164 | + this.insideCode = insideCode; | ||
| 165 | + } | ||
| 167 | 166 | ||
| 168 | - public String getCarPlate() { | ||
| 169 | - return carPlate; | ||
| 170 | - } | 167 | + public String getBusinessCode() { |
| 168 | + return businessCode; | ||
| 169 | + } | ||
| 171 | 170 | ||
| 172 | - public void setCarPlate(String carPlate) { | ||
| 173 | - this.carPlate = carPlate; | ||
| 174 | - } | 171 | + public void setBusinessCode(String businessCode) { |
| 172 | + this.businessCode = businessCode; | ||
| 173 | + } | ||
| 175 | 174 | ||
| 176 | - public String getInsideCode() { | ||
| 177 | - return insideCode; | ||
| 178 | - } | 175 | + public String getCompany() { |
| 176 | + return company; | ||
| 177 | + } | ||
| 179 | 178 | ||
| 180 | - public void setInsideCode(String insideCode) { | ||
| 181 | - this.insideCode = insideCode; | ||
| 182 | - } | 179 | + public void setCompany(String company) { |
| 180 | + this.company = company; | ||
| 181 | + } | ||
| 183 | 182 | ||
| 184 | - public String getCarClass() { | ||
| 185 | - return carClass; | ||
| 186 | - } | 183 | + public String getBrancheCompanyCode() { |
| 184 | + return brancheCompanyCode; | ||
| 185 | + } | ||
| 187 | 186 | ||
| 188 | - public void setCarClass(String carClass) { | ||
| 189 | - this.carClass = carClass; | ||
| 190 | - } | 187 | + public void setBrancheCompanyCode(String brancheCompanyCode) { |
| 188 | + this.brancheCompanyCode = brancheCompanyCode; | ||
| 189 | + } | ||
| 191 | 190 | ||
| 192 | - public Integer getCarSeatnNumber() { | ||
| 193 | - return carSeatnNumber; | ||
| 194 | - } | 191 | + public String getBrancheCompany() { |
| 192 | + return brancheCompany; | ||
| 193 | + } | ||
| 195 | 194 | ||
| 196 | - public void setCarSeatnNumber(Integer carSeatnNumber) { | ||
| 197 | - this.carSeatnNumber = carSeatnNumber; | ||
| 198 | - } | 195 | + public void setBrancheCompany(String brancheCompany) { |
| 196 | + this.brancheCompany = brancheCompany; | ||
| 197 | + } | ||
| 199 | 198 | ||
| 200 | - public String getCarStandard() { | ||
| 201 | - return carStandard; | ||
| 202 | - } | 199 | + public String getCarCode() { |
| 200 | + return carCode; | ||
| 201 | + } | ||
| 203 | 202 | ||
| 204 | - public void setCarStandard(String carStandard) { | ||
| 205 | - this.carStandard = carStandard; | ||
| 206 | - } | 203 | + public void setCarCode(String carCode) { |
| 204 | + this.carCode = carCode; | ||
| 205 | + } | ||
| 207 | 206 | ||
| 208 | - public Double getSpeed() { | ||
| 209 | - return speed; | ||
| 210 | - } | 207 | + public String getCarPlate() { |
| 208 | + return carPlate; | ||
| 209 | + } | ||
| 211 | 210 | ||
| 212 | - public void setSpeed(Double speed) { | ||
| 213 | - this.speed = speed; | ||
| 214 | - } | 211 | + public void setCarPlate(String carPlate) { |
| 212 | + this.carPlate = carPlate; | ||
| 213 | + } | ||
| 215 | 214 | ||
| 216 | - public boolean isHvacCar() { | ||
| 217 | - return hvacCar; | ||
| 218 | - } | 215 | + public String getSupplierName() { |
| 216 | + return supplierName; | ||
| 217 | + } | ||
| 219 | 218 | ||
| 220 | - public void setHvacCar(boolean hvacCar) { | ||
| 221 | - this.hvacCar = hvacCar; | ||
| 222 | - } | 219 | + public void setSupplierName(String supplierName) { |
| 220 | + this.supplierName = supplierName; | ||
| 221 | + } | ||
| 223 | 222 | ||
| 224 | - public Double getKburnStandard() { | ||
| 225 | - return kburnStandard; | ||
| 226 | - } | 223 | + public String getEquipmentCode() { |
| 224 | + return equipmentCode; | ||
| 225 | + } | ||
| 227 | 226 | ||
| 228 | - public void setKburnStandard(Double kburnStandard) { | ||
| 229 | - this.kburnStandard = kburnStandard; | ||
| 230 | - } | 227 | + public void setEquipmentCode(String equipmentCode) { |
| 228 | + this.equipmentCode = equipmentCode; | ||
| 229 | + } | ||
| 231 | 230 | ||
| 232 | - public Double getGburnStandard() { | ||
| 233 | - return gburnStandard; | ||
| 234 | - } | 231 | + public String getCarClass() { |
| 232 | + return carClass; | ||
| 233 | + } | ||
| 235 | 234 | ||
| 236 | - public void setGburnStandard(Double gburnStandard) { | ||
| 237 | - this.gburnStandard = gburnStandard; | ||
| 238 | - } | 235 | + public void setCarClass(String carClass) { |
| 236 | + this.carClass = carClass; | ||
| 237 | + } | ||
| 239 | 238 | ||
| 240 | - public boolean isTicketType() { | ||
| 241 | - return ticketType; | ||
| 242 | - } | 239 | + public Double getSpeed() { |
| 240 | + return speed; | ||
| 241 | + } | ||
| 243 | 242 | ||
| 244 | - public void setTicketType(boolean ticketType) { | ||
| 245 | - this.ticketType = ticketType; | ||
| 246 | - } | 243 | + public void setSpeed(Double speed) { |
| 244 | + this.speed = speed; | ||
| 245 | + } | ||
| 247 | 246 | ||
| 248 | - public boolean isTvVideoType() { | ||
| 249 | - return tvVideoType; | ||
| 250 | - } | 247 | + public Integer getCarSeatnNumber() { |
| 248 | + return carSeatnNumber; | ||
| 249 | + } | ||
| 251 | 250 | ||
| 252 | - public void setTvVideoType(boolean tvVideoType) { | ||
| 253 | - this.tvVideoType = tvVideoType; | ||
| 254 | - } | 251 | + public void setCarSeatnNumber(Integer carSeatnNumber) { |
| 252 | + this.carSeatnNumber = carSeatnNumber; | ||
| 253 | + } | ||
| 255 | 254 | ||
| 256 | - public boolean isLedScreen() { | ||
| 257 | - return ledScreen; | ||
| 258 | - } | 255 | + public String getCarStandard() { |
| 256 | + return carStandard; | ||
| 257 | + } | ||
| 259 | 258 | ||
| 260 | - public void setLedScreen(boolean ledScreen) { | ||
| 261 | - this.ledScreen = ledScreen; | ||
| 262 | - } | 259 | + public void setCarStandard(String carStandard) { |
| 260 | + this.carStandard = carStandard; | ||
| 261 | + } | ||
| 263 | 262 | ||
| 264 | - public String getEquipmentCode() { | ||
| 265 | - return equipmentCode; | ||
| 266 | - } | 263 | + public Double getKburnStandard() { |
| 264 | + return kburnStandard; | ||
| 265 | + } | ||
| 267 | 266 | ||
| 268 | - public void setEquipmentCode(String equipmentCode) { | ||
| 269 | - this.equipmentCode = equipmentCode; | ||
| 270 | - } | 267 | + public void setKburnStandard(Double kburnStandard) { |
| 268 | + this.kburnStandard = kburnStandard; | ||
| 269 | + } | ||
| 271 | 270 | ||
| 272 | - public String getMakeCodeOne() { | ||
| 273 | - return makeCodeOne; | ||
| 274 | - } | 271 | + public Double getGburnStandard() { |
| 272 | + return gburnStandard; | ||
| 273 | + } | ||
| 275 | 274 | ||
| 276 | - public void setMakeCodeOne(String makeCodeOne) { | ||
| 277 | - this.makeCodeOne = makeCodeOne; | ||
| 278 | - } | 275 | + public void setGburnStandard(Double gburnStandard) { |
| 276 | + this.gburnStandard = gburnStandard; | ||
| 277 | + } | ||
| 279 | 278 | ||
| 280 | - public String getMakeCodeTwo() { | ||
| 281 | - return makeCodeTwo; | ||
| 282 | - } | 279 | + public String getScrapCode() { |
| 280 | + return scrapCode; | ||
| 281 | + } | ||
| 283 | 282 | ||
| 284 | - public void setMakeCodeTwo(String makeCodeTwo) { | ||
| 285 | - this.makeCodeTwo = makeCodeTwo; | ||
| 286 | - } | 283 | + public void setScrapCode(String scrapCode) { |
| 284 | + this.scrapCode = scrapCode; | ||
| 285 | + } | ||
| 287 | 286 | ||
| 288 | - public String getCarGride() { | ||
| 289 | - return carGride; | ||
| 290 | - } | 287 | + public Date getScrapDate() { |
| 288 | + return scrapDate; | ||
| 289 | + } | ||
| 291 | 290 | ||
| 292 | - public void setCarGride(String carGride) { | ||
| 293 | - this.carGride = carGride; | ||
| 294 | - } | 291 | + public void setScrapDate(Date scrapDate) { |
| 292 | + this.scrapDate = scrapDate; | ||
| 293 | + } | ||
| 295 | 294 | ||
| 296 | - public String getEmissionsStandard() { | ||
| 297 | - return emissionsStandard; | ||
| 298 | - } | 295 | + public String getMakeCodeOne() { |
| 296 | + return makeCodeOne; | ||
| 297 | + } | ||
| 299 | 298 | ||
| 300 | - public void setEmissionsStandard(String emissionsStandard) { | ||
| 301 | - this.emissionsStandard = emissionsStandard; | ||
| 302 | - } | 299 | + public void setMakeCodeOne(String makeCodeOne) { |
| 300 | + this.makeCodeOne = makeCodeOne; | ||
| 301 | + } | ||
| 303 | 302 | ||
| 304 | - public String getEngineCodeOne() { | ||
| 305 | - return engineCodeOne; | ||
| 306 | - } | 303 | + public String getMakeCodeTwo() { |
| 304 | + return makeCodeTwo; | ||
| 305 | + } | ||
| 307 | 306 | ||
| 308 | - public void setEngineCodeOne(String engineCodeOne) { | ||
| 309 | - this.engineCodeOne = engineCodeOne; | ||
| 310 | - } | 307 | + public void setMakeCodeTwo(String makeCodeTwo) { |
| 308 | + this.makeCodeTwo = makeCodeTwo; | ||
| 309 | + } | ||
| 311 | 310 | ||
| 312 | - public String getEngineCodeTwo() { | ||
| 313 | - return engineCodeTwo; | ||
| 314 | - } | 311 | + public String getCarGride() { |
| 312 | + return carGride; | ||
| 313 | + } | ||
| 315 | 314 | ||
| 316 | - public void setEngineCodeTwo(String engineCodeTwo) { | ||
| 317 | - this.engineCodeTwo = engineCodeTwo; | ||
| 318 | - } | 315 | + public void setCarGride(String carGride) { |
| 316 | + this.carGride = carGride; | ||
| 317 | + } | ||
| 319 | 318 | ||
| 320 | - public String getCarNumberOne() { | ||
| 321 | - return carNumberOne; | ||
| 322 | - } | 319 | + public String getEmissionsStandard() { |
| 320 | + return emissionsStandard; | ||
| 321 | + } | ||
| 323 | 322 | ||
| 324 | - public void setCarNumberOne(String carNumberOne) { | ||
| 325 | - this.carNumberOne = carNumberOne; | ||
| 326 | - } | 323 | + public void setEmissionsStandard(String emissionsStandard) { |
| 324 | + this.emissionsStandard = emissionsStandard; | ||
| 325 | + } | ||
| 327 | 326 | ||
| 328 | - public String getCarNumberTwo() { | ||
| 329 | - return carNumberTwo; | ||
| 330 | - } | 327 | + public String getEngineCodeOne() { |
| 328 | + return engineCodeOne; | ||
| 329 | + } | ||
| 331 | 330 | ||
| 332 | - public void setCarNumberTwo(String carNumberTwo) { | ||
| 333 | - this.carNumberTwo = carNumberTwo; | ||
| 334 | - } | 331 | + public void setEngineCodeOne(String engineCodeOne) { |
| 332 | + this.engineCodeOne = engineCodeOne; | ||
| 333 | + } | ||
| 335 | 334 | ||
| 336 | - public String getCarType() { | ||
| 337 | - return carType; | ||
| 338 | - } | 335 | + public String getEngineCodeTwo() { |
| 336 | + return engineCodeTwo; | ||
| 337 | + } | ||
| 339 | 338 | ||
| 340 | - public void setCarType(String carType) { | ||
| 341 | - this.carType = carType; | ||
| 342 | - } | 339 | + public void setEngineCodeTwo(String engineCodeTwo) { |
| 340 | + this.engineCodeTwo = engineCodeTwo; | ||
| 341 | + } | ||
| 343 | 342 | ||
| 344 | - public String getBusinessCode() { | ||
| 345 | - return businessCode; | ||
| 346 | - } | 343 | + public String getCarNumberOne() { |
| 344 | + return carNumberOne; | ||
| 345 | + } | ||
| 347 | 346 | ||
| 348 | - public void setBusinessCode(String businessCode) { | ||
| 349 | - this.businessCode = businessCode; | ||
| 350 | - } | 347 | + public void setCarNumberOne(String carNumberOne) { |
| 348 | + this.carNumberOne = carNumberOne; | ||
| 349 | + } | ||
| 351 | 350 | ||
| 352 | - public String getCompany() { | ||
| 353 | - return company; | ||
| 354 | - } | 351 | + public String getCarNumberTwo() { |
| 352 | + return carNumberTwo; | ||
| 353 | + } | ||
| 355 | 354 | ||
| 356 | - public void setCompany(String company) { | ||
| 357 | - this.company = company; | ||
| 358 | - } | 355 | + public void setCarNumberTwo(String carNumberTwo) { |
| 356 | + this.carNumberTwo = carNumberTwo; | ||
| 357 | + } | ||
| 359 | 358 | ||
| 360 | - public String getBrancheCompany() { | ||
| 361 | - return brancheCompany; | ||
| 362 | - } | 359 | + public Date getOpenDate() { |
| 360 | + return openDate; | ||
| 361 | + } | ||
| 363 | 362 | ||
| 364 | - public void setBrancheCompany(String brancheCompany) { | ||
| 365 | - this.brancheCompany = brancheCompany; | ||
| 366 | - } | 363 | + public void setOpenDate(Date openDate) { |
| 364 | + this.openDate = openDate; | ||
| 365 | + } | ||
| 367 | 366 | ||
| 368 | - public String getCarOrdinal() { | ||
| 369 | - return carOrdinal; | ||
| 370 | - } | 367 | + public Date getCloseDate() { |
| 368 | + return closeDate; | ||
| 369 | + } | ||
| 371 | 370 | ||
| 372 | - public void setCarOrdinal(String carOrdinal) { | ||
| 373 | - this.carOrdinal = carOrdinal; | ||
| 374 | - } | 371 | + public void setCloseDate(Date closeDate) { |
| 372 | + this.closeDate = closeDate; | ||
| 373 | + } | ||
| 375 | 374 | ||
| 376 | - public String getVehicleStats() { | ||
| 377 | - return VehicleStats; | ||
| 378 | - } | 375 | + public Boolean getHvacCar() { |
| 376 | + return hvacCar; | ||
| 377 | + } | ||
| 379 | 378 | ||
| 380 | - public void setVehicleStats(String vehicleStats) { | ||
| 381 | - VehicleStats = vehicleStats; | ||
| 382 | - } | 379 | + public void setHvacCar(Boolean hvacCar) { |
| 380 | + this.hvacCar = hvacCar; | ||
| 381 | + } | ||
| 383 | 382 | ||
| 384 | - public String getVideoCode() { | ||
| 385 | - return videoCode; | ||
| 386 | - } | 383 | + public Boolean getTicketType() { |
| 384 | + return ticketType; | ||
| 385 | + } | ||
| 387 | 386 | ||
| 388 | - public void setVideoCode(String videoCode) { | ||
| 389 | - this.videoCode = videoCode; | ||
| 390 | - } | 387 | + public void setTicketType(Boolean ticketType) { |
| 388 | + this.ticketType = ticketType; | ||
| 389 | + } | ||
| 391 | 390 | ||
| 392 | - public Integer getOperatorsState() { | ||
| 393 | - return operatorsState; | ||
| 394 | - } | 391 | + public Boolean getLedScreen() { |
| 392 | + return ledScreen; | ||
| 393 | + } | ||
| 395 | 394 | ||
| 396 | - public void setOperatorsState(Integer operatorsState) { | ||
| 397 | - this.operatorsState = operatorsState; | ||
| 398 | - } | 395 | + public void setLedScreen(Boolean ledScreen) { |
| 396 | + this.ledScreen = ledScreen; | ||
| 397 | + } | ||
| 399 | 398 | ||
| 400 | - public Date getOpenDate() { | ||
| 401 | - return openDate; | ||
| 402 | - } | 399 | + public Boolean getTvVideoType() { |
| 400 | + return tvVideoType; | ||
| 401 | + } | ||
| 403 | 402 | ||
| 404 | - public void setOpenDate(Date openDate) { | ||
| 405 | - this.openDate = openDate; | ||
| 406 | - } | 403 | + public void setTvVideoType(Boolean tvVideoType) { |
| 404 | + this.tvVideoType = tvVideoType; | ||
| 405 | + } | ||
| 407 | 406 | ||
| 408 | - public Date getCloseDate() { | ||
| 409 | - return closeDate; | ||
| 410 | - } | 407 | + public String getCarType() { |
| 408 | + return carType; | ||
| 409 | + } | ||
| 411 | 410 | ||
| 412 | - public void setCloseDate(Date closeDate) { | ||
| 413 | - this.closeDate = closeDate; | ||
| 414 | - } | 411 | + public void setCarType(String carType) { |
| 412 | + this.carType = carType; | ||
| 413 | + } | ||
| 415 | 414 | ||
| 416 | - public boolean isScrapState() { | ||
| 417 | - return scrapState; | ||
| 418 | - } | 415 | + public String getVehicleStats() { |
| 416 | + return vehicleStats; | ||
| 417 | + } | ||
| 418 | + | ||
| 419 | + public void setVehicleStats(String vehicleStats) { | ||
| 420 | + this.vehicleStats = vehicleStats; | ||
| 421 | + } | ||
| 419 | 422 | ||
| 420 | - public void setScrapState(boolean scrapState) { | ||
| 421 | - this.scrapState = scrapState; | ||
| 422 | - } | 423 | + public String getOperatorsState() { |
| 424 | + return operatorsState; | ||
| 425 | + } | ||
| 423 | 426 | ||
| 424 | - public String getScrapCode() { | ||
| 425 | - return scrapCode; | ||
| 426 | - } | 427 | + public void setOperatorsState(String operatorsState) { |
| 428 | + this.operatorsState = operatorsState; | ||
| 429 | + } | ||
| 430 | + | ||
| 431 | + public Boolean getSfdc() { | ||
| 432 | + return sfdc; | ||
| 433 | + } | ||
| 427 | 434 | ||
| 428 | - public void setScrapCode(String scrapCode) { | ||
| 429 | - this.scrapCode = scrapCode; | ||
| 430 | - } | 435 | + public void setSfdc(Boolean sfdc) { |
| 436 | + this.sfdc = sfdc; | ||
| 437 | + } | ||
| 431 | 438 | ||
| 432 | - public Date getScrapDate() { | ||
| 433 | - return scrapDate; | ||
| 434 | - } | 439 | + public String getDescriptions() { |
| 440 | + return descriptions; | ||
| 441 | + } | ||
| 435 | 442 | ||
| 436 | - public void setScrapDate(Date scrapDate) { | ||
| 437 | - this.scrapDate = scrapDate; | ||
| 438 | - } | 443 | + public void setDescriptions(String descriptions) { |
| 444 | + this.descriptions = descriptions; | ||
| 445 | + } | ||
| 439 | 446 | ||
| 440 | - public Integer getIsSwitch() { | ||
| 441 | - return isSwitch; | ||
| 442 | - } | 447 | + public String getCarOrdinal() { |
| 448 | + return carOrdinal; | ||
| 449 | + } | ||
| 443 | 450 | ||
| 444 | - public void setIsSwitch(Integer isSwitch) { | ||
| 445 | - this.isSwitch = isSwitch; | ||
| 446 | - } | 451 | + public void setCarOrdinal(String carOrdinal) { |
| 452 | + this.carOrdinal = carOrdinal; | ||
| 453 | + } | ||
| 447 | 454 | ||
| 448 | - public String getDescriptions() { | ||
| 449 | - return descriptions; | ||
| 450 | - } | 455 | + public String getVideoCode() { |
| 456 | + return videoCode; | ||
| 457 | + } | ||
| 451 | 458 | ||
| 452 | - public void setDescriptions(String descriptions) { | ||
| 453 | - this.descriptions = descriptions; | ||
| 454 | - } | 459 | + public void setVideoCode(String videoCode) { |
| 460 | + this.videoCode = videoCode; | ||
| 461 | + } | ||
| 455 | 462 | ||
| 456 | - public Integer getCreateBy() { | ||
| 457 | - return createBy; | ||
| 458 | - } | 463 | + public Boolean getScrapState() { |
| 464 | + return scrapState; | ||
| 465 | + } | ||
| 459 | 466 | ||
| 460 | - public void setCreateBy(Integer createBy) { | ||
| 461 | - this.createBy = createBy; | ||
| 462 | - } | 467 | + public void setScrapState(Boolean scrapState) { |
| 468 | + this.scrapState = scrapState; | ||
| 469 | + } | ||
| 463 | 470 | ||
| 464 | - public Integer getUpdateBy() { | ||
| 465 | - return updateBy; | ||
| 466 | - } | 471 | + public Integer getIsSwitch() { |
| 472 | + return isSwitch; | ||
| 473 | + } | ||
| 467 | 474 | ||
| 468 | - public void setUpdateBy(Integer updateBy) { | ||
| 469 | - this.updateBy = updateBy; | ||
| 470 | - } | 475 | + public void setIsSwitch(Integer isSwitch) { |
| 476 | + this.isSwitch = isSwitch; | ||
| 477 | + } | ||
| 471 | 478 | ||
| 472 | - public Date getCreateDate() { | ||
| 473 | - return createDate; | ||
| 474 | - } | 479 | + public String getXlmc() { |
| 480 | + return xlmc; | ||
| 481 | + } | ||
| 475 | 482 | ||
| 476 | - public void setCreateDate(Date createDate) { | ||
| 477 | - this.createDate = createDate; | ||
| 478 | - } | 483 | + public void setXlmc(String xlmc) { |
| 484 | + this.xlmc = xlmc; | ||
| 485 | + } | ||
| 479 | 486 | ||
| 480 | - public Date getUpdateDate() { | ||
| 481 | - return updateDate; | ||
| 482 | - } | 487 | + public SysUser getCreateBy() { |
| 488 | + return createBy; | ||
| 489 | + } | ||
| 483 | 490 | ||
| 484 | - public void setUpdateDate(Date updateDate) { | ||
| 485 | - this.updateDate = updateDate; | ||
| 486 | - } | 491 | + public void setCreateBy(SysUser createBy) { |
| 492 | + this.createBy = createBy; | ||
| 493 | + } | ||
| 487 | 494 | ||
| 488 | - public String getBrancheCompanyCode() { | ||
| 489 | - return brancheCompanyCode; | 495 | + public SysUser getUpdateBy() { |
| 496 | + return updateBy; | ||
| 490 | } | 497 | } |
| 491 | 498 | ||
| 492 | - public void setBrancheCompanyCode(String brancheCompanyCode) { | ||
| 493 | - this.brancheCompanyCode = brancheCompanyCode; | 499 | + public void setUpdateBy(SysUser updateBy) { |
| 500 | + this.updateBy = updateBy; | ||
| 494 | } | 501 | } |
| 495 | 502 | ||
| 496 | - public String getSupplierName() { | ||
| 497 | - return supplierName; | 503 | + public Date getCreateDate() { |
| 504 | + return createDate; | ||
| 498 | } | 505 | } |
| 499 | 506 | ||
| 500 | - public void setSupplierName(String supplierName) { | ||
| 501 | - this.supplierName = supplierName; | 507 | + public void setCreateDate(Date createDate) { |
| 508 | + this.createDate = createDate; | ||
| 502 | } | 509 | } |
| 503 | 510 | ||
| 504 | - public boolean isSfdc() { | ||
| 505 | - return sfdc; | 511 | + public Date getUpdateDate() { |
| 512 | + return updateDate; | ||
| 506 | } | 513 | } |
| 507 | 514 | ||
| 508 | - public void setSfdc(boolean sfdc) { | ||
| 509 | - this.sfdc = sfdc; | 515 | + public void setUpdateDate(Date updateDate) { |
| 516 | + this.updateDate = updateDate; | ||
| 510 | } | 517 | } |
| 511 | } | 518 | } |
src/main/java/com/bsth/entity/Personnel.java
| 1 | package com.bsth.entity; | 1 | package com.bsth.entity; |
| 2 | 2 | ||
| 3 | -import java.util.Date; | 3 | +import com.bsth.entity.sys.SysUser; |
| 4 | 4 | ||
| 5 | -import javax.persistence.Column; | ||
| 6 | -import javax.persistence.Entity; | ||
| 7 | -import javax.persistence.GeneratedValue; | ||
| 8 | -import javax.persistence.GenerationType; | ||
| 9 | -import javax.persistence.Id; | ||
| 10 | -import javax.persistence.Table; | 5 | +import javax.persistence.*; |
| 6 | +import java.util.Date; | ||
| 11 | 7 | ||
| 12 | /** | 8 | /** |
| 13 | * | 9 | * |
| @@ -26,205 +22,224 @@ import javax.persistence.Table; | @@ -26,205 +22,224 @@ import javax.persistence.Table; | ||
| 26 | @Entity | 22 | @Entity |
| 27 | @Table(name = "bsth_c_personnel") | 23 | @Table(name = "bsth_c_personnel") |
| 28 | public class Personnel { | 24 | public class Personnel { |
| 29 | - | 25 | + |
| 26 | + /** 主键Id */ | ||
| 30 | @Id | 27 | @Id |
| 31 | - @GeneratedValue(strategy = GenerationType.IDENTITY) | 28 | + @GeneratedValue |
| 32 | private Integer id; | 29 | private Integer id; |
| 33 | - | ||
| 34 | - // 人员编码 | 30 | + |
| 31 | + /** 所属公司 */ | ||
| 32 | + @Column(nullable = false) | ||
| 33 | + private String company; | ||
| 34 | + /** 公司编码 */ | ||
| 35 | + @Column(nullable = false) | ||
| 36 | + private String companyCode; | ||
| 37 | + /** 所属分公司 */ | ||
| 38 | + private String brancheCompany; | ||
| 39 | + /** 分公司编码 */ | ||
| 40 | + private String brancheCompanyCode; | ||
| 41 | + /** 工号 */ | ||
| 42 | + @Column(nullable = false, unique = true) | ||
| 43 | + private String jobCode; | ||
| 44 | + /** 姓名 */ | ||
| 45 | + @Column(nullable = false) | ||
| 46 | + private String personnelName; | ||
| 47 | + | ||
| 48 | + /** 运营服务证书号 */ | ||
| 49 | + private String papersCode; | ||
| 50 | + /** 一卡通工作卡号 */ | ||
| 51 | + private String icCardCode; | ||
| 52 | + /** 性别(TODO:暂时使用男/女,不使用字典) */ | ||
| 53 | + private String personnelType; | ||
| 54 | + /** 所属岗位/工种(TODO:暂时不使用字典) */ | ||
| 55 | + private String posts; | ||
| 56 | + | ||
| 57 | + | ||
| 58 | + /** 人员编码(TODO:在原系统里没有,这里暂时留着) */ | ||
| 35 | private String personnelCode; | 59 | private String personnelCode; |
| 36 | - | ||
| 37 | - // 工号 | ||
| 38 | - private String jobCode; | ||
| 39 | - | ||
| 40 | - // 姓名 | ||
| 41 | - private String personnelName; | ||
| 42 | - | ||
| 43 | - // 性别 | ||
| 44 | - private Integer personnelType; | ||
| 45 | - | ||
| 46 | - // 照片地址 | 60 | + /** 照片地址(TODO:在原系统里没有,这里暂时留着) */ |
| 47 | private String personnelImg; | 61 | private String personnelImg; |
| 48 | - | ||
| 49 | - // 线路编号 | 62 | + /** 线路编号(TODO:在原系统里没有,这里暂时留着) */ |
| 50 | private String lineCode; | 63 | private String lineCode; |
| 51 | - | ||
| 52 | - // 一卡通工作卡号 | ||
| 53 | - private String icCardCode; | ||
| 54 | - | ||
| 55 | - // 运营服务证书号 | ||
| 56 | - private String papersCode; | ||
| 57 | - | ||
| 58 | - // 所属岗位 | ||
| 59 | - private String posts; | ||
| 60 | - | ||
| 61 | - // 所属公司 | ||
| 62 | - private String company; | ||
| 63 | - | ||
| 64 | - // 分公司 | ||
| 65 | - private String brancheCompany; | ||
| 66 | - | ||
| 67 | - // 创建人 | ||
| 68 | - private Integer createBy; | ||
| 69 | - | ||
| 70 | - // 联系电话 | 64 | + /** 联系电话(TODO:在原系统里没有,这里暂时留着) */ |
| 71 | private String telphone; | 65 | private String telphone; |
| 72 | - | ||
| 73 | - // 修改人 | ||
| 74 | - private Integer updateBy; | ||
| 75 | - | ||
| 76 | - // 描述 | ||
| 77 | - private String descriptions; | ||
| 78 | - | ||
| 79 | - // 创建日期 | 66 | + /** 描述(TODO:在原系统里没有,这里暂时留着) */ |
| 67 | + private String descriptions; | ||
| 68 | + | ||
| 69 | + | ||
| 70 | + | ||
| 71 | + /** 创建人 */ | ||
| 72 | + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) | ||
| 73 | + private SysUser createBy; | ||
| 74 | + /** 修改人 */ | ||
| 75 | + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) | ||
| 76 | + private SysUser updateBy; | ||
| 77 | + | ||
| 78 | + /** 创建日期 */ | ||
| 80 | @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP") | 79 | @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP") |
| 81 | private Date createDate; | 80 | private Date createDate; |
| 82 | 81 | ||
| 83 | - // 修改日期 | 82 | + /** 修改日期 */ |
| 84 | @Column(name = "update_date", columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP") | 83 | @Column(name = "update_date", columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP") |
| 85 | private Date updateDate; | 84 | private Date updateDate; |
| 86 | - | ||
| 87 | - public Integer getId() { | ||
| 88 | - return id; | ||
| 89 | - } | ||
| 90 | 85 | ||
| 91 | - public void setId(Integer id) { | ||
| 92 | - this.id = id; | ||
| 93 | - } | 86 | + public Integer getId() { |
| 87 | + return id; | ||
| 88 | + } | ||
| 89 | + | ||
| 90 | + public void setId(Integer id) { | ||
| 91 | + this.id = id; | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + public String getCompany() { | ||
| 95 | + return company; | ||
| 96 | + } | ||
| 97 | + | ||
| 98 | + public void setCompany(String company) { | ||
| 99 | + this.company = company; | ||
| 100 | + } | ||
| 101 | + | ||
| 102 | + public String getCompanyCode() { | ||
| 103 | + return companyCode; | ||
| 104 | + } | ||
| 105 | + | ||
| 106 | + public void setCompanyCode(String companyCode) { | ||
| 107 | + this.companyCode = companyCode; | ||
| 108 | + } | ||
| 109 | + | ||
| 110 | + public String getBrancheCompany() { | ||
| 111 | + return brancheCompany; | ||
| 112 | + } | ||
| 113 | + | ||
| 114 | + public void setBrancheCompany(String brancheCompany) { | ||
| 115 | + this.brancheCompany = brancheCompany; | ||
| 116 | + } | ||
| 117 | + | ||
| 118 | + public String getBrancheCompanyCode() { | ||
| 119 | + return brancheCompanyCode; | ||
| 120 | + } | ||
| 121 | + | ||
| 122 | + public void setBrancheCompanyCode(String brancheCompanyCode) { | ||
| 123 | + this.brancheCompanyCode = brancheCompanyCode; | ||
| 124 | + } | ||
| 125 | + | ||
| 126 | + public String getJobCode() { | ||
| 127 | + return jobCode; | ||
| 128 | + } | ||
| 129 | + | ||
| 130 | + public void setJobCode(String jobCode) { | ||
| 131 | + this.jobCode = jobCode; | ||
| 132 | + } | ||
| 133 | + | ||
| 134 | + public String getPersonnelName() { | ||
| 135 | + return personnelName; | ||
| 136 | + } | ||
| 137 | + | ||
| 138 | + public void setPersonnelName(String personnelName) { | ||
| 139 | + this.personnelName = personnelName; | ||
| 140 | + } | ||
| 141 | + | ||
| 142 | + public String getPapersCode() { | ||
| 143 | + return papersCode; | ||
| 144 | + } | ||
| 145 | + | ||
| 146 | + public void setPapersCode(String papersCode) { | ||
| 147 | + this.papersCode = papersCode; | ||
| 148 | + } | ||
| 149 | + | ||
| 150 | + public String getIcCardCode() { | ||
| 151 | + return icCardCode; | ||
| 152 | + } | ||
| 153 | + | ||
| 154 | + public void setIcCardCode(String icCardCode) { | ||
| 155 | + this.icCardCode = icCardCode; | ||
| 156 | + } | ||
| 157 | + | ||
| 158 | + public String getPersonnelType() { | ||
| 159 | + return personnelType; | ||
| 160 | + } | ||
| 161 | + | ||
| 162 | + public void setPersonnelType(String personnelType) { | ||
| 163 | + this.personnelType = personnelType; | ||
| 164 | + } | ||
| 165 | + | ||
| 166 | + public String getPosts() { | ||
| 167 | + return posts; | ||
| 168 | + } | ||
| 94 | 169 | ||
| 95 | - public String getPersonnelCode() { | ||
| 96 | - return personnelCode; | ||
| 97 | - } | 170 | + public void setPosts(String posts) { |
| 171 | + this.posts = posts; | ||
| 172 | + } | ||
| 98 | 173 | ||
| 99 | - public void setPersonnelCode(String personnelCode) { | ||
| 100 | - this.personnelCode = personnelCode; | ||
| 101 | - } | 174 | + public String getPersonnelCode() { |
| 175 | + return personnelCode; | ||
| 176 | + } | ||
| 102 | 177 | ||
| 103 | - public String getJobCode() { | ||
| 104 | - return jobCode; | ||
| 105 | - } | 178 | + public void setPersonnelCode(String personnelCode) { |
| 179 | + this.personnelCode = personnelCode; | ||
| 180 | + } | ||
| 106 | 181 | ||
| 107 | - public void setJobCode(String jobCode) { | ||
| 108 | - this.jobCode = jobCode; | ||
| 109 | - } | 182 | + public String getPersonnelImg() { |
| 183 | + return personnelImg; | ||
| 184 | + } | ||
| 110 | 185 | ||
| 111 | - public String getPersonnelName() { | ||
| 112 | - return personnelName; | ||
| 113 | - } | 186 | + public void setPersonnelImg(String personnelImg) { |
| 187 | + this.personnelImg = personnelImg; | ||
| 188 | + } | ||
| 114 | 189 | ||
| 115 | - public void setPersonnelName(String personnelName) { | ||
| 116 | - this.personnelName = personnelName; | ||
| 117 | - } | 190 | + public String getLineCode() { |
| 191 | + return lineCode; | ||
| 192 | + } | ||
| 118 | 193 | ||
| 119 | - public Integer getPersonnelType() { | ||
| 120 | - return personnelType; | ||
| 121 | - } | 194 | + public void setLineCode(String lineCode) { |
| 195 | + this.lineCode = lineCode; | ||
| 196 | + } | ||
| 122 | 197 | ||
| 123 | - public void setPersonnelType(Integer personnelType) { | ||
| 124 | - this.personnelType = personnelType; | ||
| 125 | - } | 198 | + public String getTelphone() { |
| 199 | + return telphone; | ||
| 200 | + } | ||
| 126 | 201 | ||
| 127 | - public String getPersonnelImg() { | ||
| 128 | - return personnelImg; | ||
| 129 | - } | ||
| 130 | - | ||
| 131 | - public void setPersonnelImg(String personnelImg) { | ||
| 132 | - this.personnelImg = personnelImg; | ||
| 133 | - } | ||
| 134 | - | ||
| 135 | - public String getLineCode() { | ||
| 136 | - return lineCode; | ||
| 137 | - } | ||
| 138 | - | ||
| 139 | - public void setLineCode(String lineCode) { | ||
| 140 | - this.lineCode = lineCode; | ||
| 141 | - } | ||
| 142 | - | ||
| 143 | - public String getIcCardCode() { | ||
| 144 | - return icCardCode; | ||
| 145 | - } | ||
| 146 | - | ||
| 147 | - public void setIcCardCode(String icCardCode) { | ||
| 148 | - this.icCardCode = icCardCode; | ||
| 149 | - } | ||
| 150 | - | ||
| 151 | - public String getPapersCode() { | ||
| 152 | - return papersCode; | ||
| 153 | - } | ||
| 154 | - | ||
| 155 | - public void setPapersCode(String papersCode) { | ||
| 156 | - this.papersCode = papersCode; | ||
| 157 | - } | ||
| 158 | - | ||
| 159 | - public String getPosts() { | ||
| 160 | - return posts; | ||
| 161 | - } | ||
| 162 | - | ||
| 163 | - public void setPosts(String posts) { | ||
| 164 | - this.posts = posts; | ||
| 165 | - } | ||
| 166 | - | ||
| 167 | - public String getCompany() { | ||
| 168 | - return company; | ||
| 169 | - } | ||
| 170 | - | ||
| 171 | - public void setCompany(String company) { | ||
| 172 | - this.company = company; | ||
| 173 | - } | ||
| 174 | - | ||
| 175 | - public String getBrancheCompany() { | ||
| 176 | - return brancheCompany; | ||
| 177 | - } | ||
| 178 | - | ||
| 179 | - public void setBrancheCompany(String brancheCompany) { | ||
| 180 | - this.brancheCompany = brancheCompany; | ||
| 181 | - } | ||
| 182 | - | ||
| 183 | - public Integer getCreateBy() { | ||
| 184 | - return createBy; | ||
| 185 | - } | ||
| 186 | - | ||
| 187 | - public void setCreateBy(Integer createBy) { | ||
| 188 | - this.createBy = createBy; | ||
| 189 | - } | 202 | + public void setTelphone(String telphone) { |
| 203 | + this.telphone = telphone; | ||
| 204 | + } | ||
| 190 | 205 | ||
| 191 | - public String getTelphone() { | ||
| 192 | - return telphone; | ||
| 193 | - } | 206 | + public String getDescriptions() { |
| 207 | + return descriptions; | ||
| 208 | + } | ||
| 194 | 209 | ||
| 195 | - public void setTelphone(String telphone) { | ||
| 196 | - this.telphone = telphone; | ||
| 197 | - } | 210 | + public void setDescriptions(String descriptions) { |
| 211 | + this.descriptions = descriptions; | ||
| 212 | + } | ||
| 198 | 213 | ||
| 199 | - public Integer getUpdateBy() { | ||
| 200 | - return updateBy; | ||
| 201 | - } | 214 | + public SysUser getCreateBy() { |
| 215 | + return createBy; | ||
| 216 | + } | ||
| 202 | 217 | ||
| 203 | - public void setUpdateBy(Integer updateBy) { | ||
| 204 | - this.updateBy = updateBy; | ||
| 205 | - } | 218 | + public void setCreateBy(SysUser createBy) { |
| 219 | + this.createBy = createBy; | ||
| 220 | + } | ||
| 206 | 221 | ||
| 207 | - public String getDescriptions() { | ||
| 208 | - return descriptions; | ||
| 209 | - } | 222 | + public SysUser getUpdateBy() { |
| 223 | + return updateBy; | ||
| 224 | + } | ||
| 210 | 225 | ||
| 211 | - public void setDescriptions(String descriptions) { | ||
| 212 | - this.descriptions = descriptions; | ||
| 213 | - } | 226 | + public void setUpdateBy(SysUser updateBy) { |
| 227 | + this.updateBy = updateBy; | ||
| 228 | + } | ||
| 214 | 229 | ||
| 215 | - public Date getCreateDate() { | ||
| 216 | - return createDate; | ||
| 217 | - } | 230 | + public Date getCreateDate() { |
| 231 | + return createDate; | ||
| 232 | + } | ||
| 218 | 233 | ||
| 219 | - public void setCreateDate(Date createDate) { | ||
| 220 | - this.createDate = createDate; | ||
| 221 | - } | 234 | + public void setCreateDate(Date createDate) { |
| 235 | + this.createDate = createDate; | ||
| 236 | + } | ||
| 222 | 237 | ||
| 223 | - public Date getUpdateDate() { | ||
| 224 | - return updateDate; | ||
| 225 | - } | 238 | + public Date getUpdateDate() { |
| 239 | + return updateDate; | ||
| 240 | + } | ||
| 226 | 241 | ||
| 227 | - public void setUpdateDate(Date updateDate) { | ||
| 228 | - this.updateDate = updateDate; | ||
| 229 | - } | 242 | + public void setUpdateDate(Date updateDate) { |
| 243 | + this.updateDate = updateDate; | ||
| 244 | + } | ||
| 230 | } | 245 | } |
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js
| @@ -54,6 +54,16 @@ angular.module('ScheduleApp').controller('BusInfoManageListCtrl', ['BusInfoManag | @@ -54,6 +54,16 @@ angular.module('ScheduleApp').controller('BusInfoManageListCtrl', ['BusInfoManag | ||
| 54 | }]); | 54 | }]); |
| 55 | 55 | ||
| 56 | angular.module('ScheduleApp').controller('BusInfoManageFormCtrl', ['BusInfoManageService', function(busInfoManageService) { | 56 | angular.module('ScheduleApp').controller('BusInfoManageFormCtrl', ['BusInfoManageService', function(busInfoManageService) { |
| 57 | + var self = this; | ||
| 58 | + | ||
| 59 | + // 绑定一个当前的输入对象 | ||
| 60 | + self.busInfo = {}; | ||
| 61 | + | ||
| 62 | + // 提交方法 | ||
| 63 | + self.submit = function() { | ||
| 64 | + alert("form submit 测试!"); | ||
| 65 | + }; | ||
| 66 | + | ||
| 57 | 67 | ||
| 58 | }]); | 68 | }]); |
| 59 | 69 |
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
| @@ -9,13 +9,28 @@ | @@ -9,13 +9,28 @@ | ||
| 9 | </div> | 9 | </div> |
| 10 | 10 | ||
| 11 | <div class="portlet-body form"> | 11 | <div class="portlet-body form"> |
| 12 | - <form action="" class="form-horizontal"> | 12 | + <form ng-submit="ctrl.submit()" class="form-horizontal" name="myForm"> |
| 13 | + <!--<div class="alert alert-danger display-hide">--> | ||
| 14 | + <!--<button class="close" data-close="alert"></button>--> | ||
| 15 | + <!--您的输入有误,请检查下面的输入项--> | ||
| 16 | + <!--</div>--> | ||
| 17 | + | ||
| 18 | + | ||
| 13 | <!-- 其他信息放置在这里 --> | 19 | <!-- 其他信息放置在这里 --> |
| 14 | <div class="form-body"> | 20 | <div class="form-body"> |
| 21 | + <!-- 测试form验证 --> | ||
| 15 | <div class="form-group"> | 22 | <div class="form-group"> |
| 16 | <label class="col-md-2 control-label">内部编号:</label> | 23 | <label class="col-md-2 control-label">内部编号:</label> |
| 17 | <div class="col-md-10"> | 24 | <div class="col-md-10"> |
| 18 | - <input type="text" class="form-control"/> | 25 | + <input type="text" class="form-control" name="insideCode" ng-model="ctrl.busInfo.insideCode" |
| 26 | + required ng-maxlength="8"/> | ||
| 27 | + <span ng-show="myForm.insideCode.$error.required"> | ||
| 28 | + 内部编号必须填写 | ||
| 29 | + </span> | ||
| 30 | + <span ng-show="myForm.insideCode.$error.maxlength"> | ||
| 31 | + 内部编号长度不能超过8位 | ||
| 32 | + </span> | ||
| 33 | + | ||
| 19 | </div> | 34 | </div> |
| 20 | </div> | 35 | </div> |
| 21 | <div class="form-group"> | 36 | <div class="form-group"> |