Browse Source

同步用户调整

contract
Yen 2 years ago
parent
commit
b58a8dffe9
  1. 2
      src/main/java/com/qs/serve/controller/AdminPortalController.java
  2. 2
      src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
  3. 2
      src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
  4. 2
      src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java
  5. 2
      src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
  6. 13
      src/main/java/com/qs/serve/task/controller/TaskUserController.java

2
src/main/java/com/qs/serve/controller/AdminPortalController.java

@ -64,9 +64,7 @@ public class AdminPortalController {
private RedisService redisService; private RedisService redisService;
private SysUserService sysUserService; private SysUserService sysUserService;
private ProjectProperties projectProperties; private ProjectProperties projectProperties;
private SeeYonRequestService seeYonRequestService; private SeeYonRequestService seeYonRequestService;
private TbsCostApplyService costApplyService; private TbsCostApplyService costApplyService;
private VtbVerificationService verificationService; private VtbVerificationService verificationService;
private TzcPolicyService policyService; private TzcPolicyService policyService;

2
src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@ -3,6 +3,7 @@ package com.qs.serve.modules.tbs.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.qs.serve.common.model.annotation.LimitSubmit;
import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.annotation.SysLog;
import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.enums.BudgetLogOptFlag;
import com.qs.serve.common.model.consts.BudgetLogRollbackFlag; import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
@ -197,6 +198,7 @@ public class TbsCostApplyController {
* @param id * @param id
* @return * @return
*/ */
@LimitSubmit
@PostMapping("/commit/{id}") @PostMapping("/commit/{id}")
@SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE) @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE)
@PreAuthorize("hasRole('tbs:costApply:update')") @PreAuthorize("hasRole('tbs:costApply:update')")

2
src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@ -207,7 +207,7 @@ public class TbsBudgetApplicationService {
budgetLqw.in(TbsBudget::getId,budgetIds); budgetLqw.in(TbsBudget::getId,budgetIds);
budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.in(TbsBudget::getSubjectId,subjectIds))); budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.in(TbsBudget::getSubjectId,subjectIds)));
//排除随货编码 //排除随货编码
budgetLqw.ne(TbsBudget::getSubjectCode,"FYMC05"); //budgetLqw.ne(TbsBudget::getSubjectCode,"FYMC05");
budgetLqw.in(TbsBudget::getCenterId,centerIds); budgetLqw.in(TbsBudget::getCenterId,centerIds);
budgetLqw.eq(TbsBudget::getBudgetState,1); budgetLqw.eq(TbsBudget::getBudgetState,1);
//科目限制>品类之间>时间区间 //科目限制>品类之间>时间区间

2
src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java

@ -1,6 +1,7 @@
package com.qs.serve.modules.tzc.controller; package com.qs.serve.modules.tzc.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.common.model.annotation.LimitSubmit;
import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.annotation.SysLog;
import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.enums.BudgetLogOptFlag;
import com.qs.serve.common.model.consts.BudgetLogRollbackFlag; import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
@ -100,6 +101,7 @@ public class TzcPolicyController {
* @param policyId * @param policyId
* @return * @return
*/ */
@LimitSubmit
@PostMapping("/commitPolicy/{policyId}") @PostMapping("/commitPolicy/{policyId}")
public R<?> commitPolicy(@PathVariable("policyId")Long policyId){ public R<?> commitPolicy(@PathVariable("policyId")Long policyId){
policyApplicationService.commitPolicy(policyId); policyApplicationService.commitPolicy(policyId);

2
src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@ -1,6 +1,7 @@
package com.qs.serve.modules.vtb.controller; package com.qs.serve.modules.vtb.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.common.model.annotation.LimitSubmit;
import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.annotation.SysLog;
import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.PageVo;
import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.dto.R;
@ -215,6 +216,7 @@ public class VtbVerificationController {
* @param param * @param param
* @return * @return
*/ */
@LimitSubmit
@PostMapping("/commit") @PostMapping("/commit")
@SysLog(module = SystemModule.Verification, title = "核销", biz = BizType.UPDATE) @SysLog(module = SystemModule.Verification, title = "核销", biz = BizType.UPDATE)
@PreAuthorize("hasRole('vtb:verification:commit')") @PreAuthorize("hasRole('vtb:verification:commit')")

13
src/main/java/com/qs/serve/task/controller/TaskUserController.java

@ -30,7 +30,7 @@ import java.util.stream.Collectors;
@AllArgsConstructor @AllArgsConstructor
@RestController @RestController
@RequestMapping("/task/user") @RequestMapping("/task/user")
@ConditionalOnProperty(value = "project.task", havingValue = "true") //@ConditionalOnProperty(value = "project.task", havingValue = "true")
public class TaskUserController { public class TaskUserController {
SeeYonRequestBaseService seeYonRequestBaseService; SeeYonRequestBaseService seeYonRequestBaseService;
@ -51,21 +51,26 @@ public class TaskUserController {
} }
List<String> codes = userList.stream().map(SyUser::getCode).collect(Collectors.toList()); List<String> codes = userList.stream().map(SyUser::getCode).collect(Collectors.toList());
LambdaQueryWrapper<SysUser> userLqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUser> userLqw = new LambdaQueryWrapper<>();
userLqw.in(SysUser::getCode,codes); userLqw.in(SysUser::getAccount,codes).or()
.in(SysUser::getCode,codes);
List<SysUser> existUserList = sysUserService.list(userLqw); List<SysUser> existUserList = sysUserService.list(userLqw);
for (SyUser oaUser : userList) { for (SyUser oaUser : userList) {
boolean exist = existUserList.stream().anyMatch(a->a.getCode().equals(oaUser.getCode())); boolean exist = existUserList.stream().anyMatch(
a->a.getAccount().equals(oaUser.getCode())
||a.getCode().equals(oaUser.getCode())
);
if(!exist){ if(!exist){
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();
sysUser.setCode(oaUser.getCode()); sysUser.setCode(oaUser.getCode());
sysUser.setMobile(oaUser.getMobile()); sysUser.setMobile(oaUser.getMobile());
sysUser.setAccount(oaUser.getCode()); sysUser.setAccount(oaUser.getCode());
sysUser.setId(oaUser.getName()); sysUser.setId(oaUser.getId());
sysUser.setSyUserId(oaUser.getId()); sysUser.setSyUserId(oaUser.getId());
sysUser.setSyAccount(oaUser.getCode()); sysUser.setSyAccount(oaUser.getCode());
sysUser.setServingState(1); sysUser.setServingState(1);
sysUser.setServingDate(LocalDate.now()); sysUser.setServingDate(LocalDate.now());
sysUser.setSuperFlag(1); sysUser.setSuperFlag(1);
sysUser.setTenantId("001");
sysUserService.save(sysUser); sysUserService.save(sysUser);
} }
} }

Loading…
Cancel
Save