fix: 更改住建厅采集结果趋势排序
This commit is contained in:
@@ -295,10 +295,5 @@ public class MaterialTaskType {
|
|||||||
);
|
);
|
||||||
return types.contains(type);
|
return types.contains(type);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* todo-1 数据展示模块 地市暂不切换
|
|
||||||
* todo-1 计算模块更新
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -154,5 +154,5 @@ public class BudgetController {
|
|||||||
return FuHttpResponse.Builder().dataResponse(budgetItemList).build();
|
return FuHttpResponse.Builder().dataResponse(budgetItemList).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
// todo 在价格发布创建时补全材料id
|
// todo-2 在价格发布创建时补全材料id
|
||||||
}
|
}
|
||||||
|
@@ -30,7 +30,7 @@ import java.util.List;
|
|||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/price-publish")
|
@RequestMapping("/price-publish")
|
||||||
public class PricePublishController {
|
public class PricePublishController {
|
||||||
// todo-1 系统日志
|
|
||||||
@Resource
|
@Resource
|
||||||
PricePublishService pricePublishService;
|
PricePublishService pricePublishService;
|
||||||
|
|
||||||
|
@@ -3,7 +3,6 @@ package mjkf.xinke.main.service;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import mjkf.xinke.main.model.db.DataFujian;
|
import mjkf.xinke.main.model.db.DataFujian;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import mjkf.xinke.main.model.db.PriceResult;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
@@ -72,6 +71,7 @@ public class DataFujianService extends DataService<BaseMapper<DataFujian>, DataF
|
|||||||
.eq(DataFujian::getYear, endDate.getYear())
|
.eq(DataFujian::getYear, endDate.getYear())
|
||||||
.between(DataFujian::getMonth, 1, endDate.getMonth())
|
.between(DataFujian::getMonth, 1, endDate.getMonth())
|
||||||
);
|
);
|
||||||
|
query.orderByAsc(DataFujian::getYear, DataFujian::getMonth);
|
||||||
return query;
|
return query;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user