房产新增字段、采购去除必输项2025/07/17

chengf

2025-07-17 7f3372fe96d927debd388a0cb285a45e6b952296

房产新增字段、采购去除必输项2025/07/17

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

@@ -664,7 +664,7 @@
        t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
        t.room_type roomType,t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent
        roomRent,t.room_area roomArea
        roomRent,t.room_area roomArea,t.door_room_num doorRoomNum,t.property_type propertyType,t.property_address propertyAddress,t.house_certificate_no houseCertificateNo
        FROM
        building_room t
        INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -742,6 +742,7 @@
        u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name
        stateName,t.room_type roomType,t.room_type,t.`community_id` communityId,td1.`name` roomSubTypeName
        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
         t.door_room_num doorRoomNum,t.property_type propertyType,t.property_address propertyAddress,t.house_certificate_no houseCertificateNo,
        concat(f.floor_num,'-',u.unit_num,'-',t.room_num) roomName
        FROM building_room t
        inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'

 java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml

@@ -156,7 +156,14 @@
        td4.table_columns = 'computing_formula'
        where 1 = 1
        <if test="feeTypeCd !=null and feeTypeCd != ''">
            and t.fee_type_cd= #{feeTypeCd}
          <choose>
              <when test="feeTypeCd == 0">
                  and t.fee_type_cd in ('630000003','630000004','630000005')
              </when>
              <otherwise>
                  and t.fee_type_cd= #{feeTypeCd}
              </otherwise>
          </choose>
        </if>
        <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
            and t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
@@ -237,6 +244,108 @@
        </if>
    </select>

    <!-- 查询费用配置信息 add by wuxw 2018-07-03 -->
    <select id="getFeeConfigInfoByCar" 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 secondaryFeeTypeCdName,t.computing_formula,t.computing_formula
        computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.status_cd,t.status_cd
        statusCd,t.square_price,t.square_price squarePrice,t.is_default,t.is_default isDefault,t.config_id,t.config_id
        configId,t.fee_flag,t.fee_flag feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time
        startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
        td1.name feeTypeCdName,td2.name feeFlagName,t.bill_type billType,t.bill_type,td3.name billTypeName,
        t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle,
        t.computing_formula_text,t.computing_formula_text computingFormulaText,t.deduct_from,t.deduct_from
        deductFrom,td4.name computingFormulaName,t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units,
        t.prepayment_period,t.prepayment_period prepaymentPeriod,t.state
        from pay_fee_config t
        left join secondary_fee_type_cd_tb s on s.secondary_fee_type_cd = t.secondary_fee_type_cd
        left join t_dict td1 on t.fee_type_cd = td1.status_cd and td1.table_name = 'pay_fee_config' and
        td1.table_columns = 'fee_type_cd'
        left join t_dict td2 on t.fee_flag = td2.status_cd and td2.table_name = 'pay_fee_config' and td2.table_columns =
        'fee_flag'
        left join t_dict td3 on t.bill_type = td3.status_cd and td3.table_name = 'pay_fee_config' and td3.table_columns
        = 'bill_type'
        left join t_dict td4 on t.computing_formula = td4.status_cd and td4.table_name = 'pay_fee_config' and
        td4.table_columns = 'computing_formula'
        where t.fee_type_cd in ('630000003','630000004','630000005')
        <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
            and t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
        </if>
        <if test="computingFormula !=null and computingFormula != ''">
            and t.computing_formula= #{computingFormula}
        </if>
        <if test="additionalAmount !=null and additionalAmount != ''">
            and t.additional_amount= #{additionalAmount}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
        <if test="squarePrice !=null and squarePrice != ''">
            and t.square_price= #{squarePrice}
        </if>
        <if test="isDefault !=null and isDefault != ''">
            and t.is_default= #{isDefault}
        </if>
        <if test="configId !=null and configId != ''">
            and t.config_id= #{configId}
        </if>
        <if test="feeFlag !=null and feeFlag != ''">
            and t.fee_flag= #{feeFlag}
        </if>
        <if test="feeName !=null and feeName != ''">
            and t.fee_name like '%${feeName}%'
        </if>
        <if test="feeNameEq !=null and feeNameEq != ''">
            and t.fee_name = #{feeNameEq}
        </if>
        <if test="startTime !=null ">
            and t.start_time= #{startTime}
        </if>
        <if test="endTime !=null ">
            and t.end_time= #{endTime}
        </if>
        <if test="valid !=null and valid == 1">
            and t.end_time &gt; now()
        </if>
        <if test="curTime !=null ">
            and t.end_time &gt; #{curTime}
            and t.start_time &lt; #{curTime}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
        <if test="paymentCd !=null and paymentCd != ''">
            and t.payment_cd= #{paymentCd}
        </if>
        <if test="paymentCycle !=null and paymentCycle != ''">
            and t.payment_cycle= #{paymentCycle}
        </if>
        <if test="billType !=null and billType != ''">
            and t.bill_type= #{billType}
        </if>
        <if test="deductFrom !=null and deductFrom != ''">
            and t.deduct_from = #{deductFrom}
        </if>
        <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
            and t.prepayment_period = #{prepaymentPeriod}
        </if>
        <if test="state !=null and state != ''">
            and t.state = #{state}
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>
    </select>

    <!-- 修改费用配置信息 add by wuxw 2018-07-03 -->
    <update id="updateFeeConfigInfoInstance" parameterType="Map">
        update pay_fee_config t set t.status_cd = #{statusCd}

 service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportResourceStoreSMOImpl.java

@@ -101,14 +101,21 @@
            }
            Assert.hasValue(os[1], (osIndex + 1) + "行物品名称不能为空");
            Assert.hasValue(os[2], (osIndex + 1) + "行物品编号不能为空");
            Assert.hasValue(os[3], (osIndex + 1) + "行物品单价不能为空");
            Assert.hasValue(os[4], (osIndex + 1) + "行物品库存不能为空");
            os[3] = os[3] == null ? "0" : os[3];
            os[4] = os[4] == null ? "0" : os[4];
            os[6] = os[6] == null ? "0" : os[6];
            os[7] = os[7] == null ? "0" : os[7];
            os[8] = os[8] == null ? "0" : os[8];
            os[9] = os[9] == null ? "" : os[9];
            os[10] = os[10] == null ? "Y" : os[10];
//            Assert.hasValue(os[3], (osIndex + 1) + "行物品单价不能为空");
//            Assert.hasValue(os[4], (osIndex + 1) + "行物品库存不能为空");
            Assert.hasValue(os[5], (osIndex + 1) + "行物品单位不能为空");
            Assert.hasValue(os[6], (osIndex + 1) + "行物品对外最低售价不能为空");
            Assert.hasValue(os[7], (osIndex + 1) + "行物品对外最高售价不能为空");
            Assert.hasValue(os[8], (osIndex + 1) + "行物品告警库存不能为空");
            Assert.hasValue(os[9], (osIndex + 1) + "行物品类型不能为空");
            Assert.hasValue(os[10], (osIndex + 1) + "行是否固定物品不能为空");
//            Assert.hasValue(os[6], (osIndex + 1) + "行物品对外最低售价不能为空");
//            Assert.hasValue(os[7], (osIndex + 1) + "行物品对外最高售价不能为空");
//            Assert.hasValue(os[8], (osIndex + 1) + "行物品告警库存不能为空");
//            Assert.hasValue(os[9], (osIndex + 1) + "行物品类型不能为空");
//            Assert.hasValue(os[10], (osIndex + 1) + "行是否固定物品不能为空");
            resourceStoreDto = new ImportResourceStoreDto();
            resourceStoreDto.setCommunityId(result.getCommunityId());
            resourceStoreDto.setResName(os[1].toString());
@@ -119,7 +126,7 @@
            resourceStoreDto.setOutLowPrice(os[6].toString());
            resourceStoreDto.setOutHighPrice(os[7].toString());
            resourceStoreDto.setWarningStock(os[8].toString());
            resourceStoreDto.setRstName(os[9].toString());
            resourceStoreDto.setRstName(os[9] == "" ? "未分类" : os[9].toString());
            resourceStoreDto.setIsFixed(os[10].toString());

            if (os.length > 11 && !StringUtil.isNullOrNone(os[11])) {

 service-fee/src/main/java/com/java110/fee/cmd/feeConfig/ListFeeConfigsCmd.java

@@ -43,6 +43,9 @@
        int count = feeConfigInnerServiceSMOImpl.queryFeeConfigsCount(feeConfigDto);
        List<ApiFeeConfigDataVo> feeConfigs = null;
        if (count > 0) {
            if (reqJson.containsKey("carCreateFee")) {
                feeConfigDto.setFeeTypeCd("0");
            }
            feeConfigs = BeanConvertUtil.covertBeanList(feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto), ApiFeeConfigDataVo.class);
            //处理 小数点后无效的0
            for (ApiFeeConfigDataVo feeConfig : feeConfigs) {

 service-user/src/main/java/com/java110/user/cmd/owner/OwnerCommunityCmd.java

@@ -43,7 +43,7 @@

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "link", "未包含联系电话");
//        Assert.hasKeyAndValue(reqJson, "link", "未包含联系电话");
    }

    @Override
@@ -51,7 +51,12 @@
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {

        OwnerDto ownerDto = new OwnerDto();
        ownerDto.setLink(reqJson.getString("link"));
        if (reqJson.containsKey("ownerId")) {
            ownerDto.setOwnerId(reqJson.getString("ownerId"));
        }
        if(reqJson.containsKey("link")){
            ownerDto.setLink(reqJson.getString("link"));
        }
        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);

        if (ownerDtos == null || ownerDtos.size() < 1) {