合并0819

chengf

2025-08-19 fb7bd4da57428b5f16b4f90729fe8f497585d327

合并0819

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

@@ -122,10 +122,10 @@
        importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount,
        mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time
        curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value`
        payerObjName,pf.contract_fee,pf.contract_fee contractFee
        payerObjName,pf.contract_fee,pf.contract_fee contractFee,
        t.cashier_id cashierId,t.cashier_name cashierName,pfc.fee_flag feeFlag,fr.receipt_code
        receiptCode,t.open_invoice openInvoice,t.acct_amount acctAmount,t.discount_amount discountAmount,t.deduction_amount deductionAmount,
        t.late_amount lateAmount,t.gift_amount giftAmount,t.invoice_no invoiceNo,t.transferor_name transferorName
        t.late_amount lateAmount,t.gift_amount giftAmount,t.invoice_no invoiceNo,t.receipt_no receiptNo,t.transferor_name transferorName
        from pay_fee_detail t
        left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
        left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'

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

@@ -220,7 +220,7 @@
        AND td.status_cd = pf.fee_type_cd
        WHERE
        pfd.status_cd = '0'
        AND pfd.community_id = '2025062600070012'
--         AND pfd.community_id = '2025062600070012'
        GROUP BY
        td.name,
        pf.fee_type_cd,

 java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml

@@ -125,7 +125,7 @@
        t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,
        t.owner_type_cd ownerTypeCd,t.create_time createTime,t.community_id,
        t.community_id communityId,t.id_card, t.id_card idCard,t.state,td.name ownerTypeName,
        t.owner_flag,t.owner_flag ownerFlag,t.address,t.person_type personType,t.person_role personRole,
        t.owner_flag,t.owner_flag ownerFlag,t.address,t.other_address otherAddress,t.person_type personType,t.person_role personRole,
        t.concact_person concactPerson, t.concact_link concactLink,t.face_url faceUrl,td.name ownerTypeName,
        tdType.name personTypeName,tdRole.name personRoleName
        <if test="roomIds != null">
@@ -506,7 +506,7 @@
        select t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id
        bId,t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,
        t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.community_id,
        t.community_id communityId,t.id_card, t.id_card idCard,t.address
        t.community_id communityId,t.id_card, t.id_card idCard,t.address,t.other_address otherAddress
        FROM building_owner t
        WHERE
        t.`status_cd` = '0'
@@ -589,7 +589,7 @@
        bId,t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd
        ownerTypeCd,
        r.`room_id` roomId,r.`room_num` roomNum,t.community_id,t.community_id communityId,t.id_card, t.id_card
        idCard,orr.start_time startTime ,orr.end_time endTime,t.address
        idCard,orr.start_time startTime ,orr.end_time endTime,t.address,t.other_address otherAddress
        FROM building_room r,building_owner_room_rel orr,building_owner t
        WHERE r.`room_id` = orr.`room_id`
        AND orr.`owner_id` = t.`owner_id`
@@ -614,7 +614,7 @@
    <!-- 根据停车位查询 -->
    <select id="queryOwnersByParkingSpace" parameterType="Map" resultType="Map">
        select ps.num,ps.ps_id psId,t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id
        ownerId,t.b_id,t.b_id bId,t.address,
        ownerId,t.b_id,t.b_id bId,t.address,t.other_address otherAddress,
        t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,
        t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.id_card, t.id_card idCard
        from p_parking_space ps , owner_car oc,building_owner t

 service-api/src/main/java/com/java110/api/configuration/ServiceConfiguration.java

@@ -82,6 +82,7 @@
        exclusions.append("/app/reportInfoBackCity/saveReportInfoBackCity,");//返省人员信息上报
        exclusions.append("/app/reportInfoAnswerValue/saveReportInfoAnswerValue,");//保存疫情问卷
        exclusions.append("/app/staffAuth,");//查询大类
        exclusions.append("/app/smallProgram.advertsListApp,");//放开 广告页面是不需要登录的
        //这里不允许开放数据安全问题
//        exclusions.append("/app/floor.queryFloors,");
//        exclusions.append("/app/unit.queryUnits,");

 service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java

@@ -105,7 +105,9 @@
                importRoomFee.setExpenseSubject(os[2] == null?null:os[2].toString());
            }
            importRoomFee.setIsContractFee(os[0] != null && os[1] ==null && os[2] != null ? "O" : null);
            importRoomFee.setObjType(os[2] != null ? "7777" : null);
            if(os[2] != null){
                importRoomFee.setObjType("7777");
            }
            importRoomFee.setContractId(os[0] != null && os[1] ==null && os[2] != null ? os[2].toString() : null);
            importRoomFee.setFeeTypeCd(os[3] == null ? null : os[3].toString());
            importRoomFee.setFeeName(os[4] == null ? null : os[4].toString());

 service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java

@@ -78,19 +78,19 @@
                            }
                        }
                        feeDto.setReport(doubles);
                        reportFeeDtos.add(feeDto);
                    }
                    if(startYear == currentYear){
                        for (int x = 1 ; x <= 12 ; x++){
                            feeDto = new FeeDto();
                            feeDto.setCurYear(startYear+"/"+x);
                            feeDto.setFeeTypeCdName(dictDto1.getName());
                            if(map.get(startYear + "年" + x + "月收费金额(元)")!=null){
//                    if(startYear == currentYear){
//                        for (int x = 1 ; x <= 12 ; x++){
//                            feeDto = new FeeDto();
//                            feeDto.setCurYear(startYear+"/"+x);
//                            feeDto.setFeeTypeCdName(dictDto1.getName());
//                            if(map.get(startYear + "年" + x + "月收费金额(元)")!=null){
//                                d
//                            }
//                        }
//                    }

                            }
                        }
                    }

                    reportFeeDtos.add(feeDto);
                }
            }
            reportFeeDtoLists.add(reportFeeDtos);

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

@@ -131,7 +131,7 @@
        //添加小区楼
        JSONObject businessOwnerAppUser = new JSONObject();
        businessOwnerAppUser.putAll(reqJson);
        //状态类型，10000 审核中，12000 审核成功，13000 审核失败
        //状态类型，10000 审核中， 11000 待认证 ,12000 审核成功，13000 审核失败
        businessOwnerAppUser.put("state", OwnerAppUserDto.STATE_AUDIT_SUCCESS);
        businessOwnerAppUser.put("appTypeCd", "10010");
        businessOwnerAppUser.put("appUserId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));

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

@@ -67,6 +67,7 @@
        @Java110ParamDoc(name = "link", length = 11, remark = "业主手机号"),
        @Java110ParamDoc(name = "idCard", length = 30, remark = "业主身份证号"),
        @Java110ParamDoc(name = "address", length = 512, remark = "地址"),
        @Java110ParamDoc(name = "otherAddress", length = 512, remark = "其他地址"),
        @Java110ParamDoc(name = "personType", length = 12, remark = "人员类型 P 个人 C 公司"),
        @Java110ParamDoc(name = "personRole", length = 12, remark = "人员角色 1 业主 2 租客 3 家庭成员 4 公司员工 99 其他"),
        @Java110ParamDoc(name = "sex", length = 12, remark = "性别 男 1 女 0"),

 springboot/src/main/resources/application-debugg.yml

@@ -22,6 +22,7 @@
  redis:
    database: 0
    host: 47.92.223.85
    password: hc
    port: 6379
    pool:
      max-active: 300

 springboot/src/main/resources/application.yml

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


#  docker build -t lx .