chengf
2025-07-10 b70d862fdb47a8aa307b96901b3b07cfdcfe8b41
修复房产删除SQL、小程序端不显示小区地址、sql时区异常2025/07/09
8个文件已修改
2个文件已添加
210 ■■■■■ 已修改文件
java110-bean/src/main/java/com/java110/dto/staffCommunity/StaffCommunityDto.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/fee/ImportFeeServiceDaoImplMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/fee/PayFeeSubV1ServiceDaoImplMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/fee/PayFeeV1ServiceDaoImplMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/fee/ReturnPayFeeV1ServiceDaoImplMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/user/StaffCommunityV1ServiceDaoImplMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot/src/main/resources/application-debug.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot/src/main/resources/application-debugg.yml 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot/src/main/resources/application-devlocal.yml 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/staffCommunity/StaffCommunityDto.java
@@ -15,13 +15,13 @@
public class StaffCommunityDto extends PageDto implements Serializable {
    private String staffName;
private String communityName;
private String storeName;
private String communityId;
private String storeId;
private String scId;
private String staffId;
    private String communityName;
    private String storeName;
    private String communityId;
    private String storeId;
    private String scId;
    private String staffId;
    private String address;
    private Date createTime;
@@ -87,4 +87,12 @@
    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
}
java110-db/src/main/resources/mapper/fee/ImportFeeServiceDaoImplMapper.xml
@@ -17,7 +17,7 @@
    <!-- 查询费用导入信息 add by wuxw 2018-07-03 -->
    <select id="getImportFeeInfo" parameterType="Map" resultType="Map">
        select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdNamet.status_cd,t.status_cd statusCd,t.import_fee_id,t.import_fee_id
        select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,t.status_cd,t.status_cd statusCd,t.import_fee_id,t.import_fee_id
        importFeeId,t.community_id,t.community_id communityId,t.create_time createTime,d.name feeTypeCdName,remark
        from import_fee t
        left join secondary_fee_type_cd_tb s on s.secondary_fee_type_cd = t.secondary_fee_type_cd
java110-db/src/main/resources/mapper/fee/PayFeeSubV1ServiceDaoImplMapper.xml
@@ -17,7 +17,7 @@
    <!-- 查询费用拆分信息 add by wuxw 2018-07-03 -->
    <select id="getPayFeeSubInfo" parameterType="Map" resultType="Map">
        select t.max_time,t.max_time maxTime,t.amount,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdNamet.status_cd,t.status_cd
        select t.max_time,t.max_time maxTime,t.amount,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,t.status_cd,t.status_cd
        statusCd,t.batch_id,t.batch_id batchId,t.fee_id,t.fee_id feeId,t.user_id,t.user_id
        userId,t.pre_fee_id,t.pre_fee_id preFeeId,t.payer_obj_name,t.payer_obj_name
        payerObjName,t.income_obj_id,t.income_obj_id incomeObjId,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag
java110-db/src/main/resources/mapper/fee/PayFeeV1ServiceDaoImplMapper.xml
@@ -13,7 +13,7 @@
    <!-- 查询费用明细信息 add by wuxw 2018-07-03 -->
    <select id="getPayFeeInfo" parameterType="Map" resultType="Map">
        select t.amount,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdNamet.status_cd,t.status_cd statusCd,t.batch_id,t.batch_id
        select t.amount,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,t.status_cd,t.status_cd statusCd,t.batch_id,t.batch_id
        batchId,t.fee_id,t.fee_id feeId,t.user_id,t.user_id userId,t.income_obj_id,t.income_obj_id
        incomeObjId,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag feeFlag,t.start_time,t.start_time
        startTime,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id
java110-db/src/main/resources/mapper/fee/ReturnPayFeeV1ServiceDaoImplMapper.xml
@@ -19,7 +19,7 @@
    <!-- 查询退费表信息 add by wuxw 2018-07-03 -->
    <select id="getReturnPayFeeInfo" parameterType="Map" resultType="Map">
        select t.reason,t.prime_rate,t.prime_rate primeRate,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdNamet.pay_time,t.pay_time
        select t.reason,t.prime_rate,t.prime_rate primeRate,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,t.pay_time,t.pay_time
        payTime,t.detail_id,t.detail_id detailId,t.receivable_amount,t.receivable_amount
        receivableAmount,t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
        receivedAmount,t.fee_id,t.fee_id feeId,t.return_fee_id,t.return_fee_id returnFeeId,t.config_id,t.config_id
java110-db/src/main/resources/mapper/user/StaffCommunityV1ServiceDaoImplMapper.xml
@@ -18,8 +18,9 @@
    <!-- 查询员工小区信息 add by wuxw 2018-07-03 -->
    <select id="getStaffCommunityInfo" parameterType="Map" resultType="Map">
        select t.staff_name staffName,t.community_name communityName,t.store_name storeName,t.status_cd
        statusCd,t.community_id communityId,t.store_id storeId,t.sc_id scId,t.staff_id staffId,t.create_time createTime
        statusCd,t.community_id communityId,t.store_id storeId,t.sc_id scId,t.staff_id staffId,t.create_time createTime,sc.address
        from staff_community t
        left join s_community sc on sc.community_id = t.community_id
        where 1 =1
        <if test="staffName !=null and staffName != ''">
            and t.staff_name= #{staffName}
service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java
@@ -111,6 +111,7 @@
                    tmpApiCommunityDataVo.setStoreId(tmpStaffCommunityDto.getStoreId());
                    tmpApiCommunityDataVo.setStoreName(tmpStaffCommunityDto.getStoreName());
                    tmpApiCommunityDataVo.setState("1100");
                    tmpApiCommunityDataVo.setAddress(tmpStaffCommunityDto.getAddress());
                    communitys.add(tmpApiCommunityDataVo);
                }
            } else {
@@ -134,6 +135,7 @@
        apiCommunityVo.setCommunitys(communitys);
        apiCommunityVo.setCode(ResultVo.CODE_OK);
        apiCommunityVo.setMsg(ResultVo.MSG_OK);
        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiCommunityVo), HttpStatus.OK);
        context.setResponseEntity(responseEntity);
    }
springboot/src/main/resources/application-debug.yml
@@ -32,7 +32,7 @@
  activiti:
    database-schema-update: false
  datasource:
    url: jdbc:mysql://localhost:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
    url: jdbc:mysql://localhost:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false
    username: root
    password: win2020
    type: com.alibaba.druid.pool.DruidDataSource
springboot/src/main/resources/application-debugg.yml
New file
@@ -0,0 +1,85 @@
server:
  port: 8008
  tomcat:
    uri-encoding: UTF-8
spring:
  servlet:
    multipart:
      maxFileSize: 50MB
      maxRequestSize: 50MB
  profiles:
    active: share
  http:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
  application:
    name: boot-service
  redis:
    database: 0
    host: 47.92.223.85
    port: 6379
    pool:
      max-active: 300
      max-wait: 3000
      max-idle: 50
      min-idle: 20
      timeout: 0
  activiti:
    database-schema-update: false
  datasource:
    url: jdbc:mysql://47.92.223.85:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false
    username: TT
    password: hc12345678
    type: com.alibaba.druid.pool.DruidDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver
    druid:
      initial-size: 5
      max-active: 10
      min-idle: 5
      max-wait: 60000
feign:
  client:
    config:
      default:
        connect-timeout: 10000
        read-timeout: 20000
#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
    session:
      timeout: 6000
    auto:
      commit:
        interval: 100
      offset:
        reset: latest
    topic: test
    group:
      id: communityBusinessStatus
    concurrency: 10
  producer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096
    linger: 1
    buffer:
      memory: 40960
springboot/src/main/resources/application-devlocal.yml
New file
@@ -0,0 +1,88 @@
server:
  port: 8008
  tomcat:
    uri-encoding: UTF-8
spring:
  jackson:
    date-format: yyyy-MM-dd HH:mm:ss
    time-zone: Asia/Shanghai
  servlet:
    multipart:
      maxFileSize: 50MB
      maxRequestSize: 50MB
  profiles:
    active: share
  http:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
  application:
    name: boot-service
  redis:
    database: 0
    host: 172.26.82.25
    port: 6379
    password: hc
    pool:
      max-active: 300
      max-wait: 3000
      max-idle: 50
      min-idle: 20
      timeout: 0
  activiti:
    database-schema-update: false
  datasource:
    url: jdbc:mysql://172.26.82.25:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false
    username: TT
    password: hc12345678
    type: com.alibaba.druid.pool.DruidDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver
    druid:
      initial-size: 5
      max-active: 10
      min-idle: 5
      max-wait: 60000
feign:
  client:
    config:
      default:
        connect-timeout: 10000
        read-timeout: 20000
#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
    session:
      timeout: 6000
    auto:
      commit:
        interval: 100
      offset:
        reset: latest
    topic: test
    group:
      id: communityBusinessStatus
    concurrency: 10
  producer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096
    linger: 1
    buffer:
      memory: 40960