jcyen
/
jsl-questionnaire-base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

周期BUG

mssql
07 3 years ago
parent
ca7b4d7324
commit
32b8a65d1b
3 changed files with 12 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java
  2. 13
      src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java
  3. 13
      src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java

1
src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java
View File

@ -44,7 +44,6 @@ public class TbsScheduleController {
public R<List<TbsSchedule>> getList(TbsScheduleVo param){ public R<List<TbsSchedule>> getList(TbsScheduleVo param){
TbsSchedule entity = CopierUtil.copy(param,new TbsSchedule()); TbsSchedule entity = CopierUtil.copy(param,new TbsSchedule());
LambdaQueryWrapper<TbsSchedule> lqw = new LambdaQueryWrapper<>(entity); LambdaQueryWrapper<TbsSchedule> lqw = new LambdaQueryWrapper<>(entity);
PageUtil.startPage();
List<TbsSchedule> list = tbsScheduleService.list(lqw); List<TbsSchedule> list = tbsScheduleService.list(lqw);
return R.ok(list); return R.ok(list);
} }

13
src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java
View File

@ -40,11 +40,10 @@ public class TbsScheduleItemBudgetController {
* @return * @return
*/ */
@GetMapping("/list") @GetMapping("/list")
@PreAuthorize("hasRole('tbs:scheduleItemBudget:query')") @PreAuthorize("hasRole('tbs:schedule:query')")
public R<List<TbsScheduleItemBudget>> getList(TbsScheduleItemBudgetVo param){ public R<List<TbsScheduleItemBudget>> getList(TbsScheduleItemBudgetVo param){
TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget()); TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget());
LambdaQueryWrapper<TbsScheduleItemBudget> lqw = new LambdaQueryWrapper<>(entity); LambdaQueryWrapper<TbsScheduleItemBudget> lqw = new LambdaQueryWrapper<>(entity);
PageUtil.startPage();
List<TbsScheduleItemBudget> list = tbsScheduleItemBudgetService.list(lqw); List<TbsScheduleItemBudget> list = tbsScheduleItemBudgetService.list(lqw);
return R.ok(list); return R.ok(list);
} }
@ -55,7 +54,7 @@ public class TbsScheduleItemBudgetController {
* @return * @return
*/ */
@GetMapping("/page") @GetMapping("/page")
@PreAuthorize("hasRole('tbs:scheduleItemBudget:query')") @PreAuthorize("hasRole('tbs:schedule:query')")
public R<PageVo<TbsScheduleItemBudget>> getPage(TbsScheduleItemBudgetVo param){ public R<PageVo<TbsScheduleItemBudget>> getPage(TbsScheduleItemBudgetVo param){
TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget()); TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget());
LambdaQueryWrapper<TbsScheduleItemBudget> lqw = new LambdaQueryWrapper<>(entity); LambdaQueryWrapper<TbsScheduleItemBudget> lqw = new LambdaQueryWrapper<>(entity);
@ -71,7 +70,7 @@ public class TbsScheduleItemBudgetController {
*/ */
@GetMapping("/getById/{id}") @GetMapping("/getById/{id}")
@SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.QUERY) @SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.QUERY)
@PreAuthorize("hasRole('tbs:scheduleItemBudget:query')") @PreAuthorize("hasRole('tbs:schedule:query')")
public R<TbsScheduleItemBudget> getById(@PathVariable("id") String id){ public R<TbsScheduleItemBudget> getById(@PathVariable("id") String id){
TbsScheduleItemBudget tbsScheduleItemBudget = tbsScheduleItemBudgetService.getById(id); TbsScheduleItemBudget tbsScheduleItemBudget = tbsScheduleItemBudgetService.getById(id);
return R.ok(tbsScheduleItemBudget); return R.ok(tbsScheduleItemBudget);
@ -86,7 +85,7 @@ public class TbsScheduleItemBudgetController {
*/ */
@PostMapping("/updateById") @PostMapping("/updateById")
@SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.UPDATE) @SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.UPDATE)
@PreAuthorize("hasRole('tbs:scheduleItemBudget:update')") @PreAuthorize("hasRole('tbs:schedule:update')")
public R<?> updateById(@RequestBody @Valid TbsScheduleItemBudgetBo param){ public R<?> updateById(@RequestBody @Valid TbsScheduleItemBudgetBo param){
TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget()); TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget());
boolean result = tbsScheduleItemBudgetService.updateById(entity); boolean result = tbsScheduleItemBudgetService.updateById(entity);
@ -100,7 +99,7 @@ public class TbsScheduleItemBudgetController {
*/ */
@PostMapping("/save") @PostMapping("/save")
@SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.INSERT) @SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.INSERT)
@PreAuthorize("hasRole('tbs:scheduleItemBudget:insert')") @PreAuthorize("hasRole('tbs:schedule:insert')")
public R<?> save(@RequestBody @Valid TbsScheduleItemBudget param){ public R<?> save(@RequestBody @Valid TbsScheduleItemBudget param){
TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget()); TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget());
boolean result = tbsScheduleItemBudgetService.save(entity); boolean result = tbsScheduleItemBudgetService.save(entity);
@ -114,7 +113,7 @@ public class TbsScheduleItemBudgetController {
*/ */
@DeleteMapping("/deleteById/{id}") @DeleteMapping("/deleteById/{id}")
@SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.DELETE) @SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.DELETE)
@PreAuthorize("hasRole('tbs:scheduleItemBudget:delete')") @PreAuthorize("hasRole('tbs:schedule:delete')")
public R<?> deleteById(@PathVariable("id") Long id){ public R<?> deleteById(@PathVariable("id") Long id){
boolean result = tbsScheduleItemBudgetService.removeById(id); boolean result = tbsScheduleItemBudgetService.removeById(id);
return R.isTrue(result); return R.isTrue(result);

13
src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java
View File

@ -40,11 +40,10 @@ public class TbsScheduleItemController {
* @return * @return
*/ */
@GetMapping("/list") @GetMapping("/list")
@PreAuthorize("hasRole('tbs:scheduleItem:query')") @PreAuthorize("hasRole('tbs:schedule:query')")
public R<List<TbsScheduleItem>> getList(TbsScheduleItemVo param){ public R<List<TbsScheduleItem>> getList(TbsScheduleItemVo param){
TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem()); TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem());
LambdaQueryWrapper<TbsScheduleItem> lqw = new LambdaQueryWrapper<>(entity); LambdaQueryWrapper<TbsScheduleItem> lqw = new LambdaQueryWrapper<>(entity);
PageUtil.startPage();
List<TbsScheduleItem> list = tbsScheduleItemService.list(lqw); List<TbsScheduleItem> list = tbsScheduleItemService.list(lqw);
return R.ok(list); return R.ok(list);
} }
@ -55,7 +54,7 @@ public class TbsScheduleItemController {
* @return * @return
*/ */
@GetMapping("/page") @GetMapping("/page")
@PreAuthorize("hasRole('tbs:scheduleItem:query')") @PreAuthorize("hasRole('tbs:schedule:query')")
public R<PageVo<TbsScheduleItem>> getPage(TbsScheduleItemVo param){ public R<PageVo<TbsScheduleItem>> getPage(TbsScheduleItemVo param){
TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem()); TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem());
LambdaQueryWrapper<TbsScheduleItem> lqw = new LambdaQueryWrapper<>(entity); LambdaQueryWrapper<TbsScheduleItem> lqw = new LambdaQueryWrapper<>(entity);
@ -71,7 +70,7 @@ public class TbsScheduleItemController {
*/ */
@GetMapping("/getById/{id}") @GetMapping("/getById/{id}")
@SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.QUERY) @SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.QUERY)
@PreAuthorize("hasRole('tbs:scheduleItem:query')") @PreAuthorize("hasRole('tbs:schedule:query')")
public R<TbsScheduleItem> getById(@PathVariable("id") String id){ public R<TbsScheduleItem> getById(@PathVariable("id") String id){
TbsScheduleItem tbsScheduleItem = tbsScheduleItemService.getById(id); TbsScheduleItem tbsScheduleItem = tbsScheduleItemService.getById(id);
return R.ok(tbsScheduleItem); return R.ok(tbsScheduleItem);
@ -86,7 +85,7 @@ public class TbsScheduleItemController {
*/ */
@PostMapping("/updateById") @PostMapping("/updateById")
@SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.UPDATE) @SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.UPDATE)
@PreAuthorize("hasRole('tbs:scheduleItem:update')") @PreAuthorize("hasRole('tbs:schedule:update')")
public R<?> updateById(@RequestBody @Valid TbsScheduleItemBo param){ public R<?> updateById(@RequestBody @Valid TbsScheduleItemBo param){
TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem()); TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem());
boolean result = tbsScheduleItemService.updateById(entity); boolean result = tbsScheduleItemService.updateById(entity);
@ -100,7 +99,7 @@ public class TbsScheduleItemController {
*/ */
@PostMapping("/save") @PostMapping("/save")
@SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.INSERT) @SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.INSERT)
@PreAuthorize("hasRole('tbs:scheduleItem:insert')") @PreAuthorize("hasRole('tbs:schedule:insert')")
public R<?> save(@RequestBody @Valid TbsScheduleItem param){ public R<?> save(@RequestBody @Valid TbsScheduleItem param){
TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem()); TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem());
boolean result = tbsScheduleItemService.save(entity); boolean result = tbsScheduleItemService.save(entity);
@ -114,7 +113,7 @@ public class TbsScheduleItemController {
*/ */
@DeleteMapping("/deleteById/{id}") @DeleteMapping("/deleteById/{id}")
@SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.DELETE) @SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.DELETE)
@PreAuthorize("hasRole('tbs:scheduleItem:delete')") @PreAuthorize("hasRole('tbs:schedule:delete')")
public R<?> deleteById(@PathVariable("id") Long id){ public R<?> deleteById(@PathVariable("id") Long id){
boolean result = tbsScheduleItemService.removeById(id); boolean result = tbsScheduleItemService.removeById(id);
return R.isTrue(result); return R.isTrue(result);

Write Preview
Loading…
Cancel
Save