Merge remote-tracking branch 'origin/zypms' into zypms

mrzhssss

2022-09-06 8745b76acfd45eadd720d7ce6d87c77e6e0682b9

 src/main/java/zy/cloud/wms/manager/entity/Item.java

@@ -149,6 +149,7 @@
    private String type;



    @TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date realStartTime;
@@ -400,6 +401,17 @@
//            null    // 备注
//    );

//    public String getProgressRate$(){
//        ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
//        ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>()
//                .eq("id", this.progressRate));
//        if (!Cools.isEmpty(id)) {
//            return id.getStatusName();
//        }
//
//        return "";
//    }

    public String getProjectStatus$(){
        ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
        ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));