优化代码

java110

2021-04-19 721445643caa46b35745e4a11cb10a1857b39c80

优化代码

 java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java

@@ -36,6 +36,8 @@
    private String stateName;
    private String curYear;
    private String configId;
    private String feeName;
    private String importFeeName;


    public String getPrimeRate() {
@@ -190,4 +192,20 @@
    public void setConfigId(String configId) {
        this.configId = configId;
    }

    public String getFeeName() {
        return feeName;
    }

    public void setFeeName(String feeName) {
        this.feeName = feeName;
    }

    public String getImportFeeName() {
        return importFeeName;
    }

    public void setImportFeeName(String importFeeName) {
        this.importFeeName = importFeeName;
    }
}

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

@@ -109,11 +109,11 @@
        t.receivable_amount,t.receivable_amount receivableAmount,
        t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
        t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId ,t.create_time createTime,
        t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime
        t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value` importFeeName,pfc.fee_name feeName
        from pay_fee_detail t
        <if test="configId != null and configId != ''">
            inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
        </if>
        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'
        left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
        <if test="ownerId != null and ownerId != ''">
            left join pay_fee_attrs pfa on pfa.fee_id = t.fee_id and pfa.spec_cd = '390007' and pfa.status_cd = '0'
        </if>

 service-fee/src/main/java/com/java110/fee/smo/impl/FeeDetailInnerServiceSMOImpl.java

@@ -9,6 +9,7 @@
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -45,9 +46,22 @@

        List<FeeDetailDto> feeDetails = BeanConvertUtil.covertBeanList(feeDetailServiceDaoImpl.getFeeDetailInfo(BeanConvertUtil.beanCovertMap(feeDetailDto)), FeeDetailDto.class);

        refreshFeeDetail(feeDetails);
        return feeDetails;
    }

    private void refreshFeeDetail(List<FeeDetailDto> feeDetails) {
        if(feeDetails == null || feeDetails.size() < 1){
            return ;
        }

        for(FeeDetailDto feeDetailDto : feeDetails){
            if(!StringUtil.isEmpty(feeDetailDto.getImportFeeName())){
                feeDetailDto.setFeeName(feeDetailDto.getImportFeeName());
            }
        }
    }


    @Override
    public int queryFeeDetailsCount(@RequestBody FeeDetailDto feeDetailDto) {