hejianhao
2026-08-27 3f6ae1cc2c4916af6c7e84fee0068902b74cfe16
fix0806: 诊所管理新增省代搜索条件
7个文件已修改
36 ■■■■■ 已修改文件
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/controller/ClinicController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/mapper/ClinicQueryMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/row/ClinicListRow.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/service/ClinicAppService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/vo/ClinicListItemVO.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin-backend/src/main/resources/mapper/ClinicQueryMapper.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin/src/pages/member/clinic/index.tsx 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/controller/ClinicController.java
@@ -44,10 +44,11 @@
            @RequestParam(required = false) String regionCode,
            @RequestParam(required = false) String name,
            @RequestParam(required = false) String phone,
            @RequestParam(required = false) String agentName,
            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createdFrom,
            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createdTo,
            @RequestParam(required = false) Integer status) {
        return ApiResponse.ok(clinicAppService.page(page, pageSize, regionCode, name, phone, createdFrom, createdTo, status));
        return ApiResponse.ok(clinicAppService.page(page, pageSize, regionCode, name, phone, agentName, createdFrom, createdTo, status));
    }
    @GetMapping("/clinics/clinic-import-template")
@@ -65,10 +66,11 @@
                       @RequestParam(required = false) String regionCode,
                       @RequestParam(required = false) String name,
                       @RequestParam(required = false) String phone,
                       @RequestParam(required = false) String agentName,
                       @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createdFrom,
                       @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createdTo,
                       @RequestParam(required = false) Integer status) throws IOException {
        clinicAppService.export(regionCode, name, phone, createdFrom, createdTo, status, response);
        clinicAppService.export(regionCode, name, phone, agentName, createdFrom, createdTo, status, response);
    }
    @GetMapping("/clinics/regions")
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/mapper/ClinicQueryMapper.java
@@ -18,6 +18,7 @@
                                          @Param("regionCode") String regionCode,
                                          @Param("name") String name,
                                          @Param("phone") String phone,
                                          @Param("agentName") String agentName,
                                          @Param("createdFrom") LocalDateTime createdFrom,
                                          @Param("createdTo") LocalDateTime createdTo,
                                          @Param("status") Integer status);
@@ -25,6 +26,7 @@
    List<ClinicListRow> selectClinicList(@Param("regionCode") String regionCode,
                                         @Param("name") String name,
                                         @Param("phone") String phone,
                                         @Param("agentName") String agentName,
                                         @Param("createdFrom") LocalDateTime createdFrom,
                                         @Param("createdTo") LocalDateTime createdTo,
                                         @Param("status") Integer status);
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/row/ClinicListRow.java
@@ -16,6 +16,7 @@
    private String phone;
    private String regionName;
    private Integer status;
    private String agentName;
    private Integer userCount;
    private LocalDateTime createdAt;
    private String businessLicenseUrl;
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/service/ClinicAppService.java
@@ -78,6 +78,7 @@
                                               String regionCode,
                                               String name,
                                               String phone,
                                               String agentName,
                                               LocalDateTime createdFrom,
                                               LocalDateTime createdTo,
                                               Integer status) {
@@ -86,6 +87,7 @@
                trimToNull(regionCode),
                trimToNull(name),
                trimToNull(phone),
                trimToNull(agentName),
                createdFrom,
                createdTo,
                status
@@ -177,6 +179,7 @@
    public void export(String regionCode,
                       String name,
                       String phone,
                       String agentName,
                       LocalDateTime createdFrom,
                       LocalDateTime createdTo,
                       Integer status,
@@ -190,6 +193,7 @@
                trimToNull(regionCode),
                trimToNull(name),
                trimToNull(phone),
                trimToNull(agentName),
                createdFrom,
                createdTo,
                status
@@ -432,6 +436,7 @@
        item.setPhone(row.getPhone() == null ? "-" : PhoneMasker.mask(row.getPhone()));
        item.setRegionName(defaultText(row.getRegionName()));
        item.setStatus(row.getStatus());
        item.setAgentName(defaultText(row.getAgentName()));
        item.setUserCount(row.getUserCount() == null ? 0 : row.getUserCount());
        item.setCreatedAt(row.getCreatedAt());
        item.setBusinessLicenseUrl(trimToNull(row.getBusinessLicenseUrl()));
tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/vo/ClinicListItemVO.java
@@ -16,6 +16,7 @@
    private String phone;
    private String regionName;
    private Integer status;
    private String agentName;
    private Integer userCount;
    private LocalDateTime createdAt;
    private String businessLicenseUrl;
tcm-training-admin-backend/src/main/resources/mapper/ClinicQueryMapper.xml
@@ -18,6 +18,9 @@
        <if test="phone != null and phone.trim() != ''">
            AND c.contact_phone LIKE CONCAT('%', #{phone}, '%')
        </if>
        <if test="agentName != null and agentName.trim() != ''">
            AND pa.agent_name LIKE CONCAT('%', #{agentName}, '%')
        </if>
        <if test="createdFrom != null">
            AND c.created_at &gt;= #{createdFrom}
        </if>
@@ -44,10 +47,12 @@
                ELSE NULL
            END AS regionName,
            c.status,
            pa.agent_name AS agentName,
            COUNT(u.id) AS userCount,
            c.created_at AS createdAt,
            c.business_license_url AS businessLicenseUrl
        FROM tcm_clinic c
        LEFT JOIN tcm_provincial_agent pa ON pa.id = c.agent_id AND pa.deleted = 0
        LEFT JOIN tcm_app_user u ON u.clinic_id = c.id AND u.deleted = 0
        <include refid="ClinicWhere"/>
        GROUP BY
@@ -58,6 +63,7 @@
            c.city_name,
            c.district_name,
            c.status,
            pa.agent_name,
            c.created_at,
            c.business_license_url
        ORDER BY c.id DESC
@@ -78,10 +84,12 @@
                ELSE NULL
            END AS regionName,
            c.status,
            pa.agent_name AS agentName,
            COUNT(u.id) AS userCount,
            c.created_at AS createdAt,
            c.business_license_url AS businessLicenseUrl
        FROM tcm_clinic c
        LEFT JOIN tcm_provincial_agent pa ON pa.id = c.agent_id AND pa.deleted = 0
        LEFT JOIN tcm_app_user u ON u.clinic_id = c.id AND u.deleted = 0
        <include refid="ClinicWhere"/>
        GROUP BY
@@ -92,6 +100,7 @@
            c.city_name,
            c.district_name,
            c.status,
            pa.agent_name,
            c.created_at,
            c.business_license_url
        ORDER BY c.id DESC
tcm-training-admin/src/pages/member/clinic/index.tsx
@@ -12,6 +12,7 @@
  regionCode?: string[];
  name?: string;
  phone?: string;
  agentName?: string;
  status?: number;
  createdRange?: Dayjs[];
};
@@ -22,6 +23,7 @@
  phone?: string;
  regionName?: string;
  status: number;
  agentName?: string;
  userCount: number;
  createdAt: string;
  businessLicenseUrl?: string;
@@ -34,6 +36,7 @@
  regionCode: getSelectedRegionCode(values.regionCode),
  name: values.name?.trim() || undefined,
  phone: values.phone?.trim() || undefined,
  agentName: values.agentName?.trim() || undefined,
  status: values.status,
  createdFrom: values.createdRange?.[0]
    ? dayjs(values.createdRange[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss')
@@ -145,6 +148,12 @@
      render: (value) => (value === 1 ? '启用' : value === 2 ? '注销' : '禁用'),
    },
    {
      title: '省代',
      dataIndex: 'agentName',
      width: 140,
      render: (value) => value || '-',
    },
    {
      title: '注册时间',
      dataIndex: 'createdAt',
      width: 180,
@@ -197,6 +206,9 @@
                ]}
              />
            </Form.Item>
            <Form.Item label="省代" name="agentName">
              <Input placeholder="请输入" allowClear />
            </Form.Item>
            <Form.Item label="注册时间" name="createdRange">
              <DatePicker.RangePicker className="member-clinic-search-form__range" />
            </Form.Item>