Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-11-15 f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a

Merge remote-tracking branch 'origin/dev' into cjl

 screen-api/src/main/java/com/moral/api/controller/DictController.java

@@ -32,6 +32,7 @@
                .setFileTableEnum(FileTableEnum.values())
                .setAllocationApproveEnum(AllocationApproveEnum.values())
                .setAllocationExtensionApproveEnum(AllocationExtensionApproveEnum.values())
                .setEmphasisEnum(EmphasisEnum.values())
                ;
        return ResultMessage.ok(dictionaryVo);
    }

 screen-api/src/main/java/com/moral/api/entity/Allocation.java

@@ -135,6 +135,10 @@
     * 作废理由
     */
    private String invalidReason;
    /**
     * 重点任务类型
     */
    private Integer keyPoint;


}

 screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java

New file
@@ -0,0 +1,53 @@
package com.moral.api.pojo.enums;


import lombok.Getter;

import java.util.HashMap;
import java.util.Map;

import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.exception.BusinessException;

@Getter
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EmphasisEnum implements IntegerValueEnum {


    NONE(0,"无"),

    JZDLS(1, "建筑工地落实“六个百分百”"),

    JXHGK(2, "精细化管控"),

    ;

    @EnumValue
    public  final Integer value;
    public  final String name;

    EmphasisEnum(Integer value, String name) {
        this.value = value;
        this.name = name;
    }

    private static Map<Integer, ChangeEnum> valueMap = new HashMap<>();
    static {
        for (ChangeEnum v : ChangeEnum.values()) {
            valueMap.put(v.value, v);
        }
    }
    @JsonCreator
    public static ChangeEnum getByValue(Integer value) {
        if (value == null) {
            return null;
        }
        ChangeEnum result = valueMap.get(value);
        if (result == null) {
            throw new BusinessException("枚举转换异常" + value);
        }
        return result;
    }
}

 screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java

@@ -66,6 +66,10 @@
    private Integer state;


    @ApiModelProperty(value = "重点任务类型")
    private Integer keyPoint;


    @ApiModelProperty(value = "基础附件")
    private List<FileVo> fileBaseList;


 screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java

@@ -78,6 +78,10 @@
    @ApiModelProperty(value = "基础附件")
    private List<FileVo> fileBaseList;

    @ApiModelProperty(value = "重点任务类型")
    private Integer keyPoint;


    public Allocation convert() {
        Allocation allocation = BeanConverts.convert(this, Allocation.class);
        return allocation;

 screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java

@@ -37,6 +37,7 @@
    private List<Map<String, Object>> FileTableEnum;

    private List<Map<String, Object>> AllocationExtensionApproveEnum;
    private List<Map<String, Object>> EmphasisEnum;


    public static List<Map<String, Object>> enumArray2Map(Enum[] enums) {
@@ -77,5 +78,9 @@
        this.AllocationExtensionApproveEnum = enumArray2Map(enumResult);
        return this;
    }
    public DictionaryVo setEmphasisEnum(com.moral.api.pojo.enums.EmphasisEnum[] enumResult) {
        this.EmphasisEnum = enumArray2Map(enumResult);
        return this;
    }

}

 screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java

@@ -11,6 +11,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.util.ObjectUtils;

import java.io.Serializable;
import java.util.Date;
@@ -136,6 +137,9 @@
    @ApiModelProperty(value = "流程状态")
    private List<ApproveTableListVo> approveList;

    @ApiModelProperty(value = "重点任务类型")
    private Integer keyPoint;

    @TableField(exist = false)
    private String time;

@@ -152,4 +156,8 @@
        return allocationVo;
    }

    public Integer getkeyPoint() {
        return ObjectUtils.isEmpty(keyPoint)?0:keyPoint;
    }

}

 screen-api/src/main/resources/mapper/AllocationMapper.xml

@@ -27,6 +27,7 @@
        <result column="check_time" property="checkTime" />
        <result column="state" property="state" />
        <result column="invalid_reason" property="invalidReason" />
        <result column="key_point" property="keyPoint" />
    </resultMap>

    <!-- 通用查询结果列 -->
@@ -36,7 +37,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Allocation_Column_List">
        allocation.allocation_id, allocation.allocation_num, allocation.escalation_type, allocation.escalation_time, allocation.pollute_position, allocation.unit_id, allocation.pollute_type, allocation.change_type, allocation.change_day, allocation.escalation_unit_id, allocation.escalation_name, allocation.investigation_type, allocation.problem_describe, allocation.is_change, allocation.change_describe, allocation.change_name, allocation.change_time, allocation.check_score, allocation.check_describe, allocation.check_name, allocation.check_time, allocation.state, allocation.is_del, allocation.is_invalid, allocation.invalid_reason, allocation.create_id, allocation.create_name, allocation.create_time, allocation.update_id, allocation.update_name, allocation.update_time
        allocation.allocation_id, allocation.allocation_num, allocation.escalation_type, allocation.escalation_time, allocation.pollute_position, allocation.unit_id, allocation.pollute_type, allocation.change_type, allocation.change_day, allocation.escalation_unit_id, allocation.escalation_name, allocation.investigation_type, allocation.problem_describe, allocation.is_change, allocation.change_describe, allocation.change_name, allocation.change_time, allocation.check_score, allocation.check_describe, allocation.check_name, allocation.check_time, allocation.state, allocation.is_del, allocation.is_invalid, allocation.invalid_reason, allocation.create_id, allocation.create_name, allocation.create_time, allocation.update_id, allocation.update_name, allocation.update_time,allocation.key_point
    </sql>