Pārlūkot izejas kodu

维保计划列表删除测试代码

别傲 5 gadi atpakaļ
vecāks
revīzija
b815179cd3

+ 4 - 2
lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/PaymentService.java

@@ -126,12 +126,13 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
         if (IterUtil.isNotEmpty(insertList)) {
             for (Payment payment : insertList) {
                 PaymentHistory history = new PaymentHistory();
+                history.setPaymentId(payment.getId());
                 history.setContractsId(payment.getContractsId());
                 history.setDescription("新增收款项");
                 history.setBeforeContent("--");
                 String afterContent = formatPaymentContent(payment);
                 history.setAfterContent(afterContent);
-                history.setOperatorId(payment.getUpdateId());
+                history.setOperatorId(10000L);
                 history.setOperateDate(LocalDateTime.now());
                 histories.add(history);
             }
@@ -142,10 +143,11 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
             //比较原有收款项
             for (Payment payment : oldPaymentList) {
                 PaymentHistory history = new PaymentHistory();
+                history.setPaymentId(payment.getId());
                 history.setContractsId(payment.getContractsId());
                 String before = formatPaymentContent(payment);
                 history.setBeforeContent(before);
-                history.setOperatorId(payment.getUpdateId());
+                history.setOperatorId(10000L);
                 history.setOperateDate(LocalDateTime.now());
                 Optional<Payment> newPayment = paymentList.stream().filter(entry -> payment.getId().equals(entry.getId())).findFirst();
                 if (newPayment.isPresent()) {

+ 1 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectUserController.java

@@ -37,7 +37,7 @@ public class ProjectUserController {
     @PostMapping("user/list")
     @Validation(fields = {"mtCompanyId", "id"})
     public RestResponse userList(@Val @RequestBody ProjectRequest request) {
-        List<ProjectUserResponse> userList = projectUserService.userList(request.getProjectId(),request.getMtCompanyId());
+        List<ProjectUserResponse> userList = projectUserService.userList(request.getId(),request.getMtCompanyId());
         if (CollUtil.isEmpty(userList)) {
             return RestResponse.success();
         }

+ 0 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectAppService.java

@@ -176,7 +176,6 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
         if (Objects.nonNull(request.getBeginTime())) {
             request.setEndTime(request.getBeginTime().with(TemporalAdjusters.lastDayOfMonth()));
         }
-        request.setCurrentRoleCode(DefaultRole.REGION_DIRECTOR.getCode());
         if (DefaultRole.MTWORK.getCode().equals(request.getCurrentRoleCode())) {
             Object obj = redisTemplate.opsForHash().get(request.getMtCompanyId() + "_globalSet", ApiConstants.GlobalSetConstants.WORK_LIFT);
             //维保工不能查看到项目组其他维保工的任务