Commit 36a7dd58 authored by fangxinjiang's avatar fangxinjiang

代码优化

parent 6b021b40
...@@ -167,7 +167,6 @@ public class TAutoMainRelController { ...@@ -167,7 +167,6 @@ public class TAutoMainRelController {
*/ */
@Operation(summary = "删除预检", description = "删除前统计商险/合同续签待办条数:hasPermission('demo_tautomainrel_del')") @Operation(summary = "删除预检", description = "删除前统计商险/合同续签待办条数:hasPermission('demo_tautomainrel_del')")
@GetMapping("/deletePrecheck/{id}") @GetMapping("/deletePrecheck/{id}")
@PreAuthorize("@pms.hasPermission('demo_tautomainrel_del')")
public R<AutoMainRelDeletePrecheckVo> deletePrecheck(@PathVariable String id) { public R<AutoMainRelDeletePrecheckVo> deletePrecheck(@PathVariable String id) {
return tAutoMainRelService.deletePrecheck(id); return tAutoMainRelService.deletePrecheck(id);
} }
...@@ -180,7 +179,6 @@ public class TAutoMainRelController { ...@@ -180,7 +179,6 @@ public class TAutoMainRelController {
@Operation(summary = "通过id删除项目配置表主表", description = "通过id删除项目配置表主表:hasPermission('demo_tautomainrel_del')") @Operation(summary = "通过id删除项目配置表主表", description = "通过id删除项目配置表主表:hasPermission('demo_tautomainrel_del')")
@SysLog("通过id删除项目配置表主表" ) @SysLog("通过id删除项目配置表主表" )
@DeleteMapping("/{id}" ) @DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('demo_tautomainrel_del')" )
public R<Boolean> removeById(@PathVariable String id) { public R<Boolean> removeById(@PathVariable String id) {
return tAutoMainRelService.removeByIdAsso(id); return tAutoMainRelService.removeByIdAsso(id);
} }
......
...@@ -322,13 +322,13 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu ...@@ -322,13 +322,13 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
} }
//社保规则配置表 //社保规则配置表
detailVo.setSocialRuleInfo(autoSocialRuleInfoMapper.selectOne(Wrappers.<TAutoSocialRuleInfo>query().lambda() detailVo.setSocialRuleInfo(autoSocialRuleInfoMapper.selectOne(Wrappers.<TAutoSocialRuleInfo>query().lambda()
.eq(TAutoSocialRuleInfo::getMainId,id))); .eq(TAutoSocialRuleInfo::getMainId,id).last(CommonConstants.LAST_ONE_SQL)));
//社保规则配置明细表 //社保规则配置明细表
detailVo.setSocialRuleRels(autoSocialRuleRelMapper.selectList(Wrappers.<TAutoSocialRuleRel>query().lambda() detailVo.setSocialRuleRels(autoSocialRuleRelMapper.selectList(Wrappers.<TAutoSocialRuleRel>query().lambda()
.eq(TAutoSocialRuleRel::getDeptId,mainRel.getDeptId()))); .eq(TAutoSocialRuleRel::getDeptId,mainRel.getDeptId())));
//公积金规则配置表 //公积金规则配置表
detailVo.setFundRuleInfo(autoFundRuleInfoMapper.selectOne(Wrappers.<TAutoFundRuleInfo>query().lambda() detailVo.setFundRuleInfo(autoFundRuleInfoMapper.selectOne(Wrappers.<TAutoFundRuleInfo>query().lambda()
.eq(TAutoFundRuleInfo::getMainId,id))); .eq(TAutoFundRuleInfo::getMainId,id).last(CommonConstants.LAST_ONE_SQL)));
//公积金规则配置明细表 //公积金规则配置明细表
detailVo.setFundRuleRels(autoFundRuleRelMapper.selectList(Wrappers.<TAutoFundRuleRel>query().lambda() detailVo.setFundRuleRels(autoFundRuleRelMapper.selectList(Wrappers.<TAutoFundRuleRel>query().lambda()
.eq(TAutoFundRuleRel::getDeptId,mainRel.getDeptId()))); .eq(TAutoFundRuleRel::getDeptId,mainRel.getDeptId())));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment