联调问题
This commit is contained in:
parent
c52a0c480c
commit
0d94f533b5
|
|
@ -66,7 +66,7 @@ public class MonthlyPlanController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('monthly:plan:add')")
|
@PreAuthorize("@ss.hasPermi('monthly:plan:add')")
|
||||||
@PostMapping("/addMonthlyPlan")
|
@PostMapping("/addMonthlyPlan")
|
||||||
public AjaxResult addMonthlyPlan(@RequestBody MonthlyPlanVo monthlyPlanVo) {
|
public AjaxResult addMonthlyPlan(@RequestBody List<MonthlyPlanVo> monthlyPlanVo) {
|
||||||
try {
|
try {
|
||||||
int res = monthlyPlanService.addMonthlyPlanList(monthlyPlanVo);
|
int res = monthlyPlanService.addMonthlyPlanList(monthlyPlanVo);
|
||||||
if (res > 0) {
|
if (res > 0) {
|
||||||
|
|
@ -122,8 +122,8 @@ public class MonthlyPlanController extends BaseController {
|
||||||
List<ExportMonthPlanPersonVo> list = monthlyPlanService.exportMonthlyPlanPerson(monthlyPlanVo);
|
List<ExportMonthPlanPersonVo> list = monthlyPlanService.exportMonthlyPlanPerson(monthlyPlanVo);
|
||||||
|
|
||||||
// 动态解析年月,添加兜底逻辑
|
// 动态解析年月,添加兜底逻辑
|
||||||
int year = 0;
|
int year = LocalDate.now().getYear();
|
||||||
int month = 0;
|
int month = LocalDate.now().getMonthValue();
|
||||||
String monthlyPlan = monthlyPlanVo.getMonthlyPlan();
|
String monthlyPlan = monthlyPlanVo.getMonthlyPlan();
|
||||||
|
|
||||||
if (monthlyPlan != null && monthlyPlan.matches("\\d{4}-\\d{1,2}")) { // 校验格式:yyyy-MM
|
if (monthlyPlan != null && monthlyPlan.matches("\\d{4}-\\d{1,2}")) { // 校验格式:yyyy-MM
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue