-

admin

2024-12-31 890de8a53d6651eda49978a2e8b59bf1d866e7c5

-

 dema-main/src/main/java/com/dema/main/am/domain/AmWorkHourInfo.java

@@ -1,5 +1,6 @@
package com.dema.main.am.domain;

import java.math.BigDecimal;
import java.util.Date;

import com.dema.common.annotation.Excel;
@@ -48,7 +49,7 @@

    /** 工时 */
    @Excel(name = "工时")
    private Long workTime;
    private BigDecimal workTime;

    /** 工作详情 */
    @Excel(name = "工作详情")
@@ -135,15 +136,15 @@
    {
        return workType;
    }
    public void setWorkTime(Long workTime)
    {

    public BigDecimal getWorkTime() {
        return workTime;
    }

    public void setWorkTime(BigDecimal workTime) {
        this.workTime = workTime;
    }

    public Long getWorkTime()
    {
        return workTime;
    }
    public void setDetails(String details)
    {
        this.details = details;

 dema-main/src/main/java/com/dema/main/bs/controller/BsProjectInfoController.java

@@ -51,6 +51,9 @@
    public TableDataInfo listNoPage(BsProjectInfo bsProjectInfo)
    {
        List<BsProjectInfo> list = bsProjectInfoService.selectBsProjectInfoList(bsProjectInfo);
        for (BsProjectInfo projectInfo : list) {
            projectInfo.setProjectName(projectInfo.getProjectCode()+"-"+projectInfo.getProjectName());
        }
        return getDataTable(list);
    }