Merge branch 'dev'

xiangpei

2025-03-03 c9b3df7acb4ed5fecb16b9ca3c90e0341fbfe7e3

 business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java

@@ -1,7 +1,9 @@
package com.ycl.domain.form;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
import com.ycl.common.utils.StringUtils;
import com.ycl.system.domain.base.AbsForm;
import com.ycl.domain.entity.ProjectEngineering;
import com.ycl.system.domain.base.AbsUUIDForm;
@@ -44,10 +46,25 @@
    @ApiModelProperty("状态")
    private String status;

    @ApiModelProperty("主管部门")
    private Long department;

    @ApiModelProperty("业主单位")
    private Long unit;

    @ApiModelProperty("年份")
    private String year;

    @ApiModelProperty("父工程")
    private String parent;

    public static ProjectEngineering getEntityByForm(@NonNull ProjectEngineeringForm form, ProjectEngineering entity) {
        if(entity == null) {
          entity = new ProjectEngineering();
        }
        if (StringUtils.isEmpty(form.parent)){
            form.setParent("0");
        }
        BeanUtils.copyProperties(form, entity);
        return entity;
    }