diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index eaa03eb..33afc5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -71,6 +71,7 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ + meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index eaa03eb..33afc5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -71,6 +71,7 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ + meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java index a276ff5..f135991 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java @@ -9,6 +9,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; import com.casic.missiles.service.meter.IMeterStateManageService; @@ -82,4 +83,29 @@ public ReturnDTO addStateManageInfo(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } + + + /** + * 状态管理申请编辑 + * @return + */ + @ApiOperation("状态管理申请编辑") + @PostMapping("/updateStateManageInfo") + @ResponseBody + public ReturnDTO updateStateManageInfo(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) { + return meterEquipmentApplyService.updateEquipmentApply(meterEquipmentApply); + } + /** + * 判断状态申请类型 + */ + private void setApplyTypeName(MeterEquipmentApply meterEquipmentApply){ + switch (meterEquipmentApply.getApplyType()){ + case "1" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "3" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "4" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "5" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "6" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "7" : meterEquipmentApply.setApplyTypeName("xzsq");break; + } + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index eaa03eb..33afc5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -71,6 +71,7 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ + meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java index a276ff5..f135991 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java @@ -9,6 +9,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; import com.casic.missiles.service.meter.IMeterStateManageService; @@ -82,4 +83,29 @@ public ReturnDTO addStateManageInfo(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } + + + /** + * 状态管理申请编辑 + * @return + */ + @ApiOperation("状态管理申请编辑") + @PostMapping("/updateStateManageInfo") + @ResponseBody + public ReturnDTO updateStateManageInfo(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) { + return meterEquipmentApplyService.updateEquipmentApply(meterEquipmentApply); + } + /** + * 判断状态申请类型 + */ + private void setApplyTypeName(MeterEquipmentApply meterEquipmentApply){ + switch (meterEquipmentApply.getApplyType()){ + case "1" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "3" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "4" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "5" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "6" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "7" : meterEquipmentApply.setApplyTypeName("xzsq");break; + } + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java index 04a6675..df67852 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java @@ -2,21 +2,30 @@ public enum EquipmentApplyEnum { - REPLACE_APPLY("1", "更换申请"), - SUSPEND_APPLY("2", "暂停申请"), - REVOKE_APPLY("3", "撤销申请"), - RECOVERY_APPLY("4", "恢复申请"), - REVIEW_APPLY("5", "复查申请"), - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); + REPLACE_APPLY("1", "更换申请","ghsq"), + SUSPEND_APPLY("2", "暂停申请","ztsq"), + REVOKE_APPLY("3", "撤销申请","cxsq"), + RECOVERY_APPLY("4", "恢复申请","hfsq"), + REVIEW_APPLY("5", "复查申请","fcsq"), + COLLECT_APPLY("1", "设备领用申请","lysq"), + BORROW_APPLY("2", "设备借用申请","jysq"), + IDLE_APPLY("3", "设备闲置申请","xzsq"), + SEAL_APPLY("4", "设备封存申请","fcsq"), + UNSEAL_APPLY("5", "设备启封申请","qfsq"), + SCRAP_APPLY("6", "设备报废申请","bfsq"), + MANAGEMENT_APPLY("7", "设备处置申请","czsq"), + WAIT_BORROWED("1", "待借用",null), + ALREADY_BORROWED("2", "已借用",null), + ALREADY_RETURN("3", "已归还",null); private String code; private String value; + private String prefix; - EquipmentApplyEnum(String code, String value) { + EquipmentApplyEnum(String code, String value,String prefix) { this.code = code; this.value = value; + this.prefix = prefix; } public String getCode() { @@ -26,4 +35,8 @@ public String getValue() { return value; } + + public String getPrefix() { + return prefix; + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index eaa03eb..33afc5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -71,6 +71,7 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ + meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java index a276ff5..f135991 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java @@ -9,6 +9,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; import com.casic.missiles.service.meter.IMeterStateManageService; @@ -82,4 +83,29 @@ public ReturnDTO addStateManageInfo(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } + + + /** + * 状态管理申请编辑 + * @return + */ + @ApiOperation("状态管理申请编辑") + @PostMapping("/updateStateManageInfo") + @ResponseBody + public ReturnDTO updateStateManageInfo(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) { + return meterEquipmentApplyService.updateEquipmentApply(meterEquipmentApply); + } + /** + * 判断状态申请类型 + */ + private void setApplyTypeName(MeterEquipmentApply meterEquipmentApply){ + switch (meterEquipmentApply.getApplyType()){ + case "1" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "3" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "4" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "5" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "6" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "7" : meterEquipmentApply.setApplyTypeName("xzsq");break; + } + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java index 04a6675..df67852 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java @@ -2,21 +2,30 @@ public enum EquipmentApplyEnum { - REPLACE_APPLY("1", "更换申请"), - SUSPEND_APPLY("2", "暂停申请"), - REVOKE_APPLY("3", "撤销申请"), - RECOVERY_APPLY("4", "恢复申请"), - REVIEW_APPLY("5", "复查申请"), - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); + REPLACE_APPLY("1", "更换申请","ghsq"), + SUSPEND_APPLY("2", "暂停申请","ztsq"), + REVOKE_APPLY("3", "撤销申请","cxsq"), + RECOVERY_APPLY("4", "恢复申请","hfsq"), + REVIEW_APPLY("5", "复查申请","fcsq"), + COLLECT_APPLY("1", "设备领用申请","lysq"), + BORROW_APPLY("2", "设备借用申请","jysq"), + IDLE_APPLY("3", "设备闲置申请","xzsq"), + SEAL_APPLY("4", "设备封存申请","fcsq"), + UNSEAL_APPLY("5", "设备启封申请","qfsq"), + SCRAP_APPLY("6", "设备报废申请","bfsq"), + MANAGEMENT_APPLY("7", "设备处置申请","czsq"), + WAIT_BORROWED("1", "待借用",null), + ALREADY_BORROWED("2", "已借用",null), + ALREADY_RETURN("3", "已归还",null); private String code; private String value; + private String prefix; - EquipmentApplyEnum(String code, String value) { + EquipmentApplyEnum(String code, String value,String prefix) { this.code = code; this.value = value; + this.prefix = prefix; } public String getCode() { @@ -26,4 +35,8 @@ public String getValue() { return value; } + + public String getPrefix() { + return prefix; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java index 4255235..37f2fa0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java @@ -67,7 +67,7 @@ @Override public ReturnDTO addEquipmentApply(MeterEquipmentApply meterEquipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); - String applyNo = NumberGeneratorUtil.getContactNo("sbjysq", maxNo); + String applyNo = NumberGeneratorUtil.getContactNo(meterEquipmentApply.getApplyTypeName(), maxNo); meterEquipmentApply.setApplyNo(applyNo); meterEquipmentApply.setApprovalStatus(ApprovalStatusEnum.DRAFT); if(equipmentApplyMapper.insert(meterEquipmentApply) > 0){ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java index eaa03eb..33afc5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java @@ -71,6 +71,7 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ + meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java index a276ff5..f135991 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStateManageController.java @@ -9,6 +9,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; import com.casic.missiles.service.meter.IMeterStateManageService; @@ -82,4 +83,29 @@ public ReturnDTO addStateManageInfo(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } + + + /** + * 状态管理申请编辑 + * @return + */ + @ApiOperation("状态管理申请编辑") + @PostMapping("/updateStateManageInfo") + @ResponseBody + public ReturnDTO updateStateManageInfo(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) { + return meterEquipmentApplyService.updateEquipmentApply(meterEquipmentApply); + } + /** + * 判断状态申请类型 + */ + private void setApplyTypeName(MeterEquipmentApply meterEquipmentApply){ + switch (meterEquipmentApply.getApplyType()){ + case "1" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "3" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "4" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "5" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "6" : meterEquipmentApply.setApplyTypeName("xzsq");break; + case "7" : meterEquipmentApply.setApplyTypeName("xzsq");break; + } + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java index 04a6675..df67852 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java @@ -2,21 +2,30 @@ public enum EquipmentApplyEnum { - REPLACE_APPLY("1", "更换申请"), - SUSPEND_APPLY("2", "暂停申请"), - REVOKE_APPLY("3", "撤销申请"), - RECOVERY_APPLY("4", "恢复申请"), - REVIEW_APPLY("5", "复查申请"), - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); + REPLACE_APPLY("1", "更换申请","ghsq"), + SUSPEND_APPLY("2", "暂停申请","ztsq"), + REVOKE_APPLY("3", "撤销申请","cxsq"), + RECOVERY_APPLY("4", "恢复申请","hfsq"), + REVIEW_APPLY("5", "复查申请","fcsq"), + COLLECT_APPLY("1", "设备领用申请","lysq"), + BORROW_APPLY("2", "设备借用申请","jysq"), + IDLE_APPLY("3", "设备闲置申请","xzsq"), + SEAL_APPLY("4", "设备封存申请","fcsq"), + UNSEAL_APPLY("5", "设备启封申请","qfsq"), + SCRAP_APPLY("6", "设备报废申请","bfsq"), + MANAGEMENT_APPLY("7", "设备处置申请","czsq"), + WAIT_BORROWED("1", "待借用",null), + ALREADY_BORROWED("2", "已借用",null), + ALREADY_RETURN("3", "已归还",null); private String code; private String value; + private String prefix; - EquipmentApplyEnum(String code, String value) { + EquipmentApplyEnum(String code, String value,String prefix) { this.code = code; this.value = value; + this.prefix = prefix; } public String getCode() { @@ -26,4 +35,8 @@ public String getValue() { return value; } + + public String getPrefix() { + return prefix; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java index 4255235..37f2fa0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java @@ -67,7 +67,7 @@ @Override public ReturnDTO addEquipmentApply(MeterEquipmentApply meterEquipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); - String applyNo = NumberGeneratorUtil.getContactNo("sbjysq", maxNo); + String applyNo = NumberGeneratorUtil.getContactNo(meterEquipmentApply.getApplyTypeName(), maxNo); meterEquipmentApply.setApplyNo(applyNo); meterEquipmentApply.setApprovalStatus(ApprovalStatusEnum.DRAFT); if(equipmentApplyMapper.insert(meterEquipmentApply) > 0){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java index f78c8c1..c0b7487 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStandardApplyServiceImpl.java @@ -101,7 +101,7 @@ @Override public ReturnDTO addStandardEquipmentApply(MeterStandardApply meterStandardApply) { Long maxNo = meterStandardApplyMapper.selectMaxNo(); - String applyNo = NumberGeneratorUtil.getContactNo("bzzzsq", maxNo); + String applyNo = NumberGeneratorUtil.getContactNo(meterStandardApply.getApplyTypeName(), maxNo); meterStandardApply.setApplyNo(applyNo); meterStandardApply.setApprovalStatus(ApprovalStatusEnum.DRAFT); if(meterStandardApplyMapper.insert(meterStandardApply)>0){