Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-04-03 f625ae7edfa835f5c72967a8bcc1584df8ab61ec

Merge remote-tracking branch 'origin/master' into xizang-changyun

 ruoyi-admin/src/main/resources/application-test.yml

@@ -162,7 +162,7 @@
  # 令牌密钥
  secret: abcdefghijklmnopqrstuvwxyz
  # 令牌有效期（默认30分钟）
  expireTime: 1
  expireTime: 120

mybatis-plus:
  # 此处在多数据源中生效

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java

@@ -295,10 +295,11 @@
        // 添加验收记录
        dto.setCheckPerson(tokenService.getLoginUser().getUser().getNickName());
        checkAcceptRecordService.updateById(dto);
        TContract contract = contractService.getById(dto.getContractId());
        TCheckAcceptRecord checkAcceptRecord = checkAcceptRecordService.getById(dto.getId());
        TContract contract = contractService.getById(checkAcceptRecord.getContractId());
        // 添加账单
        TBill tBill = new TBill();
        tBill.setContractId(dto.getContractId());
        tBill.setContractId(checkAcceptRecord.getContractId());
        tBill.setContractNumber(contract.getContractNumber());
        tBill.setPayableFeesMoney(dto.getCheckMoney());
        tBill.setPayableFeesTime(LocalDate.now());

 ruoyi-common/pom.xml

@@ -144,10 +144,15 @@
            <artifactId>javax.servlet-api</artifactId>
        </dependency>
        <!--mybatis-plus-->
<!--        <dependency>-->
<!--            <groupId>com.baomidou</groupId>-->
<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
<!--            <version>3.5.2</version>-->
<!--        </dependency>-->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.5.2</version>
            <version>3.5.7</version>
        </dependency>
        <!--lombok-->
        <dependency>

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java

@@ -1004,6 +1004,7 @@
        FlwTask flwTask = flwTaskMapper.selectById(taskId);
        // 直接拒绝当前流程
        flowLongEngine.runtimeService().reject(flwTask.getInstanceId(), currentFlowCreator());
        flwTaskMapper.deleteById(taskId);
        // 动作执行记录
        StateProcessInstanceAction record = new StateProcessInstanceAction();
        record.setId(IdUtils.simpleUUID());