bug修改

mitao

2025-04-03 6bfd9e219ef6e51cd89f77a4cb6e5fb37779e9fe

bug修改

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java

@@ -394,7 +394,7 @@
        Map<String, Object> templateParam = new HashMap<>(5);
        fill(templateParam, "contractNumber", contract.getContractNumber());
        fill(templateParam, "partyOneName", contract.getPartyOneName());
        fill(templateParam, "partyTwoName", contract.getPartyTwoName());


        if (Objects.nonNull(tenant)) {
            fill(templateParam, "mailAddress", tenant.getMailAddress());
@@ -402,6 +402,7 @@
            fill(templateParam, "residentName", tenant.getResidentName());
            fill(templateParam, "bankNumber", tenant.getBankNumber());
            fill(templateParam, "bankName", tenant.getBankName());
            fill(templateParam, "partyTwoName", tenant.getLessee());

            // 企业、政府机构、国有企业
            if (Objects.nonNull(tenant.getTenantType())

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java

@@ -115,7 +115,10 @@
    @ApiOperation(value = "获取合同分页列表")
    @GetMapping(value = "/contractListByTenantId")
    public R<List<TContract>> contractListByTenantId(@RequestParam String tenantId) {
        return R.ok(contractService.list(Wrappers.lambdaQuery(TContract.class).eq(TContract::getTenantId, tenantId)));
        String businessDeptId = SecurityUtils.getBusinessDeptId();
        return R.ok(contractService.list(Wrappers.lambdaQuery(TContract.class)
                .eq(!businessDeptId.equals("0"), TContract::getBusinessDeptId, businessDeptId)
                .eq(TContract::getTenantId, tenantId)));
    }

    /**

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

@@ -62,7 +62,7 @@
            <if test="query.userId != null and query.userId !=''">
                and t.id = #{query.userId}
            </if>
            <if test='query.businessDeptId != null and query.businessDeptId != "" and query.businessDeptId!="0"'>
            <if test='query.businessDeptId != null and query.businessDeptId != "" and query.businessDeptId!=0'>
                and b.business_dept_id = #{query.businessDeptId}
            </if>
            <if test="query.billType != null">

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

@@ -131,11 +131,8 @@
        SELECT COUNT(DISTINCT tc.tenant_id) AS new_tenant_count
        FROM t_contract tc
        <where>
            <if test="businessDeptId!=0">
                AND tc.business_dept_id = #{businessDeptId}
            </if>
            -- 筛选本月签订的合同
            AND DATE_FORMAT(tc.sign_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') AND tc.status IN ("4", "5", "6", "7", "8", "9")
            DATE_FORMAT(tc.sign_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') AND tc.status IN ("4", "5", "6", "7", "8", "9")
            -- 且租户在本月前从未签订过任何合同
            AND NOT EXISTS (
            SELECT 1
@@ -143,6 +140,9 @@
            WHERE tc_hist.tenant_id = tc.tenant_id
            AND tc_hist.sign_time <![CDATA[ < ]]> DATE_FORMAT(CURDATE(), '%Y-%m-01') AND tc_hist.status IN ("4", "5", "6", "7", "8", "9")
            )
            <if test="businessDeptId!=0">
                AND tc.business_dept_id = #{businessDeptId}
            </if>
        </where>

    </select>