Commit e3fbcae32dd6ba8b8e08d3d18c9aa2e4242e1716
1 parent
9c67b344
线路in_use字段根据撤销字段自动修改
Showing
3 changed files
with
13 additions
and
4 deletions
src/main/java/com/bsth/controller/LineController.java
| @@ -81,6 +81,10 @@ public class LineController extends BaseController<Line, Integer> { | @@ -81,6 +81,10 @@ public class LineController extends BaseController<Line, Integer> { | ||
| 81 | map.put("status", ResponseCode.ERROR); | 81 | map.put("status", ResponseCode.ERROR); |
| 82 | return map; | 82 | return map; |
| 83 | } | 83 | } |
| 84 | + if(t.getDestroy() == 0){ | ||
| 85 | + t.setInUse(1); | ||
| 86 | + } else | ||
| 87 | + t.setInUse(0); | ||
| 84 | // 添加线路版本 | 88 | // 添加线路版本 |
| 85 | SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 89 | SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 86 | try { | 90 | try { |
src/main/java/com/bsth/repository/LineRepository.java
| @@ -60,14 +60,14 @@ public interface LineRepository extends BaseRepository<Line, Integer> { | @@ -60,14 +60,14 @@ public interface LineRepository extends BaseRepository<Line, Integer> { | ||
| 60 | + "l.startStationEndTime=?9, l.endStationFirstTime=?10, l.endStationEndTime=?11, l.linePlayType=?12, " | 60 | + "l.startStationEndTime=?9, l.endStationFirstTime=?10, l.endStationEndTime=?11, l.linePlayType=?12, " |
| 61 | + "l.openDate=?13, l.es=?14, l.shortName=?15, l.shanghaiLinecode=?16, l.eqLinecode=?17, l.startPhone=?18, " | 61 | + "l.openDate=?13, l.es=?14, l.shortName=?15, l.shanghaiLinecode=?16, l.eqLinecode=?17, l.startPhone=?18, " |
| 62 | + "l.endPhone=?19, l.carSumNumber=?20, l.hvacCarNumber=?21, l.ordCarNumber=?22, l.history=?23, " | 62 | + "l.endPhone=?19, l.carSumNumber=?20, l.hvacCarNumber=?21, l.ordCarNumber=?22, l.history=?23, " |
| 63 | - + "l.descriptions=?24, l.destroy=?25, l.supperLine=?26, l.spacGrade=?27, l.warrantCar=?28, l.region=?30 where " | 63 | + + "l.descriptions=?24, l.destroy=?25, l.supperLine=?26, l.spacGrade=?27, l.warrantCar=?28, l.region=?30 , l.inUse=?31 where " |
| 64 | + "l.lineCode=?29") | 64 | + "l.lineCode=?29") |
| 65 | - public int update(String name, String company, String brancheCompany, String level, String nature, | 65 | + int update(String name, String company, String brancheCompany, String level, String nature, |
| 66 | String startStationName, String endStationName, String startStationFirstTime, String startStationEndTime, | 66 | String startStationName, String endStationName, String startStationFirstTime, String startStationEndTime, |
| 67 | String endStationFirstTime, String endStationEndTime, Integer linePlayType, Date openDate, String es, | 67 | String endStationFirstTime, String endStationEndTime, Integer linePlayType, Date openDate, String es, |
| 68 | String shortName, String shanghaiLinecode, String eqLinecode, String startPhone, String endPhone, | 68 | String shortName, String shanghaiLinecode, String eqLinecode, String startPhone, String endPhone, |
| 69 | Integer carSumNumber, Integer hvacCarNumber, Integer ordCarNumber, String history, String descriptions, | 69 | Integer carSumNumber, Integer hvacCarNumber, Integer ordCarNumber, String history, String descriptions, |
| 70 | - Integer destroy, Integer supperLine, Integer spacGrade, Integer warrantCar, String lineCode, Integer region); | 70 | + Integer destroy, Integer supperLine, Integer spacGrade, Integer warrantCar, String lineCode, Integer region, Integer inUser); |
| 71 | 71 | ||
| 72 | /** | 72 | /** |
| 73 | * 查询线路版本文件 | 73 | * 查询线路版本文件 |
src/main/java/com/bsth/service/impl/LineServiceImpl.java
| @@ -77,13 +77,18 @@ public class LineServiceImpl extends BaseServiceImpl<Line, Integer> implements L | @@ -77,13 +77,18 @@ public class LineServiceImpl extends BaseServiceImpl<Line, Integer> implements L | ||
| 77 | public Map<String, Object> update(Line l) { | 77 | public Map<String, Object> update(Line l) { |
| 78 | Map<String, Object> map = new HashMap<>(); | 78 | Map<String, Object> map = new HashMap<>(); |
| 79 | 79 | ||
| 80 | + if(l.getDestroy() == 0){ | ||
| 81 | + l.setInUse(1); | ||
| 82 | + } else | ||
| 83 | + l.setInUse(0); | ||
| 84 | + | ||
| 80 | int status = repository.update(l.getName(), l.getCompany(), l.getBrancheCompany(), l.getLevel(), l.getNature(), | 85 | int status = repository.update(l.getName(), l.getCompany(), l.getBrancheCompany(), l.getLevel(), l.getNature(), |
| 81 | l.getStartStationName(), l.getEndStationName(), l.getStartStationFirstTime(), | 86 | l.getStartStationName(), l.getEndStationName(), l.getStartStationFirstTime(), |
| 82 | l.getStartStationEndTime(), l.getEndStationFirstTime(), l.getEndStationEndTime(), l.getLinePlayType(), | 87 | l.getStartStationEndTime(), l.getEndStationFirstTime(), l.getEndStationEndTime(), l.getLinePlayType(), |
| 83 | l.getOpenDate(), l.getEs(), l.getShortName(), l.getShanghaiLinecode(), l.getEqLinecode(), | 88 | l.getOpenDate(), l.getEs(), l.getShortName(), l.getShanghaiLinecode(), l.getEqLinecode(), |
| 84 | l.getStartPhone(), l.getEndPhone(), l.getCarSumNumber(), l.getHvacCarNumber(), l.getOrdCarNumber(), | 89 | l.getStartPhone(), l.getEndPhone(), l.getCarSumNumber(), l.getHvacCarNumber(), l.getOrdCarNumber(), |
| 85 | l.getHistory(), l.getDescriptions(), l.getDestroy(), l.getSupperLine(), l.getSpacGrade(), | 90 | l.getHistory(), l.getDescriptions(), l.getDestroy(), l.getSupperLine(), l.getSpacGrade(), |
| 86 | - l.getWarrantCar(), l.getLineCode(), l.getRegion()); | 91 | + l.getWarrantCar(), l.getLineCode(), l.getRegion(),l.getInUse()); |
| 87 | if (status==1) { | 92 | if (status==1) { |
| 88 | map.put("status", ResponseCode.SUCCESS); | 93 | map.put("status", ResponseCode.SUCCESS); |
| 89 | } else { | 94 | } else { |