Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

无关风月

2025-04-02 3242a27f8b6839958372b5cbac38987bb569a388

Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

 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-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java

@@ -145,15 +145,15 @@
                String filePath = map.get("filePath");
                String fileName = map.get("fileName");
                tempFilePath.add(Paths.get(filePath));
                FileDataSource source = new FileDataSource(filePath);
                FileDataSource source = new FileDataSource(filePath+"\\"+fileName);
                messageBodyPart.setDataHandler(new DataHandler(source));
                // String filenameEncode = MimeUtility.encodeText(fileName, "UTF-8", "base64");
                String encodedFileName = Base64.getEncoder().encodeToString(fileName.getBytes(StandardCharsets.UTF_8));
                String filenameEncode = MimeUtility.encodeText(encodedFileName);
                messageBodyPart.setFileName(filenameEncode);
                // String encodedFileName = Base64.getEncoder().encodeToString(fileName.getBytes(StandardCharsets.UTF_8));
                // String filenameEncode = MimeUtility.encodeText(encodedFileName);
                messageBodyPart.setFileName(fileName);
                messageBodyPart.setHeader("Content-Transfer-Encoding", "base64");
                messageBodyPart.setHeader("Content-Disposition", "attachment");
                messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + filenameEncode + "\"");
                messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + fileName + "\"");
                multipart.addBodyPart(messageBodyPart);
            }
            // 设置邮件内容

 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());

 ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml

@@ -62,6 +62,9 @@
            <if test="query.userId != null and query.userId !=''">
                and t.id = #{query.userId}
            </if>
            <if test="query.billType != null">
                and b.bill_type = #{query.billType}
            </if>
        </where>
        order by b.payable_fees_time desc,b.create_time desc
    </select>