添加小区退管时间0922

chengf

2025-09-23 1f0b81b0af020b8b81c405fc5843002518602339

添加小区退管时间0922

 java110-bean/src/main/java/com/java110/dto/community/CommunityDto.java

@@ -42,7 +42,7 @@
    private String payFeeMonth;
    private String feePrice;
    private String takeTime;

    private String outTime;
    private String startTime;
    private String endTime;

@@ -150,6 +150,14 @@
        this.memberId = memberId;
    }

    public String getOutTime() {
        return outTime;
    }

    public void setOutTime(String outTime) {
        this.outTime = outTime == null ? null : outTime.split(" ")[0];
    }

    public String getState() {
        return state;
    }

 java110-bean/src/main/java/com/java110/dto/log/AssetImportLogDetailDto.java

@@ -34,6 +34,15 @@

    private String statusCd = "0";

    private String outTime;

    public String getOutTime() {
        return outTime;
    }

    public void setOutTime(String outTime) {
        this.outTime = outTime;
    }

    public String getDetailId() {
        return detailId;

 java110-bean/src/main/java/com/java110/po/community/CommunityPo.java

@@ -32,6 +32,15 @@

    private String takeTime;

    private String outTime;

    public String getOutTime() {
        return outTime;
    }

    public void setOutTime(String outTime) {
        this.outTime = outTime;
    }
    public String getTakeTime() {
        return takeTime;
    }

 java110-bean/src/main/java/com/java110/vo/api/community/ApiCommunityDataVo.java

@@ -29,6 +29,15 @@
    private String createTime;
    private String feePrice;
    private String takeTime;
    private String outTime;

    public String getOutTime() {
        return outTime;
    }

    public void setOutTime(String outTime) {
        this.outTime = outTime;
    }

    public String getTakeTime() {
        return takeTime;

 java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml

@@ -111,7 +111,7 @@

    <!-- 查询小区信息 add by wuxw 2018-07-03 -->
    <select id="getCommunityInfo" parameterType="Map" resultType="Map">
        select s.community_id,s.b_id,s.name,s.address,s.city_code,s.nearby_landmarks,s.map_x,s.map_y,s.status_cd,s.state, s.take_time
        select s.community_id,s.b_id,s.name,s.address,s.city_code,s.nearby_landmarks,s.map_x,s.map_y,s.status_cd,s.state, s.take_time, s.out_time
        from s_community s
        where 1=1
        <if test="statusCd != null and statusCd != ''">
@@ -212,6 +212,9 @@
        </if>
        <if test="takeTime !=null and takeTime != ''">
            , t.take_time= #{takeTime}
        </if>
        <if test="outTime !=null and outTime != ''">
            , t.out_time= #{outTime}
        </if>
        <if test="communityArea != null and communityArea != ''">
            ,s.community_area = #{communityArea}
@@ -338,7 +341,7 @@
        <if test="needCommunityInfo == true">
            and sc.`community_id` = ms.`community_id`
            AND sc.`status_cd` = '0'
            and sc.state='1100'
            and sc.state in ('1100','1400')
        </if>
        <if test="statusCd != null and statusCd != ''">
            and ms.status_cd = #{statusCd}
@@ -421,7 +424,7 @@
        <if test="needCommunityInfo == true">
            and sc.`community_id` = ms.`community_id`
            AND sc.`status_cd` = '0'
            and sc.state='1100'
            and sc.state in ('1100','1400')
        </if>
        <if test="statusCd != null and statusCd != ''">
            and ms.status_cd = #{statusCd}
@@ -477,7 +480,7 @@
        t.map_x,t.map_x mapX,t.state,td.name stateName,ca.area_code areaCode,ca.area_name areaName,
        ca.parent_area_code parentAreaCode,ca.parent_area_name parentAreaName,
        t.community_area communityArea,t.pay_fee_month,t.pay_fee_month payFeeMonth,t.fee_price,t.fee_price
        feePrice,t.qr_code qrCode,t.create_time createTime,s.name storeName,s.store_id storeId, t.take_time, t.take_time takeTime
        feePrice,t.qr_code qrCode,t.create_time createTime,s.name storeName,s.store_id storeId, t.take_time, t.take_time takeTime,t.out_time outTime
        from s_community t
        left join city_area ca on t.city_code = ca.area_code and ca.status_cd = '0'
        left join s_community_member cm on t.community_id = cm.community_id and cm.member_type_cd = '390001200002' and cm.status_cd = '0'
@@ -628,7 +631,8 @@
        ca1.parent_area_name provName,
        sc.community_area communityArea,
        sc.qr_code qrCode,
        sc.take_time takeTime
        sc.take_time takeTime,
        sc.out_time outTime
        FROM
        s_community sc,
        s_community_member scm,

 java110-db/src/main/resources/mapper/community/CommunityV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
    <!-- 保存小区管理信息 add by wuxw 2018-07-03 -->
    <insert id="saveCommunityInfo" parameterType="Map">
        insert into s_community(
        fee_price,address,city_code,map_y,pay_fee_month,map_x,nearby_landmarks,name,tel,state,community_id,community_area,take_time
        fee_price,address,city_code,map_y,pay_fee_month,map_x,nearby_landmarks,name,tel,state,community_id,community_area,take_time,out_time
        ) values (
        #{feePrice},#{address},#{cityCode},#{mapY},#{payFeeMonth},#{mapX},#{nearbyLandmarks},#{name},#{tel},#{state},#{communityId},#{communityArea},#{takeTime}
        #{feePrice},#{address},#{cityCode},#{mapY},#{payFeeMonth},#{mapX},#{nearbyLandmarks},#{name},#{tel},#{state},#{communityId},#{communityArea},#{takeTime},#{outTime}
        )
    </insert>

@@ -20,7 +20,7 @@
        select t.fee_price,t.fee_price feePrice,t.address,t.city_code,t.city_code cityCode,t.status_cd,t.status_cd
        statusCd,t.map_y,t.map_y mapY,t.pay_fee_month,t.pay_fee_month payFeeMonth,t.map_x,t.map_x
        mapX,t.nearby_landmarks,t.nearby_landmarks nearbyLandmarks,t.name,t.tel,t.state,t.community_id,t.community_id
        communityId,t.community_area,t.community_area communityArea,t.qr_code qrCode,t.take_time, t.take_time takeTime
        communityId,t.community_area,t.community_area communityArea,t.qr_code qrCode,t.take_time, t.take_time takeTime, t.out_time , t.out_time outTime
        from s_community t
        where 1 =1
        <if test="feePrice !=null and feePrice != ''">
@@ -124,6 +124,9 @@
        <if test="takeTime !=null and takeTime != ''">
            , t.take_time= #{takeTime}
        </if>
        <if test="outTime !=null and outTime != ''">
            , t.out_time= #{outTime}
        </if>
        where 1=1
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -188,7 +191,7 @@
        select t.fee_price,t.fee_price feePrice,t.address,t.city_code,t.city_code cityCode,t.status_cd,t.status_cd
        statusCd,t.map_y,t.map_y mapY,t.pay_fee_month,t.pay_fee_month payFeeMonth,t.map_x,t.map_x
        mapX,t.nearby_landmarks,t.nearby_landmarks nearbyLandmarks,t.name,t.tel,t.state,t.community_id,t.community_id
        communityId,t.community_area,t.community_area communityArea,t.qr_code qrCode,cm.member_id storeId,t.take_time, t.take_time takeTime
        communityId,t.community_area,t.community_area communityArea,t.qr_code qrCode,cm.member_id storeId,t.take_time, t.take_time takeTime, t.out_time , t.out_time outTime
        from s_community t
        left join s_community_member cm on t.community_id = cm.community_id and cm.member_type_cd = '390001200002'
        where 1 =1

 service-community/src/main/java/com/java110/community/bmo/community/impl/CommunityBMOImpl.java

@@ -570,10 +570,14 @@
    public void addCommunity(JSONObject paramInJson, ICmdDataFlowContext dataFlowContext) {

        paramInJson.put("communityId", GenerateCodeFactory.getCommunityId());
        paramInJson.put("state", "1000");
        if (paramInJson.containsKey("state")) {
            paramInJson.put("state", paramInJson.getString("state"));
        }else{
            paramInJson.put("state", "1000");
        }
        paramInJson.put("communityArea", "0");
        CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
        communityPo.setState(CommunityDto.STATE_NORMAL);
        communityPo.setState(paramInJson.containsKey("state") ? paramInJson.getString("state"):CommunityDto.STATE_NORMAL);

        int flag = communityV1InnerServiceSMOImpl.saveCommunity(communityPo);
        if (flag < 1) {

 service-job/src/main/java/com/java110/job/importData/ImportDataExecutor.java

@@ -148,6 +148,7 @@
        assetImportLogPo = new AssetImportLogPo();
        assetImportLogPo.setLogId(importDataDto.getLogId());
        assetImportLogPo.setState(AssetImportLogDto.STATE_COMPLETE_IMPORT);
        assetImportLogPo.setRemark("");
        assetImportLogInnerServiceSMOImpl.updateAssetImportLog(assetImportLogPo);
    }


 service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java

@@ -6,6 +6,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.core.smo.impl.ComputeFeeSMOImpl;
import com.java110.dto.PropertyWhiteListFlowDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.contract.ContractDto;
@@ -121,6 +122,9 @@

    @Autowired
    private ICommunityInnerServiceSMO communityInnerServiceSMO;

    @Autowired
    private ComputeFeeSMOImpl calculateFeeSMOImpl;

    @Override
    public void importData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
@@ -773,7 +777,11 @@
        feeInnerServiceSMOImpl.updateFee(payFeePo);
        feeInfo = feeInnerServiceSMOImpl.queryFees(fee).get(0);
        if (importRoomFee.getEndTime().split(" ")[0].equals(DateUtil.getFormatTimeStringB(feeInfo.getMaxEndTime()))) {
            double computeFee = computeFee(feeInfo,importRoomFee);
            Date deadlineTime = feeInfo.getDeadlineTime();
            feeInfo.setDeadlineTime(DateUtil.getDateFromStringA(importRoomFee.getEndTime()));
            calculateFeeSMOImpl.computeOweFee(feeInfo);
            feeInfo.setDeadlineTime(deadlineTime);
            double computeFee = Double.parseDouble(feeInfo.getAmountOwed());
            if(computeFee <= 1 && computeFee >= -1){
                PayFeePo payFee = new PayFeePo();
                payFee.setFeeId(feeInfo.getFeeId());

 springboot/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: debug
    active: devlocal

import:
  line: