小区添加接管日期以及对初始化时间进行限制2025/09/11

cgf

2025-09-11 03dcc05067d46487eac0c65b9fdeb6436c6e7311

小区添加接管日期以及对初始化时间进行限制2025/09/11

 java110-bean/src/main/java/com/java110/dto/PropertyWhiteListFlowDto.java

@@ -32,6 +32,7 @@
    private String chargeStart; // 收费起（格式YYYY-MM-DD）
    private String chargeEnd; // 收费止（格式YYYY-MM-DD）
    private String communityId;
    private String frequency;

    private String feeYear;

@@ -302,4 +303,12 @@
    public void setStoreId(String storeId) {
        this.storeId = storeId;
    }

    public String getFrequency() {
        return frequency;
    }

    public void setFrequency(String frequency) {
        this.frequency = frequency;
    }
}

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

@@ -41,6 +41,7 @@
    private String tel;
    private String payFeeMonth;
    private String feePrice;
    private String takeTime;

    private String startTime;
    private String endTime;
@@ -117,6 +118,13 @@
        this.mapX = mapX;
    }

    public String getTakeTime() {
        return takeTime;
    }

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

    public Date getCreateTime() {
        return createTime;

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

@@ -28,6 +28,7 @@

    private String stateName;

    private String takeTime;

    private String createTime;

@@ -84,7 +85,13 @@
    }


    public String getTakeTime() {
        return takeTime;
    }

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

    public String getStatusCd() {
        return statusCd;

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

@@ -30,6 +30,15 @@

    private String qrCode;

    private String takeTime;

    public String getTakeTime() {
        return takeTime;
    }

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

    private String statusCd = "0";


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

@@ -28,6 +28,15 @@
    private String endTime;
    private String createTime;
    private String feePrice;
    private String takeTime;

    public String getTakeTime() {
        return takeTime;
    }

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

    public String getFeePrice() {
        return feePrice;

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

@@ -82,9 +82,9 @@
    <!-- 保存小区信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveCommunityInfoInstance" parameterType="Map">
        insert into s_community(community_id, b_id, name, address, city_code, nearby_landmarks, map_x, map_y, status_cd,
                                state, community_area, tel)
                                state, community_area, tel, take_time)
        values (#{community_id}, #{b_id}, #{name}, #{address}, #{city_code}, #{nearby_landmarks}, #{map_x}, #{map_y},
                '0', #{state}, #{communityArea}, #{tel})
                '0', #{state}, #{communityArea}, #{tel}, #{takeTime})
    </insert>

    <!-- 保存小区属性信息到 instance add by wuxw 2018-07-03 -->
@@ -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
        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
        from s_community s
        where 1=1
        <if test="statusCd != null and statusCd != ''">
@@ -209,6 +209,9 @@
        </if>
        <if test="tel != null and tel != ''">
            ,s.tel = #{tel}
        </if>
        <if test="takeTime !=null and takeTime != ''">
            , t.take_time= #{takeTime}
        </if>
        <if test="communityArea != null and communityArea != ''">
            ,s.community_area = #{communityArea}
@@ -474,7 +477,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
        feePrice,t.qr_code qrCode,t.create_time createTime,s.name storeName,s.store_id storeId, t.take_time, t.take_time takeTime
        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'
@@ -624,7 +627,8 @@
        ca.parent_area_name cityName,
        ca1.parent_area_name provName,
        sc.community_area communityArea,
        sc.qr_code qrCode
        sc.qr_code qrCode,
        sc.take_time takeTime
        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
        fee_price,address,city_code,map_y,pay_fee_month,map_x,nearby_landmarks,name,tel,state,community_id,community_area,take_time
        ) values (
        #{feePrice},#{address},#{cityCode},#{mapY},#{payFeeMonth},#{mapX},#{nearbyLandmarks},#{name},#{tel},#{state},#{communityId},#{communityArea}
        #{feePrice},#{address},#{cityCode},#{mapY},#{payFeeMonth},#{mapX},#{nearbyLandmarks},#{name},#{tel},#{state},#{communityId},#{communityArea},#{takeTime}
        )
    </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
        communityId,t.community_area,t.community_area communityArea,t.qr_code qrCode,t.take_time, t.take_time takeTime
        from s_community t
        where 1 =1
        <if test="feePrice !=null and feePrice != ''">
@@ -121,6 +121,9 @@
        <if test="qrCode !=null and qrCode != ''">
            , t.qr_code= #{qrCode}
        </if>
        <if test="takeTime !=null and takeTime != ''">
            , t.take_time= #{takeTime}
        </if>
        where 1=1
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -185,7 +188,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
        communityId,t.community_area,t.community_area communityArea,t.qr_code qrCode,cm.member_id storeId,t.take_time, t.take_time takeTime
        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-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java

@@ -90,6 +90,11 @@
            white.setOrderNo(os[18] == null ? null : os[18].toString());
            white.setLicensePlate(os[19] == null ? null : os[19].toString());
            white.setCategory22(os[20] == null ? null : os[20].toString());
            if (os.length > 21){
                white.setFrequency(os[21] == null ? "1" : os[21].toString());
            }else{
                white.setFrequency("1");
            }
            white.setChargeStart(changeStart);
            white.setChargeEnd(changeEnd);
            white.setRow(osIndex + 1);

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

@@ -7,6 +7,7 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.PropertyWhiteListFlowDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.contract.ContractPartyaDto;
import com.java110.dto.fee.*;
@@ -22,6 +23,7 @@
import com.java110.fee.cmd.fee.PayFeePreCmd;
import com.java110.intf.IImportPropertyWhiteListfFlowServiceSMO;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
import com.java110.intf.store.IContractInnerServiceSMO;
@@ -117,11 +119,18 @@
    @Autowired
    private ImportRoomFeeQueueDataAdapt importRoomFeeQueueDataAdapt;

    @Autowired
    private ICommunityInnerServiceSMO communityInnerServiceSMO;

    @Override
    public void importData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {

        String communityId = assetImportLogDetailDtos.get(0).getCommunityId();
        CommunityDto communityDto = new CommunityDto();
        communityDto.setCommunityId(communityId);
        List<CommunityDto> communityDtos = communityInnerServiceSMO.queryCommunitys(communityDto);
        for (AssetImportLogDetailDto assetImportLogDetailDto : assetImportLogDetailDtos) {
            try {
                assetImportLogDetailDto.setTakeTime(communityDtos.get(0).getTakeTime());
                importDatas(assetImportLogDetailDto);
                updateImportLogDetailState(assetImportLogDetailDto.getDetailId());
            } catch (Exception e) {
@@ -141,6 +150,9 @@
        String communityId = assetImportLogDetailDto.getCommunityId();
        JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
        ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(data, ImportRoomFee.class);
        if (DateUtil.getDateFromStringB(data.getString("chargeStart").split(" ")[0]).getTime() <= DateUtil.getDateFromStringB(assetImportLogDetailDto.getTakeTime().split(" ")[0]).getTime()){
            throw new IllegalStateException("该费用为起始时间小于小区接管时间不进行导入");
        }
        if (importRoomFee.getEndTime() != null){
            String[] split = importRoomFee.getEndTime().split(" ");
            importRoomFee.setEndTime(split[0] + " 23:59:59");
@@ -160,6 +172,9 @@
                }
            }
        }
//        if (importRoomFee.getDoorRoomNum() != null && importRoomFee.getDoorRoomNum().split("-").length < 2) {
//            importRoomFee.setObjType("7777");
//        }
        if(importRoomFee.getSecondaryFeeTypeCd()!= null && importRoomFee.getSecondaryFeeTypeCd().equals("临时停车费-其他") &&(importRoomFee.getObjType() == null || !(importRoomFee.getObjType().equals("7777")))){
                CarInoutPo carInout = new CarInoutPo();
                carInout.setCommunityId(communityId);

 springboot/src/main/resources/application.yml

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

import:
  line: