diff --git a/src/main/java/org/energy/modules/smart/controller/OperationItemController.java b/src/main/java/org/energy/modules/smart/controller/OperationItemController.java index 64ae0b3..3603a3c 100644 --- a/src/main/java/org/energy/modules/smart/controller/OperationItemController.java +++ b/src/main/java/org/energy/modules/smart/controller/OperationItemController.java @@ -114,6 +114,18 @@ public class OperationItemController extends DafController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入operationItem") public R submit(@Valid @RequestBody OperationItem operationItem) { + String perationItemNo = operationItem.getOperationTicketNo()+"XM"; + String maxOperationItemNo = + operationItemService.getMaxOperationItemNo("'"+operationItem.getOperationTicketNo()+"'"); + int number; + if (StringUtil.isNotEmpty(maxOperationItemNo)){ + number = Integer.parseInt(maxOperationItemNo.substring(maxOperationItemNo.length()-4)); + number++; + }else{ + number = 1; + } + String numFormat = String.format("%04d", number); + operationItem.setOperationItemNo(perationItemNo+numFormat); return R.status(operationItemService.saveOrUpdate(operationItem)); } diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.java b/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.java index f0b815d..e7a45f8 100644 --- a/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.java +++ b/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.java @@ -23,4 +23,5 @@ public interface OperationItemMapper extends BaseMapper { */ List selectOperationItemPage(IPage page, OperationItemVO operationItem); + String getMaxOperationItemNo(String operationTicketNo); } diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.xml b/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.xml index a4ff04e..d5d4de1 100644 --- a/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.xml +++ b/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.xml @@ -20,8 +20,14 @@ + + + diff --git a/src/main/java/org/energy/modules/smart/service/IOperationItemService.java b/src/main/java/org/energy/modules/smart/service/IOperationItemService.java index f15f9e2..a3211c4 100644 --- a/src/main/java/org/energy/modules/smart/service/IOperationItemService.java +++ b/src/main/java/org/energy/modules/smart/service/IOperationItemService.java @@ -22,4 +22,5 @@ public interface IOperationItemService extends BaseService { */ IPage selectOperationItemPage(IPage page, OperationItemVO operationItem); + String getMaxOperationItemNo(String operationTicketNo); } diff --git a/src/main/java/org/energy/modules/smart/service/impl/OperationItemServiceImpl.java b/src/main/java/org/energy/modules/smart/service/impl/OperationItemServiceImpl.java index dab5b74..eb2ec92 100644 --- a/src/main/java/org/energy/modules/smart/service/impl/OperationItemServiceImpl.java +++ b/src/main/java/org/energy/modules/smart/service/impl/OperationItemServiceImpl.java @@ -21,5 +21,10 @@ public class OperationItemServiceImpl extends BaseServiceImpl selectOperationItemPage(IPage page, OperationItemVO operationItem) { return page.setRecords(baseMapper.selectOperationItemPage(page, operationItem)); } + @Override + public String getMaxOperationItemNo(String operationTicketNo){ + String operationItemNo = baseMapper.getMaxOperationItemNo(operationTicketNo); + return operationItemNo; + } }