添加离职字段

lin

2024-03-16 f81d793cd9aa250b427b2f5e3445fb4edefcdad3

添加离职字段

 src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java

@@ -136,7 +136,7 @@
    /** 入职时间 */
    @ApiModelProperty(value = "入职时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField(value = "employment_time",fill = FieldFill.INSERT)
    @TableField(value = "employment_time")
    private Date employmentTime;

    /** 离职时间 */
@@ -145,5 +145,9 @@
    @TableField("resignation_time")
    private Date resignationTime;

    /** 是离职 1：否 2：是 */
    @ApiModelProperty(value = "是离职 1：否 2：是", example = "")
    @TableField("resignation_flag")
    private Integer resignationFlag;

}

 src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml

@@ -57,12 +57,8 @@
                #{placePractitioner.employer}
            </if>

            <if test="placePractitioner.resignation != null  and placePractitioner.resignation == 1">
                and jpp.resignation_time is  null
            </if>

            <if test="placePractitioner.resignation != null  and placePractitioner.resignation == 2">
                and jpp.resignation_time is not null
            <if test="placePractitioner.resignationFlag != null  and placePractitioner.resignationFlag !='' ">
                and jpp.resignation_flag = #{placePractitioner.resignationFlag}
            </if>

            <if test="placePractitioner.employerImg != null  and placePractitioner.employerImg != ''">and
@@ -116,8 +112,7 @@
    </resultMap>

    <sql id="selectJczzPlacePractitioner">
        select
            id,
        select id,
            place_id,
            name,
            telephone,
@@ -137,8 +132,7 @@
            ano_type_name,
            employment_time,
            resignation_time
        from
            jczz_place_practitioner
        from jczz_place_practitioner
    </sql>

    <select id="selectPlaceCountByType" parameterType="long" resultType="integer">
@@ -159,7 +153,7 @@
                and jc.category_no in (180202,180201)
            </if>
            and jpp.is_deleted = 0
            and jpp.resignation_time is  null
            and jpp.resignation_flag = 1
        </where>
    </select>


 src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java

@@ -40,7 +40,4 @@
    @ApiModelProperty(value = "标签类型", example = "")
    private String categoryName;

    @ApiModelProperty(value = "1：未辞职 2：已辞职", example = "")
    private Integer resignation;

}