diff --git a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index d5a9402..38309e3 100644 --- a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -68,7 +68,6 @@ public class SysUser extends BaseEntity /** 手机号码 */ @Size(max = 11, message = "手机号码长度不能超过11个字符") - @Pattern(regexp = RegexpUtils.MOBILE_PHONE_REGEXP, message = "手机号格式不正确") private String phonenumber; /** 用户性别 */ diff --git a/kdwebapi.properties b/kdwebapi.properties index bf5f5e9..8bd4b68 100644 --- a/kdwebapi.properties +++ b/kdwebapi.properties @@ -1,9 +1,9 @@ # \u8D26\u5957ID -X-KDApi-AcctID=6708ecf34e20aa +X-KDApi-AcctID=64be8636aa46e6 # AppId -X-KDApi-AppID=293412_54doTclO2rHWR51FX/6sVZSLzsT8WprE +X-KDApi-AppID=306486_6c6uT6kP2MnY7fWt1/xL3dUu6q3Z1Lkv # \u79D8\u94A5 -X-KDApi-AppSec=a30d9593a0d64c80898003447bfb3c2c +X-KDApi-AppSec=d196a801404242aabbf54a7b045ce1fd # \u7528\u6237\u540D X-KDApi-UserName=\u521B\u7279\u7269\u8054 # \u8BED\u79CD diff --git a/ruoyi-service/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProd.java b/ruoyi-service/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProd.java index c2f366b..1b5ce6f 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProd.java +++ b/ruoyi-service/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProd.java @@ -1,13 +1,15 @@ package com.ruoyi.yh.reportUserProd.domain; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.math.BigDecimal; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * 员工产量对象 bst_report_user_prod @@ -29,7 +31,7 @@ public class ReportUserProd extends BaseEntity @NotNull(message = "员工不允许为空") private Long userId; - @Excel(name = "产量") + @Excel(name = "产量", sort = 11, scale = 2) @ApiModelProperty("产量") @NotNull(message = "产量不允许为空") @Min(value = 0, message = "产量不允许小于0") diff --git a/ruoyi-service/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdVO.java b/ruoyi-service/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdVO.java index 12ff395..f251753 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdVO.java +++ b/ruoyi-service/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdVO.java @@ -1,13 +1,14 @@ package com.ruoyi.yh.reportUserProd.domain; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.constant.DictType; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.math.BigDecimal; import java.time.LocalDate; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.constant.DictType; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + /** * @author wjh * 2024/11/2 @@ -15,61 +16,61 @@ import java.time.LocalDate; @Data public class ReportUserProdVO extends ReportUserProd { - @Excel(name = "员工") + @Excel(name = "员工", sort = 9) @ApiModelProperty("用户名称") private String userName; - @Excel(name = "员工编号") + @Excel(name = "员工编号", sort = 10) @ApiModelProperty("员工编号") private String userNo; - @Excel(name = "报表日期", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 2) @ApiModelProperty("报表日期") private LocalDate reportDate; @ApiModelProperty("报表状态") - @Excel(name = "报表状态", dictType = DictType.REPORT_STATUS) + @Excel(name = "状态", dictType = DictType.REPORT_STATUS, sort = 3) private String reportStatus; - @Excel(name = "工序") + @Excel(name = "工序", sort = 4) @ApiModelProperty("工序名称") private String priceName; - @Excel(name = "单位") + @Excel(name = "单位", sort = 11) @ApiModelProperty("工序单位") private String priceUnit; - @Excel(name = "单价(元)") + @Excel(name = "单价(元)", sort = 10, suffix = " 元") @ApiModelProperty("工序单价") private BigDecimal pricePrice; @ApiModelProperty("报表ID") private Long reportId; - @Excel(name = "工资(元)") + @Excel(name = "工资", sort = 12, scale = 1, suffix = " 元") @ApiModelProperty("工资") private BigDecimal totalPrice; - @Excel(name = "部门") + @Excel(name = "部门", sort = 1) @ApiModelProperty("部门名称") private String deptName; @ApiModelProperty("部门ID") private String deptId; - @Excel(name = "工序代码") + @Excel(name = "工序代码", sort = 5) @ApiModelProperty("工序代码") private String priceCode; - @Excel(name = "工序类别") + @Excel(name = "类别", sort = 6) @ApiModelProperty("工序类别") private String priceCategory; - @Excel(name = "工序大小") + @Excel(name = "大小", sort = 7) @ApiModelProperty("工序大小") private String priceSize; - @Excel(name = "工序图案") + @Excel(name = "图案", sort = 8) @ApiModelProperty("工序图案") private String pricePattern; } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/LogImportController.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/LogImportController.java index 8889ada..48411bc 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/yh/LogImportController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/LogImportController.java @@ -82,8 +82,6 @@ public class LogImportController extends BaseController public AjaxResult getInfo(@PathVariable("logId") Long logId) { LogImportVO detail = logImportService.selectLogImportByLogId(logId); - List list = Collections.singletonList(detail); - logImportAssembler.assembleStatistics(list); return success(detail); }