xuhy
2025-02-17 becc3df6d06e9b0a6fd773229e99b4b2075b8043
资讯修改
4个文件已修改
17 ■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -76,7 +76,6 @@
    private TCheckAcceptRecordService checkAcceptRecordService;
    @ApiOperation(value = "测试生成账单")
    @PostMapping(value = "/testBill")
    public R testBill(String id) {
        TContract contract = contractService.getById(id);
        // 查询所有已签订的合同并且未生成第一笔账单的
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java
@@ -10,7 +10,9 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TTenantDTO;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.TTenant;
import com.ruoyi.system.query.TContractQuery;
import com.ruoyi.system.query.TTenantQuery;
import com.ruoyi.system.service.TTenantService;
import com.ruoyi.system.vo.TenantVO;
@@ -93,6 +95,13 @@
        return R.ok(tenant);
    }
//    @PreAuthorize("@ss.hasPermi('system:contract:list')")
//    @ApiOperation(value = "获取合同分页列表")
//    @PostMapping(value = "/contractList")
//    public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
//        return R.ok(contractService.contractList(query));
//    }
    /**
     * 删除租户
     */
ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
@@ -59,6 +59,10 @@
    @TableField("cover")
    private String cover;
    @ApiModelProperty(value = "简介")
    @TableField("brief_introduction")
    private String briefIntroduction;
    @ApiModelProperty(value = "内容")
    @TableField("content")
    private String content;
ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml
@@ -11,6 +11,7 @@
        <result column="release_time" property="releaseTime" />
        <result column="cover" property="cover" />
        <result column="content" property="content" />
        <result column="brief_introduction" property="briefIntroduction" />
        <result column="attachment" property="attachment" />
        <result column="attachment_name" property="attachmentName" />
        <result column="create_time" property="createTime" />
@@ -22,7 +23,7 @@
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, title_name, sort_by, info_source, release_time,cover, content, attachment,attachment_name, create_time, update_time, create_by, update_by, disabled
        id, title_name, sort_by, info_source, release_time,cover, brief_introduction,content, attachment,attachment_name, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TInformation">
        select