Merge remote-tracking branch 'origin/v1.0' into v1.0

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

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

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.QueryWrapper;
 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.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
@@ -197,6 +198,7 @@ public class TbsCostApplyController {
      * @param id
      * @return
      */
+    @LimitSubmit
     @PostMapping("/commit/{id}")
     @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE)
     @PreAuthorize("hasRole('tbs:costApply:update')")

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

@@ -207,7 +207,7 @@ public class TbsBudgetApplicationService {
             budgetLqw.in(TbsBudget::getId,budgetIds);
             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.eq(TbsBudget::getBudgetState,1);
             //科目限制>品类之间>时间区间

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

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

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -414,7 +414,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
             LambdaQueryWrapper<TbsBudget> budgetLqw = new LambdaQueryWrapper<>();
             budgetLqw.in(TbsBudget::getId,budgetIds);
             //默认为随货折让(FYMC05)
-            budgetLqw.eq(TbsBudget::getSubjectCode,"FYMC05");
+            //budgetLqw.eq(TbsBudget::getSubjectCode,"FYMC05");
             budgetLqw.in(TbsBudget::getCenterId,centerIds);
             budgetLqw.eq(TbsBudget::getBudgetState,1);
             budgetList = tbsBudgetMapper.selectList(budgetLqw);

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

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

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

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

src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml

@@ -87,7 +87,7 @@
                     #{selectId}
                 </foreach>
           AND `tbs_cost_apply`.id != #{applyId}
-          AND opt_type IN (1,4,5,6,15)
+          AND opt_type != 0
         group by `tbs_budget_log`.budget_id,`tbs_budget_log`.schedule_item_id
     </select>
 
@@ -131,7 +131,7 @@
             #{selectId}
         </foreach>
         AND `tzc_policy`.id != #{policyId}
-        AND opt_type IN (11,12,13,14)
+        AND opt_type != 0
         group by `tbs_budget_log`.budget_id,`tbs_budget_log`.schedule_item_id
     </select>