优化报表

wuxw

2024-02-22 b913318ea98335a3980769f6847bbf14c57c746c

优化报表

 java110-bean/src/main/java/com/java110/dto/payFee/PayFeeDetailMonthDto.java

@@ -58,6 +58,11 @@
    private String feeName;
    private String configId;

    private String objFpcId;

    private String feeTypeCd;


    private List<FeeAttrDto> feeAttrs;

    public String getDetailMonth() {
@@ -276,4 +281,22 @@
    public void setFeeState(String feeState) {
        this.feeState = feeState;
    }

    public String getObjFpcId() {
        return objFpcId;
    }

    public void setObjFpcId(String objFpcId) {
        this.objFpcId = objFpcId;
    }

    @Override
    public String getFeeTypeCd() {
        return feeTypeCd;
    }

    @Override
    public void setFeeTypeCd(String feeTypeCd) {
        this.feeTypeCd = feeTypeCd;
    }
}

 java110-bean/src/main/java/com/java110/dto/payFee/PayFeeMonthOwnerDto.java

@@ -17,6 +17,8 @@
    private String link;
    private String payFeeTime;

    private String objFpcId;

    public String getObjName() {
        return objName;
    }
@@ -64,4 +66,12 @@
    public void setPayFeeTime(String payFeeTime) {
        this.payFeeTime = payFeeTime;
    }

    public String getObjFpcId() {
        return objFpcId;
    }

    public void setObjFpcId(String objFpcId) {
        this.objFpcId = objFpcId;
    }
}

 java110-bean/src/main/java/com/java110/po/payFee/PayFeeDetailMonthPo.java

@@ -36,6 +36,10 @@

    private String deadlineTime;

    private String objFpcId;

    private String feeTypeCd;


    public String getDetailMonth() {
        return detailMonth;
@@ -228,4 +232,20 @@
    public void setDeadlineTime(String deadlineTime) {
        this.deadlineTime = deadlineTime;
    }

    public String getObjFpcId() {
        return objFpcId;
    }

    public void setObjFpcId(String objFpcId) {
        this.objFpcId = objFpcId;
    }

    public String getFeeTypeCd() {
        return feeTypeCd;
    }

    public void setFeeTypeCd(String feeTypeCd) {
        this.feeTypeCd = feeTypeCd;
    }
}

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

@@ -9,11 +9,11 @@
        insert into pay_fee_detail_month(
        detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id,
        obj_name,obj_id,owner_name,owner_id,link,state,pay_fee_time,cur_month_time,
        fee_name,config_id
        fee_name,config_id,obj_fpc_id,fee_type_cd
        ) values (
        #{detailMonth},#{detailYear},#{detailId},#{receivableAmount},#{discountAmount},#{remark},#{receivedAmount},#{communityId},#{feeId},#{monthId},
        #{objName},#{objId},#{ownerName},#{ownerId},#{link},#{state},#{payFeeTime},#{curMonthTime},
        #{feeName},#{configId}
        #{feeName},#{configId},#{objFpcId},#{feeTypeCd}
        )
    </insert>

@@ -22,14 +22,14 @@
        insert into pay_fee_detail_month(
        detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id,
        obj_name,obj_id,owner_name,owner_id,link,state,pay_fee_time,cur_month_time,
        fee_name,config_id,deadline_time
        fee_name,config_id,deadline_time,obj_fpc_id,fee_type_cd
        ) values
        <foreach collection="payFeeDetailMonthPos" item="item" index="index" separator=",">
            (
            #{item.detailMonth},#{item.detailYear},#{item.detailId},#{item.receivableAmount},#{item.discountAmount},
            #{item.remark},#{item.receivedAmount},#{item.communityId},#{item.feeId},#{item.monthId},
            #{item.objName},#{item.objId},#{item.ownerName},#{item.ownerId},#{item.link},#{item.state},#{item.payFeeTime},#{item.curMonthTime},
            #{item.feeName},#{item.configId},#{item.deadlineTime}
            #{item.feeName},#{item.configId},#{item.deadlineTime},#{item.objFpcId},#{item.feeTypeCd}
            )
        </foreach>
    </insert>

 java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml

@@ -832,8 +832,7 @@
        from pay_fee_detail_month t
        INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
        inner join pay_fee_config pfc1 on pfc1.config_id = t.config_id and pfc1.status_cd = '0'
        where t.obj_id = a.obj_id
        and t.status_cd = '0'
        where  t.status_cd = '0'
        and t.detail_id = '-1'
        and t.community_id= a.community_id
        and t.obj_id = a.obj_id

 java110-interface/src/main/java/com/java110/intf/fee/IPayFeeDetailMonthInnerServiceSMO.java

@@ -25,17 +25,17 @@


    @RequestMapping(value = "/savePayFeeDetailMonth", method = RequestMethod.POST)
    public int savePayFeeDetailMonth(@RequestBody PayFeeDetailMonthPo payFeeDetailMonthPo);
     int savePayFeeDetailMonth(@RequestBody PayFeeDetailMonthPo payFeeDetailMonthPo);

    @RequestMapping(value = "/savePayFeeDetailMonths", method = RequestMethod.POST)
    public int savePayFeeDetailMonths(@RequestBody List<PayFeeDetailMonthPo> payFeeDetailMonthPos);
     int savePayFeeDetailMonths(@RequestBody List<PayFeeDetailMonthPo> payFeeDetailMonthPos);


    @RequestMapping(value = "/updatePayFeeDetailMonth", method = RequestMethod.POST)
    public int updatePayFeeDetailMonth(@RequestBody  PayFeeDetailMonthPo payFeeDetailMonthPo);
     int updatePayFeeDetailMonth(@RequestBody  PayFeeDetailMonthPo payFeeDetailMonthPo);

    @RequestMapping(value = "/deletePayFeeDetailMonth", method = RequestMethod.POST)
    public int deletePayFeeDetailMonth(@RequestBody  PayFeeDetailMonthPo payFeeDetailMonthPo);
     int deletePayFeeDetailMonth(@RequestBody  PayFeeDetailMonthPo payFeeDetailMonthPo);

    /**
     * <p>查询小区楼信息</p>

 service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java

@@ -2,15 +2,22 @@

import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.payFee.PayFeeDetailMonthDto;
import com.java110.dto.payFee.PayFeeMonthOwnerDto;
import com.java110.dto.room.RoomDto;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IPayFeeDetailMonthInnerServiceSMO;
import com.java110.intf.store.IContractInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.po.payFee.PayFeeDetailMonthPo;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -22,6 +29,12 @@

    @Autowired
    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;

    @Autowired
    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;

    @Autowired
    private IContractInnerServiceSMO contractInnerServiceSMOImpl;

    @Autowired
    private IComputeFeeSMO computeFeeSMOImpl;
@@ -38,6 +51,39 @@
        payFeeMonthOwnerDto.setLink(FeeAttrDto.getFeeAttrValue(feeDto, FeeAttrDto.SPEC_CD_OWNER_LINK));
        payFeeMonthOwnerDto.setObjName(FeeAttrDto.getFeeAttrValue(feeDto, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME));
        payFeeMonthOwnerDto.setObjId(feeDto.getPayerObjId());
        payFeeMonthOwnerDto.setObjFpcId("-1");

        if(StringUtil.isEmpty(feeDto.getPayerObjId())){
            return payFeeMonthOwnerDto;
        }

        // 如果是房屋
        if(FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())){

            RoomDto roomDto = new RoomDto();
            roomDto.setRoomId(feeDto.getPayerObjId());
            roomDto.setCommunityId(feeDto.getCommunityId());
            List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
            if(!ListUtil.isNull(roomDtos)){
                payFeeMonthOwnerDto.setObjFpcId(roomDtos.get(0).getFloorId());
            }
        }else if(FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())){

            OwnerCarDto ownerCarDto = new OwnerCarDto();
            ownerCarDto.setMemberId(feeDto.getPayerObjId());
            ownerCarDto.setCommunityId(feeDto.getCommunityId());
            List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
            if(!ListUtil.isNull(ownerCarDtos)){
                payFeeMonthOwnerDto.setObjFpcId(ownerCarDtos.get(0).getPaId());
            }
        }else {
            ContractDto contractDto = new ContractDto();
            contractDto.setContractId(feeDto.getPayerObjId());
            List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
            if(!ListUtil.isNull(contractDtos)){
                payFeeMonthOwnerDto.setObjFpcId(contractDtos.get(0).getContractType());
            }
        }
        return payFeeMonthOwnerDto;
    }

@@ -332,6 +378,11 @@
        tmpPayFeeDetailMonthPo.setState("W"); // todo 这里暂时写死，目前用不到，算是预留字段
        tmpPayFeeDetailMonthPo.setFeeName(feeDto.getFeeName());
        tmpPayFeeDetailMonthPo.setConfigId(feeDto.getConfigId());
        tmpPayFeeDetailMonthPo.setFeeTypeCd(feeDto.getFeeTypeCd());

        //todo 查询obj_fpc_id
        tmpPayFeeDetailMonthPo.setObjFpcId(payFeeMonthOwnerDto.getObjFpcId());

        payFeeDetailMonthPos.add(tmpPayFeeDetailMonthPo);

    }

 service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImplV1.txt

File was deleted