修复时间显示错误问题

吴学文

2019-06-03 e9258084e924433f2f7aa9f3829f856ad71f6fed

修复时间显示错误问题

 Api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java

@@ -6,6 +6,7 @@
import com.java110.common.constant.ServiceCodeConstant;
import com.java110.common.util.Assert;
import com.java110.common.util.BeanConvertUtil;
import com.java110.common.util.DateUtil;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
@@ -68,6 +69,9 @@
        if (total > 0) {
            List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class));
            List<ApiFeeDetailDataVo> feeDetails = BeanConvertUtil.covertBeanList(feeDetailDtos, ApiFeeDetailDataVo.class);

            reFreshCreateTime(feeDetails, feeDetailDtos);

            apiFeeDetailVo.setFeeDetails(feeDetails);
        }
        int row = reqJson.getInteger("row");
@@ -78,6 +82,22 @@
    }

    /**
     * 刷新 创建时间
     *
     * @param feeDetails    返回对象
     * @param feeDetailDtos 数据传输对象
     */
    private void reFreshCreateTime(List<ApiFeeDetailDataVo> feeDetails, List<FeeDetailDto> feeDetailDtos) {
        for (ApiFeeDetailDataVo feeDetailDataVo : feeDetails) {
            for (FeeDetailDto feeDetailDto : feeDetailDtos) {
                if (feeDetailDataVo.getDetailId().equals(feeDetailDto.getDetailId())) {
                    feeDetailDataVo.setCreateTime(DateUtil.getFormatTimeString(feeDetailDto.getCreateTime(), DateUtil.DATE_FORMATE_STRING_A));
                }
            }
        }
    }

    /**
     * 校验查询条件是否满足条件
     *
     * @param reqJson 包含查询条件

 Api/src/main/java/com/java110/api/listener/fee/QueryFeeListener.java

@@ -8,6 +8,7 @@
import com.java110.common.exception.ListenerExecuteException;
import com.java110.common.util.Assert;
import com.java110.common.util.BeanConvertUtil;
import com.java110.common.util.DateUtil;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
@@ -96,6 +97,8 @@
        FeeDto feeDto = feeDtos.get(0);

        ApiFeeVo apiFeeVo = BeanConvertUtil.covertBean(feeDto, ApiFeeVo.class);
        apiFeeVo.setStartTime(DateUtil.getFormatTimeString(feeDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
        apiFeeVo.setEndTime(DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));

        //查询 房屋信息
        RoomDto roomDto = new RoomDto();

 WebService/src/main/resources/components/property-pay/propertyPay.js

@@ -112,6 +112,7 @@
                            //关闭model
                            $('#propertyPayModel').modal('hide');
                            vc.emit('propertyFee','listFeeDetail',vc.component.propertyPayInfo);
                            vc.emit('viewMainFee','reloadFee',vc.component.propertyPayInfo);
                            return ;
                        }
                        vc.message(json);

 WebService/src/main/resources/components/view-main-fee/viewMainFee.js

@@ -33,6 +33,14 @@
                  vc.component.loadMainFeeInfo(_room);
            });

            vc.on('viewMainFee','reloadFee',function(_room){
                if(vc.component.mainFeeInfo.roomId != ''){
                      vc.component.loadMainFeeInfo({
                            roomId:vc.component.mainFeeInfo.roomId
                      });

                }
            });
        },
        methods:{


 java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java

@@ -25,7 +25,7 @@
    private String feeId;


    private Date createTime;
    private String createTime;


    public String getPrimeRate() {
@@ -92,11 +92,12 @@
        this.feeId = feeId;
    }

    public Date getCreateTime() {

    public String getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Date createTime) {
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
}

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

@@ -133,7 +133,8 @@
</if> 
<if test="page != -1 and page != null ">
   limit #{page}, #{row}
</if> 
</if>
        order by t.create_time desc

    </select>