111

k94314517

2023-09-13 6252abae2d37cbf7ae4e2eb6411170f440657e12

111

 server/src/main/java/doumeemes/api/system/SystemLoginLogController.java

@@ -6,7 +6,10 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.DateUtil;
import doumeemes.dao.business.model.Backorder;
import doumeemes.dao.business.vo.WorkPlansVO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
import doumeemes.dao.system.model.SystemLoginLog;
@@ -61,6 +64,8 @@
    @ApiOperation("企业登录统计导出")
//    @RequiresPermissions("system:loginLog:query")
    public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(),"企业登录统计_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
        //ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(),"企业登录统计",null, response);
        ExcelExporter.build(CompanyLoginStatisticsVO.class).export(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(), response);
    }

}

 server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java

@@ -17,19 +17,19 @@
public class CompanyLoginStatisticsVO {

    @ApiModelProperty(value = "时间 yyyy-MM-dd")
    @ExcelColumn(name="时间",width = 6,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="时间",width = 6,align = HorizontalAlignment.CENTER,index = 0)
    private String dataDate;

    @ApiModelProperty(value = "登录企业名称")
    @ExcelColumn(name="登录企业名称",width = 6,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="登录企业名称",width = 8,align = HorizontalAlignment.CENTER,index = 1)
    private String companyName;

    @ApiModelProperty(value = "渠道")
    @ExcelColumn(name="渠道", valueMapping = "0=PC平台;1=钉钉平台;2=羚羊平台;3=EDGP平台;4=微信小程序",width = 6,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="渠道", valueMapping = "0=PC平台;1=钉钉平台;2=羚羊平台;3=EDGP平台;4=微信小程序",width = 6,align = HorizontalAlignment.CENTER,index = 2)
    private Integer orgin;

    @ApiModelProperty(value = "登录次数")
    @ExcelColumn(name="登录次数",width = 6,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="登录次数",width = 6,align = HorizontalAlignment.CENTER,index = 3)
    private Integer loginNum;

}

 server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java

@@ -6,6 +6,7 @@
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * @author 江蹄蹄
@@ -86,10 +87,9 @@
    private Integer salaryType;



    @ApiModelProperty(value = "工资单价", example = "1")
    @ExcelColumn(name="计价工资（元）",index =14,width =15, suffix ="元")
    private Integer salaryPrice;
    private BigDecimal salaryPrice;


    @ApiModelProperty(value = "设备")

 server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java

@@ -230,9 +230,13 @@
    @ExcelColumn(name="报工时长（秒）")
    private Integer duration;

    @ApiModelProperty(value = "工资结果(分)", example = "1")
    private Integer salary;

    @ApiModelProperty(value = "工资结果（元)", example = "1")
    @ExcelColumn(name="工资结果（元)")
    private Integer salary;
    private BigDecimal salaryYuan;
 
    @ApiModelProperty(value = "工资单价（元)", example = "1")
    @ExcelColumn(name="工资单价（元)")
    private Integer salaryPrice;

 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java

@@ -1766,7 +1766,7 @@
                    wreev.setDuration("-");
                }
                wreev.setSalaryType(re.getSalaryType());
                wreev.setSalaryPrice(re.getSalary());
                wreev.setSalaryPrice(re.getSalaryYuan());
                list.add(wreev);

        }

 server/src/main/resources/mappers/WorkorderRecordExtMapper.xml

@@ -549,8 +549,8 @@
  </select>
  <select id="selectListNew" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO" resultMap="WorkorderRecordExtListVO">
    SELECT
      `a`.*,
      `dmodel`.`ID` AS DMODEL_ID,
      `a`.*, ROUND(a.SALARY / 100 ,2) as salaryYuan,
       `dmodel`.`ID` AS DMODEL_ID,
      `dmodel`.`DELETED` AS DMODEL_DELETED,
      `dmodel`.`CREATE_USER` AS DMODEL_CREATE_USER,
      `dmodel`.`CREATE_TIME` AS DMODEL_CREATE_TIME,