diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java index e6cb910..e308fa4 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -48,6 +48,7 @@ import com.dayu.daf.core.boot.ctrl.DafController; import springfox.documentation.annotations.ApiIgnore; import java.net.URLEncoder; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -143,6 +144,19 @@ public class InspectionRouteController extends DafController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入inspectionRoute") public R submit(@Valid @RequestBody InspectionRoute inspectionRoute) { + inspectionRoute.setIstatus(1); + String date = LocalDate.now().toString().replace("-",""); + String maxNo = inspectionRouteService.getMaxNo("'%" + date + "%'"); + int number; + if (StringUtil.isNotEmpty(maxNo)){ + number = Integer.parseInt(maxNo.substring(9)); + number++; + }else{ + number = 1; + } + String numFormat = String.format("%04d", number); + String no = "R" + date + numFormat; + inspectionRoute.setRouteNo(no); return R.status(inspectionRouteService.saveOrUpdate(inspectionRoute)); } diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java index b1824ba..332a45b 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java @@ -34,4 +34,9 @@ public interface InspectionRouteMapper extends BaseMapper { * 获取路线编号 */ List getRouteList(); + + /** + * 获取最大编号 + */ + String getMaxNo(String date); } diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml index acd15ae..9237d3a 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml @@ -46,4 +46,9 @@ select route_no, route_name, type from i_inspection_route where is_deleted = 0 + + diff --git a/src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java b/src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java index b89db29..e091212 100644 --- a/src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java +++ b/src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java @@ -38,4 +38,11 @@ public interface IInspectionRouteService extends BaseService { * 获取路线编号 */ List getRouteList(); + + /** + * 获取最大任务编号 + * + * @param date + */ + String getMaxNo(String date); } diff --git a/src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java b/src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java index bfa0292..43e9ed8 100644 --- a/src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java +++ b/src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java @@ -38,4 +38,10 @@ public class InspectionRouteServiceImpl extends BaseServiceImpl