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 0032b8b..e00b6b9 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 @@ -81,7 +81,6 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ - meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -123,7 +122,7 @@ @ResponseBody public void exportList(@RequestBody MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception{ try { - meterEquipmentApplyService.exportStaffList(request,response); + meterEquipmentApplyService.exportList(request,response); }catch (Exception e){ e.printStackTrace(); } 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 0032b8b..e00b6b9 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 @@ -81,7 +81,6 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ - meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -123,7 +122,7 @@ @ResponseBody public void exportList(@RequestBody MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception{ try { - meterEquipmentApplyService.exportStaffList(request,response); + meterEquipmentApplyService.exportList(request,response); }catch (Exception e){ e.printStackTrace(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java index 7ea2f1c..052743c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java @@ -4,18 +4,22 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.MeterStaff; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardApply; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.MeterStandardApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -73,6 +77,16 @@ } /** + * 标准装置申请提交 + */ + @ApiOperation("标准装置申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return standardEquipmentApplyService.submitStandardEquipmentApply(request); + } + + /** * 标准装置申请列表删除 */ @ApiOperation("标准装置申请列表删除") 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 0032b8b..e00b6b9 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 @@ -81,7 +81,6 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ - meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -123,7 +122,7 @@ @ResponseBody public void exportList(@RequestBody MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception{ try { - meterEquipmentApplyService.exportStaffList(request,response); + meterEquipmentApplyService.exportList(request,response); }catch (Exception e){ e.printStackTrace(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java index 7ea2f1c..052743c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java @@ -4,18 +4,22 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.MeterStaff; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardApply; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.MeterStandardApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -73,6 +77,16 @@ } /** + * 标准装置申请提交 + */ + @ApiOperation("标准装置申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return standardEquipmentApplyService.submitStandardEquipmentApply(request); + } + + /** * 标准装置申请列表删除 */ @ApiOperation("标准装置申请列表删除") 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 f135991..cdd073f 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 @@ -4,11 +4,13 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -65,6 +68,16 @@ } /** + * 状态管理申请提交 + */ + @ApiOperation("状态管理申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return meterEquipmentApplyService.submitEquipmentApply(request); + } + + /** * 状态管理申请详细信息 */ @ApiOperation("状态管理申请详细信息") @@ -95,17 +108,19 @@ 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; + @ApiOperation("状态管理列表导出") + @PostMapping("/exportStateManageList") + @ResponseBody + public void exportStateManageList(@RequestBody MeterStateManageRequest request, HttpServletResponse response) throws Exception{ + try { + stateManageService.exportStateManageList(request,response); + }catch (Exception e){ + e.printStackTrace(); } } + } 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 0032b8b..e00b6b9 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 @@ -81,7 +81,6 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ - meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -123,7 +122,7 @@ @ResponseBody public void exportList(@RequestBody MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception{ try { - meterEquipmentApplyService.exportStaffList(request,response); + meterEquipmentApplyService.exportList(request,response); }catch (Exception e){ e.printStackTrace(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java index 7ea2f1c..052743c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java @@ -4,18 +4,22 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.MeterStaff; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardApply; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.MeterStandardApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -73,6 +77,16 @@ } /** + * 标准装置申请提交 + */ + @ApiOperation("标准装置申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return standardEquipmentApplyService.submitStandardEquipmentApply(request); + } + + /** * 标准装置申请列表删除 */ @ApiOperation("标准装置申请列表删除") 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 f135991..cdd073f 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 @@ -4,11 +4,13 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -65,6 +68,16 @@ } /** + * 状态管理申请提交 + */ + @ApiOperation("状态管理申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return meterEquipmentApplyService.submitEquipmentApply(request); + } + + /** * 状态管理申请详细信息 */ @ApiOperation("状态管理申请详细信息") @@ -95,17 +108,19 @@ 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; + @ApiOperation("状态管理列表导出") + @PostMapping("/exportStateManageList") + @ResponseBody + public void exportStateManageList(@RequestBody MeterStateManageRequest request, HttpServletResponse response) throws Exception{ + try { + stateManageService.exportStateManageList(request,response); + }catch (Exception e){ + e.printStackTrace(); } } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e9142f7..5c31709 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -25,7 +25,8 @@ EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"), METER_PRICE("meterPrice", "meterPrice", "价格库"), METER_STAFF("meterStaff", "meterStaff", "计量人员"), - STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"); + STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), + STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; 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 0032b8b..e00b6b9 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 @@ -81,7 +81,6 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ - meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -123,7 +122,7 @@ @ResponseBody public void exportList(@RequestBody MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception{ try { - meterEquipmentApplyService.exportStaffList(request,response); + meterEquipmentApplyService.exportList(request,response); }catch (Exception e){ e.printStackTrace(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java index 7ea2f1c..052743c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java @@ -4,18 +4,22 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.MeterStaff; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardApply; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.MeterStandardApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -73,6 +77,16 @@ } /** + * 标准装置申请提交 + */ + @ApiOperation("标准装置申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return standardEquipmentApplyService.submitStandardEquipmentApply(request); + } + + /** * 标准装置申请列表删除 */ @ApiOperation("标准装置申请列表删除") 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 f135991..cdd073f 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 @@ -4,11 +4,13 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -65,6 +68,16 @@ } /** + * 状态管理申请提交 + */ + @ApiOperation("状态管理申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return meterEquipmentApplyService.submitEquipmentApply(request); + } + + /** * 状态管理申请详细信息 */ @ApiOperation("状态管理申请详细信息") @@ -95,17 +108,19 @@ 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; + @ApiOperation("状态管理列表导出") + @PostMapping("/exportStateManageList") + @ResponseBody + public void exportStateManageList(@RequestBody MeterStateManageRequest request, HttpServletResponse response) throws Exception{ + try { + stateManageService.exportStateManageList(request,response); + }catch (Exception e){ + e.printStackTrace(); } } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e9142f7..5c31709 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -25,7 +25,8 @@ EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"), METER_PRICE("meterPrice", "meterPrice", "价格库"), METER_STAFF("meterStaff", "meterStaff", "计量人员"), - STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"); + STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), + STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java index 0930ba2..ed8fe65 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java @@ -1,27 +1,26 @@ package com.casic.missiles.enums; -public enum StandardApplyTypeEnum { +public class StandardApplyTypeEnum { - REPLACE_APPLY("1", "更换申请"), - SUSPEND_APPLY("2", "暂停申请"), - REVOKE_APPLY("3", "撤销申请"), - RECOVERY_APPLY("4", "恢复申请"), - REVIEW_APPLY("5", "复查申请"); + /** + * 更换申请 + */ + public static final String REPLACE_APPLY = "1"; + /** + * 暂停申请 + */ + public static final String SUSPEND_APPLY = "2"; + /** + * 撤销申请 + */ + public static final String REVOKE_APPLY = "3"; + /** + * 恢复申请 + */ + public static final String RECOVERY_APPLY = "4"; + /** + * 复查申请 + */ + public static final String REVIEW_APPLY = "5"; - - private String code; - private String value; - - StandardApplyTypeEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } 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 0032b8b..e00b6b9 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 @@ -81,7 +81,6 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ - meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -123,7 +122,7 @@ @ResponseBody public void exportList(@RequestBody MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception{ try { - meterEquipmentApplyService.exportStaffList(request,response); + meterEquipmentApplyService.exportList(request,response); }catch (Exception e){ e.printStackTrace(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java index 7ea2f1c..052743c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java @@ -4,18 +4,22 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.MeterStaff; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardApply; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.MeterStandardApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -73,6 +77,16 @@ } /** + * 标准装置申请提交 + */ + @ApiOperation("标准装置申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return standardEquipmentApplyService.submitStandardEquipmentApply(request); + } + + /** * 标准装置申请列表删除 */ @ApiOperation("标准装置申请列表删除") 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 f135991..cdd073f 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 @@ -4,11 +4,13 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -65,6 +68,16 @@ } /** + * 状态管理申请提交 + */ + @ApiOperation("状态管理申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return meterEquipmentApplyService.submitEquipmentApply(request); + } + + /** * 状态管理申请详细信息 */ @ApiOperation("状态管理申请详细信息") @@ -95,17 +108,19 @@ 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; + @ApiOperation("状态管理列表导出") + @PostMapping("/exportStateManageList") + @ResponseBody + public void exportStateManageList(@RequestBody MeterStateManageRequest request, HttpServletResponse response) throws Exception{ + try { + stateManageService.exportStateManageList(request,response); + }catch (Exception e){ + e.printStackTrace(); } } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e9142f7..5c31709 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -25,7 +25,8 @@ EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"), METER_PRICE("meterPrice", "meterPrice", "价格库"), METER_STAFF("meterStaff", "meterStaff", "计量人员"), - STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"); + STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), + STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java index 0930ba2..ed8fe65 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java @@ -1,27 +1,26 @@ package com.casic.missiles.enums; -public enum StandardApplyTypeEnum { +public class StandardApplyTypeEnum { - REPLACE_APPLY("1", "更换申请"), - SUSPEND_APPLY("2", "暂停申请"), - REVOKE_APPLY("3", "撤销申请"), - RECOVERY_APPLY("4", "恢复申请"), - REVIEW_APPLY("5", "复查申请"); + /** + * 更换申请 + */ + public static final String REPLACE_APPLY = "1"; + /** + * 暂停申请 + */ + public static final String SUSPEND_APPLY = "2"; + /** + * 撤销申请 + */ + public static final String REVOKE_APPLY = "3"; + /** + * 恢复申请 + */ + public static final String RECOVERY_APPLY = "4"; + /** + * 复查申请 + */ + public static final String REVIEW_APPLY = "5"; - - private String code; - private String value; - - StandardApplyTypeEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java index f91602e..0850792 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java @@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; +import java.util.Objects; /** * 字典utils @@ -54,7 +55,7 @@ if (!field.isAccessible()) { field.setAccessible(true); } - if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) { + if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) { DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0]; // 判断字典code是否需要校验 if(!dictCodeField.needValid()){ 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 0032b8b..e00b6b9 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 @@ -81,7 +81,6 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ - meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -123,7 +122,7 @@ @ResponseBody public void exportList(@RequestBody MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception{ try { - meterEquipmentApplyService.exportStaffList(request,response); + meterEquipmentApplyService.exportList(request,response); }catch (Exception e){ e.printStackTrace(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java index 7ea2f1c..052743c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java @@ -4,18 +4,22 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.MeterStaff; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardApply; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.MeterStandardApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -73,6 +77,16 @@ } /** + * 标准装置申请提交 + */ + @ApiOperation("标准装置申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return standardEquipmentApplyService.submitStandardEquipmentApply(request); + } + + /** * 标准装置申请列表删除 */ @ApiOperation("标准装置申请列表删除") 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 f135991..cdd073f 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 @@ -4,11 +4,13 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -65,6 +68,16 @@ } /** + * 状态管理申请提交 + */ + @ApiOperation("状态管理申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return meterEquipmentApplyService.submitEquipmentApply(request); + } + + /** * 状态管理申请详细信息 */ @ApiOperation("状态管理申请详细信息") @@ -95,17 +108,19 @@ 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; + @ApiOperation("状态管理列表导出") + @PostMapping("/exportStateManageList") + @ResponseBody + public void exportStateManageList(@RequestBody MeterStateManageRequest request, HttpServletResponse response) throws Exception{ + try { + stateManageService.exportStateManageList(request,response); + }catch (Exception e){ + e.printStackTrace(); } } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e9142f7..5c31709 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -25,7 +25,8 @@ EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"), METER_PRICE("meterPrice", "meterPrice", "价格库"), METER_STAFF("meterStaff", "meterStaff", "计量人员"), - STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"); + STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), + STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java index 0930ba2..ed8fe65 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java @@ -1,27 +1,26 @@ package com.casic.missiles.enums; -public enum StandardApplyTypeEnum { +public class StandardApplyTypeEnum { - REPLACE_APPLY("1", "更换申请"), - SUSPEND_APPLY("2", "暂停申请"), - REVOKE_APPLY("3", "撤销申请"), - RECOVERY_APPLY("4", "恢复申请"), - REVIEW_APPLY("5", "复查申请"); + /** + * 更换申请 + */ + public static final String REPLACE_APPLY = "1"; + /** + * 暂停申请 + */ + public static final String SUSPEND_APPLY = "2"; + /** + * 撤销申请 + */ + public static final String REVOKE_APPLY = "3"; + /** + * 恢复申请 + */ + public static final String RECOVERY_APPLY = "4"; + /** + * 复查申请 + */ + public static final String REVIEW_APPLY = "5"; - - private String code; - private String value; - - StandardApplyTypeEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java index f91602e..0850792 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java @@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; +import java.util.Objects; /** * 字典utils @@ -54,7 +55,7 @@ if (!field.isAccessible()) { field.setAccessible(true); } - if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) { + if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) { DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0]; // 判断字典code是否需要校验 if(!dictCodeField.needValid()){ diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java index ad60153..373cf8b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java @@ -6,9 +6,13 @@ import com.casic.missiles.model.MeterCheckInfo; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface MeterStateManageMapper { Page stateManageList(Page page, @Param("request") MeterStateManageRequest request); + List stateManageList(@Param("request") MeterStateManageRequest request); + MeterStateManageResponse selectById(@Param("id") Long id); } 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 0032b8b..e00b6b9 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 @@ -81,7 +81,6 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ - meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -123,7 +122,7 @@ @ResponseBody public void exportList(@RequestBody MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception{ try { - meterEquipmentApplyService.exportStaffList(request,response); + meterEquipmentApplyService.exportList(request,response); }catch (Exception e){ e.printStackTrace(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java index 7ea2f1c..052743c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java @@ -4,18 +4,22 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.MeterStaff; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardApply; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.MeterStandardApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -73,6 +77,16 @@ } /** + * 标准装置申请提交 + */ + @ApiOperation("标准装置申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return standardEquipmentApplyService.submitStandardEquipmentApply(request); + } + + /** * 标准装置申请列表删除 */ @ApiOperation("标准装置申请列表删除") 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 f135991..cdd073f 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 @@ -4,11 +4,13 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -65,6 +68,16 @@ } /** + * 状态管理申请提交 + */ + @ApiOperation("状态管理申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return meterEquipmentApplyService.submitEquipmentApply(request); + } + + /** * 状态管理申请详细信息 */ @ApiOperation("状态管理申请详细信息") @@ -95,17 +108,19 @@ 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; + @ApiOperation("状态管理列表导出") + @PostMapping("/exportStateManageList") + @ResponseBody + public void exportStateManageList(@RequestBody MeterStateManageRequest request, HttpServletResponse response) throws Exception{ + try { + stateManageService.exportStateManageList(request,response); + }catch (Exception e){ + e.printStackTrace(); } } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e9142f7..5c31709 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -25,7 +25,8 @@ EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"), METER_PRICE("meterPrice", "meterPrice", "价格库"), METER_STAFF("meterStaff", "meterStaff", "计量人员"), - STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"); + STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), + STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java index 0930ba2..ed8fe65 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java @@ -1,27 +1,26 @@ package com.casic.missiles.enums; -public enum StandardApplyTypeEnum { +public class StandardApplyTypeEnum { - REPLACE_APPLY("1", "更换申请"), - SUSPEND_APPLY("2", "暂停申请"), - REVOKE_APPLY("3", "撤销申请"), - RECOVERY_APPLY("4", "恢复申请"), - REVIEW_APPLY("5", "复查申请"); + /** + * 更换申请 + */ + public static final String REPLACE_APPLY = "1"; + /** + * 暂停申请 + */ + public static final String SUSPEND_APPLY = "2"; + /** + * 撤销申请 + */ + public static final String REVOKE_APPLY = "3"; + /** + * 恢复申请 + */ + public static final String RECOVERY_APPLY = "4"; + /** + * 复查申请 + */ + public static final String REVIEW_APPLY = "5"; - - private String code; - private String value; - - StandardApplyTypeEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java index f91602e..0850792 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java @@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; +import java.util.Objects; /** * 字典utils @@ -54,7 +55,7 @@ if (!field.isAccessible()) { field.setAccessible(true); } - if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) { + if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) { DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0]; // 判断字典code是否需要校验 if(!dictCodeField.needValid()){ diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java index ad60153..373cf8b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java @@ -6,9 +6,13 @@ import com.casic.missiles.model.MeterCheckInfo; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface MeterStateManageMapper { Page stateManageList(Page page, @Param("request") MeterStateManageRequest request); + List stateManageList(@Param("request") MeterStateManageRequest request); + MeterStateManageResponse selectById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml index cacab08..180240b 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml @@ -55,7 +55,7 @@ and mfa.valid_date #{fixedAssetRequest.validDateEnd} - + and mfa.ABC = #{fixedAssetRequest.abc} 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 0032b8b..e00b6b9 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 @@ -81,7 +81,6 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ - meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -123,7 +122,7 @@ @ResponseBody public void exportList(@RequestBody MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception{ try { - meterEquipmentApplyService.exportStaffList(request,response); + meterEquipmentApplyService.exportList(request,response); }catch (Exception e){ e.printStackTrace(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java index 7ea2f1c..052743c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java @@ -4,18 +4,22 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.MeterStaff; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardApply; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.MeterStandardApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -73,6 +77,16 @@ } /** + * 标准装置申请提交 + */ + @ApiOperation("标准装置申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return standardEquipmentApplyService.submitStandardEquipmentApply(request); + } + + /** * 标准装置申请列表删除 */ @ApiOperation("标准装置申请列表删除") 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 f135991..cdd073f 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 @@ -4,11 +4,13 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -65,6 +68,16 @@ } /** + * 状态管理申请提交 + */ + @ApiOperation("状态管理申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return meterEquipmentApplyService.submitEquipmentApply(request); + } + + /** * 状态管理申请详细信息 */ @ApiOperation("状态管理申请详细信息") @@ -95,17 +108,19 @@ 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; + @ApiOperation("状态管理列表导出") + @PostMapping("/exportStateManageList") + @ResponseBody + public void exportStateManageList(@RequestBody MeterStateManageRequest request, HttpServletResponse response) throws Exception{ + try { + stateManageService.exportStateManageList(request,response); + }catch (Exception e){ + e.printStackTrace(); } } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e9142f7..5c31709 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -25,7 +25,8 @@ EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"), METER_PRICE("meterPrice", "meterPrice", "价格库"), METER_STAFF("meterStaff", "meterStaff", "计量人员"), - STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"); + STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), + STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java index 0930ba2..ed8fe65 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java @@ -1,27 +1,26 @@ package com.casic.missiles.enums; -public enum StandardApplyTypeEnum { +public class StandardApplyTypeEnum { - REPLACE_APPLY("1", "更换申请"), - SUSPEND_APPLY("2", "暂停申请"), - REVOKE_APPLY("3", "撤销申请"), - RECOVERY_APPLY("4", "恢复申请"), - REVIEW_APPLY("5", "复查申请"); + /** + * 更换申请 + */ + public static final String REPLACE_APPLY = "1"; + /** + * 暂停申请 + */ + public static final String SUSPEND_APPLY = "2"; + /** + * 撤销申请 + */ + public static final String REVOKE_APPLY = "3"; + /** + * 恢复申请 + */ + public static final String RECOVERY_APPLY = "4"; + /** + * 复查申请 + */ + public static final String REVIEW_APPLY = "5"; - - private String code; - private String value; - - StandardApplyTypeEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java index f91602e..0850792 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java @@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; +import java.util.Objects; /** * 字典utils @@ -54,7 +55,7 @@ if (!field.isAccessible()) { field.setAccessible(true); } - if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) { + if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) { DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0]; // 判断字典code是否需要校验 if(!dictCodeField.needValid()){ diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java index ad60153..373cf8b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java @@ -6,9 +6,13 @@ import com.casic.missiles.model.MeterCheckInfo; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface MeterStateManageMapper { Page stateManageList(Page page, @Param("request") MeterStateManageRequest request); + List stateManageList(@Param("request") MeterStateManageRequest request); + MeterStateManageResponse selectById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml index cacab08..180240b 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml @@ -55,7 +55,7 @@ and mfa.valid_date #{fixedAssetRequest.validDateEnd} - + and mfa.ABC = #{fixedAssetRequest.abc} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml index d4cb676..5b7bde6 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml @@ -56,6 +56,18 @@ and msa.approval_status = #{request.applyStatus} + + and msa.id in + + #{id} + + + + and msa.id in + + #{id} + + ORDER BY mse.create_time DESC 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 0032b8b..e00b6b9 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 @@ -81,7 +81,6 @@ @PostMapping("/addEquipmentApply") @ResponseBody public ReturnDTO addEquipmentApply(@RequestBody @Valid MeterEquipmentApply meterEquipmentApply) throws Exception{ - meterEquipmentApply.setApplyTypeName("sbjysq"); return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -123,7 +122,7 @@ @ResponseBody public void exportList(@RequestBody MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception{ try { - meterEquipmentApplyService.exportStaffList(request,response); + meterEquipmentApplyService.exportList(request,response); }catch (Exception e){ e.printStackTrace(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java index 7ea2f1c..052743c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStandardApplyController.java @@ -4,18 +4,22 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.MeterStaff; import com.casic.missiles.model.MeterStandardEquipment; import com.casic.missiles.model.MeterStandardApply; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.meter.MeterStandardApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -73,6 +77,16 @@ } /** + * 标准装置申请提交 + */ + @ApiOperation("标准装置申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return standardEquipmentApplyService.submitStandardEquipmentApply(request); + } + + /** * 标准装置申请列表删除 */ @ApiOperation("标准装置申请列表删除") 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 f135991..cdd073f 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 @@ -4,11 +4,13 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.meter.MeterStateManageRequest; import com.casic.missiles.dto.meter.MeterStateManageResponse; +import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest; import com.casic.missiles.model.MeterCertificate; import com.casic.missiles.model.MeterCheckInfo; import com.casic.missiles.model.MeterEquipmentApply; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -65,6 +68,16 @@ } /** + * 状态管理申请提交 + */ + @ApiOperation("状态管理申请提交") + @PostMapping("/submitStandardEquipmentApply") + @ResponseBody + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return meterEquipmentApplyService.submitEquipmentApply(request); + } + + /** * 状态管理申请详细信息 */ @ApiOperation("状态管理申请详细信息") @@ -95,17 +108,19 @@ 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; + @ApiOperation("状态管理列表导出") + @PostMapping("/exportStateManageList") + @ResponseBody + public void exportStateManageList(@RequestBody MeterStateManageRequest request, HttpServletResponse response) throws Exception{ + try { + stateManageService.exportStateManageList(request,response); + }catch (Exception e){ + e.printStackTrace(); } } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java index e9142f7..5c31709 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java @@ -25,7 +25,8 @@ EQUIPMENT_APPLY("equipmentApply", "equipmentApply", "设备借用"), METER_PRICE("meterPrice", "meterPrice", "价格库"), METER_STAFF("meterStaff", "meterStaff", "计量人员"), - STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"); + STANDARD_EQUIPMENT_APPLY("standardEquipmentApply", "standardEquipmentApply", "标准装置申请"), + STATE_MANAGE_APPLY("stateManage", "stateManage", "状态管理"); ExportEnum(String fileName, String sheetName, String description) { this.fileName = fileName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java index 0930ba2..ed8fe65 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java @@ -1,27 +1,26 @@ package com.casic.missiles.enums; -public enum StandardApplyTypeEnum { +public class StandardApplyTypeEnum { - REPLACE_APPLY("1", "更换申请"), - SUSPEND_APPLY("2", "暂停申请"), - REVOKE_APPLY("3", "撤销申请"), - RECOVERY_APPLY("4", "恢复申请"), - REVIEW_APPLY("5", "复查申请"); + /** + * 更换申请 + */ + public static final String REPLACE_APPLY = "1"; + /** + * 暂停申请 + */ + public static final String SUSPEND_APPLY = "2"; + /** + * 撤销申请 + */ + public static final String REVOKE_APPLY = "3"; + /** + * 恢复申请 + */ + public static final String RECOVERY_APPLY = "4"; + /** + * 复查申请 + */ + public static final String REVIEW_APPLY = "5"; - - private String code; - private String value; - - StandardApplyTypeEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java index f91602e..0850792 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java @@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; +import java.util.Objects; /** * 字典utils @@ -54,7 +55,7 @@ if (!field.isAccessible()) { field.setAccessible(true); } - if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) { + if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) { DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0]; // 判断字典code是否需要校验 if(!dictCodeField.needValid()){ diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java index ad60153..373cf8b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStateManageMapper.java @@ -6,9 +6,13 @@ import com.casic.missiles.model.MeterCheckInfo; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface MeterStateManageMapper { Page stateManageList(Page page, @Param("request") MeterStateManageRequest request); + List stateManageList(@Param("request") MeterStateManageRequest request); + MeterStateManageResponse selectById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml index cacab08..180240b 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml @@ -55,7 +55,7 @@ and mfa.valid_date #{fixedAssetRequest.validDateEnd} - + and mfa.ABC = #{fixedAssetRequest.abc} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml index d4cb676..5b7bde6 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardApplyMapper.xml @@ -56,6 +56,18 @@ and msa.approval_status = #{request.applyStatus} + + and msa.id in + + #{id} + + + + and msa.id in + + #{id} + + ORDER BY mse.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml index d2968cf..dec7e6f 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStateManageMapper.xml @@ -54,6 +54,12 @@ and msa.create_user = #{request.createUser} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC