root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复无法正常删除的问题

Browse Source
This commit is contained in:
han0
2024-09-18 18:17:21 +08:00
parent 0a0a31bed2
commit 687ba4df15
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@@ -10,7 +10,7 @@ services:
- /opt/files/material-manage-service:/files - /opt/files/material-manage-service:/files
- /etc/localtime:/etc/localtime - /etc/localtime:/etc/localtime
ports: ports:
- "9882:9882" - "19882:9882"
environment: environment:
- TZ="Asia/Shanghai" - TZ="Asia/Shanghai"
entrypoint: java -server -Xms256m -Xmx256m -jar app.jar --spring.profiles.active=test entrypoint: java -server -Xms256m -Xmx256m -jar app.jar --spring.profiles.active=test

2
src/main/java/mjkf/xinke/core/config/GlobalConfigure.java
View File

@@ -74,7 +74,7 @@ import java.util.*;
* @date 2021/10/9 14:24 * @date 2021/10/9 14:24
**/ **/
@Configuration @Configuration
@MapperScan(basePackages = {"mjkf.xinke.**.mapper, mjkf.xinke.**.dao, com.bstek.**.mapper"}) @MapperScan(basePackages = {"mjkf.xinke.**.mapper, mjkf.xinke.**.dao, com.bstek.**.mapper, mjkf.xinke.main.modular.**.mapper"})
public class GlobalConfigure implements WebMvcConfigurer { public class GlobalConfigure implements WebMvcConfigurer {
private static final String COMMON_REPEAT_SUBMIT_CACHE_KEY = "common-repeatSubmit:"; private static final String COMMON_REPEAT_SUBMIT_CACHE_KEY = "common-repeatSubmit:";

8
src/main/java/mjkf/xinke/main/controller/BudgetController.java
View File

@@ -156,8 +156,8 @@ public class BudgetController {
// todo-1 公众网站历史数据 // todo-1 公众网站历史数据
// todo-1 地图里程数据 // todo-1 地图里程数据
// todo-1 价格权重调整 // todo-2 价格权重调整
// todo-1 外省数据上传 // todo-2 外省数据上传
// todo-1 外省数据价格对比 // todo-2 外省数据价格对比
// todo-1 趋势表加入调查表数据 // todo-2 趋势表加入调查表数据
} }

2
src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java
View File

@@ -44,7 +44,7 @@ public class LocalMaterialController {
@ApiOperation("获取地材列表") @ApiOperation("获取地材列表")
@GetMapping("/") @GetMapping("/")
public HttpResponse list ( public HttpResponse<List<LocalMaterialSummary>> list (
@ApiParam(value = "年") @RequestParam(value="year") Integer year, @ApiParam(value = "年") @RequestParam(value="year") Integer year,
@ApiParam(value = "月") @RequestParam(value="month") Integer month, @ApiParam(value = "月") @RequestParam(value="month") Integer month,
@ApiParam(value = "地市") @RequestParam(value="city", required=false) String city, @ApiParam(value = "地市") @RequestParam(value="city", required=false) String city,

4
src/main/java/mjkf/xinke/main/modular/location/service/LocationService.java
View File

@@ -85,7 +85,9 @@ public class LocationService extends ServiceImpl<BaseMapper<Location>, Location>
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void delete(List<LocationIdParam> locationIdParamList) { public void delete(List<LocationIdParam> locationIdParamList) {
// 执行删除 // 执行删除
this.removeByIds(CollStreamUtil.toList(locationIdParamList, LocationIdParam::getId)); for (var i : CollStreamUtil.toList(locationIdParamList, LocationIdParam::getId)) {
this.removeById(i);
}
} }
public Location detail(LocationIdParam locationIdParam) { public Location detail(LocationIdParam locationIdParam) {