Merge branch 'local_20221014' into haucheng_panzhihua

yanghui

2022-10-22 74118d12bd9996846e7d0a05f95ea8e2d4ac24c1

Merge branch 'local_20221014' into haucheng_panzhihua

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventTransferRecordMapper.java

@@ -41,5 +41,5 @@
    List<ComEventTransferRecord> listByComEventTransferRecord(@Param("comEventTransferRecord") ComEventTransferRecord comEventTransferRecord);


    int insertSelective(ComEventTransferRecord comEventTransferRecord);
    int insertSelective(@Param("comEventTransferRecord") ComEventTransferRecord comEventTransferRecord);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventTransferRecordMapper.xml

@@ -46,157 +46,157 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.panzhihua.service_community.entity.ComEventTransferRecord">
    insert into com_sanshuo_event_transfer_record
    <trim prefix="(" suffix=")" suffixOverrides=",">
        <if test="id != null">
        <if test="comEventTransferRecord.id != null">
            id,
        </if>
        <if test="eventId != null">
        <if test="comEventTransferRecord.eventId != null">
            event_id,
        </if>
        <if test="parentsTransferEventId != null">
        <if test="comEventTransferRecord.parentsTransferEventId != null">
            parents_transfer_event_id,
        </if>
        <if test="fromType != null">
        <if test="comEventTransferRecord.fromType != null">
            from_type,
        </if>
        <if test="fromId != null">
        <if test="comEventTransferRecord.fromId != null">
            from_id,
        </if>
        <if test="fromName != null">
        <if test="comEventTransferRecord.fromName != null">
            from_name,
        </if>
        <if test="fromUserId != null">
        <if test="comEventTransferRecord.fromUserId != null">
            from_user_id,
        </if>
        <if test="toType != null">
        <if test="comEventTransferRecord.toType != null">
            to_type,
        </if>
        <if test="toId != null">
        <if test="comEventTransferRecord.toId != null">
            to_id,
        </if>
        <if test="toName != null">
        <if test="comEventTransferRecord.toName != null">
            to_name,
        </if>
        <if test="toUserId != null">
        <if test="comEventTransferRecord.toUserId != null">
            to_user_id,
        </if>
        <if test="save != null">
        <if test="comEventTransferRecord.save != null">
            `save`,
        </if>
        <if test="processResult != null">
        <if test="comEventTransferRecord.processResult != null">
            process_result,
        </if>
        <if test="processResultData != null">
        <if test="comEventTransferRecord.processResultData != null">
            process_result_data,
        </if>
        <if test="processDate != null">
        <if test="comEventTransferRecord.processDate != null">
            process_date,
        </if>
        <if test="processBy != null">
        <if test="comEventTransferRecord.processBy != null">
            process_by,
        </if>
        <if test="processByName != null">
        <if test="comEventTransferRecord.processByName != null">
            process_by_name,
        </if>
        <if test="processType != null">
        <if test="comEventTransferRecord.processType != null">
            process_type,
        </if>
        <if test="createAt != null">
        <if test="comEventTransferRecord.createAt != null">
            create_at,
        </if>
        <if test="specialistId != null">
        <if test="comEventTransferRecord.specialistId != null">
            specialist_id,
        </if>
        <if test="specialistOrg != null">
        <if test="comEventTransferRecord.specialistOrg != null">
            specialist_org,
        </if>
        <if test="specialistLevel != null">
        <if test="comEventTransferRecord.specialistLevel != null">
            specialist_level,
        </if>
        <if test="specialistName != null">
        <if test="comEventTransferRecord.specialistName != null">
            specialist_name,
        </if>
        <if test="eventResult != null">
        <if test="comEventTransferRecord.eventResult != null">
            event_result,
        </if>
        <if test="eventStatus != null">
        <if test="comEventTransferRecord.eventStatus != null">
            event_status,
        </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
        <if test="id != null">
            #{id,jdbcType=BIGINT},
        <if test="comEventTransferRecord.id != null">
            #{comEventTransferRecord.id,jdbcType=BIGINT},
        </if>
        <if test="eventId != null">
            #{eventId,jdbcType=BIGINT},
        <if test="comEventTransferRecord.eventId != null">
            #{comEventTransferRecord.eventId,jdbcType=BIGINT},
        </if>
        <if test="parentsTransferEventId != null">
            #{parentsTransferEventId,jdbcType=BIGINT},
        <if test="comEventTransferRecord.parentsTransferEventId != null">
            #{comEventTransferRecord.parentsTransferEventId,jdbcType=BIGINT},
        </if>
        <if test="fromType != null">
            #{fromType,jdbcType=TINYINT},
        <if test="comEventTransferRecord.fromType != null">
            #{comEventTransferRecord.fromType,jdbcType=TINYINT},
        </if>
        <if test="fromId != null">
            #{fromId,jdbcType=BIGINT},
        <if test="comEventTransferRecord.fromId != null">
            #{comEventTransferRecord.fromId,jdbcType=BIGINT},
        </if>
        <if test="fromName != null">
            #{fromName,jdbcType=VARCHAR},
        <if test="comEventTransferRecord.fromName != null">
            #{comEventTransferRecord.fromName,jdbcType=VARCHAR},
        </if>
        <if test="fromUserId != null">
            #{fromUserId,jdbcType=BIGINT},
        <if test="comEventTransferRecord.fromUserId != null">
            #{comEventTransferRecord.fromUserId,jdbcType=BIGINT},
        </if>
        <if test="toType != null">
            #{toType,jdbcType=TINYINT},
        <if test="comEventTransferRecord.toType != null">
            #{comEventTransferRecord.toType,jdbcType=TINYINT},
        </if>
        <if test="toId != null">
            #{toId,jdbcType=BIGINT},
        <if test="comEventTransferRecord.toId != null">
            #{comEventTransferRecord.toId,jdbcType=BIGINT},
        </if>
        <if test="toName != null">
            #{toName,jdbcType=VARCHAR},
        <if test="comEventTransferRecord.toName != null">
            #{comEventTransferRecord.toName,jdbcType=VARCHAR},
        </if>
        <if test="toUserId != null">
            #{toUserId,jdbcType=BIGINT},
        <if test="comEventTransferRecord.toUserId != null">
            #{comEventTransferRecord.toUserId,jdbcType=BIGINT},
        </if>
        <if test="save != null">
            #{save,jdbcType=BIT},
        <if test="comEventTransferRecord.save != null">
            #{comEventTransferRecord.save,jdbcType=BIT},
        </if>
        <if test="processResult != null">
            #{processResult,jdbcType=VARCHAR},
        <if test="comEventTransferRecord.processResult != null">
            #{comEventTransferRecord.processResult,jdbcType=VARCHAR},
        </if>
        <if test="processResultData != null">
            #{processResultData,jdbcType=VARCHAR},
        <if test="comEventTransferRecord.processResultData != null">
            #{comEventTransferRecord.processResultData,jdbcType=VARCHAR},
        </if>
        <if test="processDate != null">
            #{processDate,jdbcType=TIMESTAMP},
        <if test="comEventTransferRecord.processDate != null">
            #{comEventTransferRecord.processDate,jdbcType=TIMESTAMP},
        </if>
        <if test="processBy != null">
            #{processBy,jdbcType=BIGINT},
        <if test="comEventTransferRecord.processBy != null">
            #{comEventTransferRecord.processBy,jdbcType=BIGINT},
        </if>
        <if test="processByName != null">
            #{processByName,jdbcType=VARCHAR},
        <if test="comEventTransferRecord.processByName != null">
            #{comEventTransferRecord.processByName,jdbcType=VARCHAR},
        </if>
        <if test="processType != null">
            #{processType,jdbcType=INTEGER},
        <if test="comEventTransferRecord.processType != null">
            #{comEventTransferRecord.processType,jdbcType=INTEGER},
        </if>
        <if test="createAt != null">
            #{createAt,jdbcType=TIMESTAMP},
        <if test="comEventTransferRecord.createAt != null">
            #{comEventTransferRecord.createAt,jdbcType=TIMESTAMP},
        </if>
        <if test="specialistId != null">
            #{specialistId,jdbcType=BIGINT},
        <if test="comEventTransferRecord.specialistId != null">
            #{comEventTransferRecord.specialistId,jdbcType=BIGINT},
        </if>
        <if test="specialistOrg != null">
            #{specialistOrg,jdbcType=VARCHAR},
        <if test="comEventTransferRecord.specialistOrg != null">
            #{comEventTransferRecord.specialistOrg,jdbcType=VARCHAR},
        </if>
        <if test="specialistLevel != null">
            #{specialistLevel,jdbcType=VARCHAR},
        <if test="comEventTransferRecord.specialistLevel != null">
            #{comEventTransferRecord.specialistLevel,jdbcType=VARCHAR},
        </if>
        <if test="specialistName != null">
            #{specialistName,jdbcType=VARCHAR},
        <if test="comEventTransferRecord.specialistName != null">
            #{comEventTransferRecord.specialistName,jdbcType=VARCHAR},
        </if>
        <if test="eventResult != null">
            #{eventResult,jdbcType=TINYINT},
        <if test="comEventTransferRecord.eventResult != null">
            #{comEventTransferRecord.eventResult,jdbcType=TINYINT},
        </if>
        <if test="eventStatus != null">
            #{eventStatus,jdbcType=TINYINT},
        <if test="comEventTransferRecord.eventStatus != null">
            #{comEventTransferRecord.eventStatus,jdbcType=TINYINT},
        </if>
    </trim>
</insert>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java

@@ -46,8 +46,8 @@
        ComEvent comEvent=new ComEvent();
     //   comEvent.setCreateBy(1l);
        comEvent.setKeyword("17345059081");
        R data = comEventService.pageByComEvent(comEvent, pagination);
        log.info(JSONObject.toJSONString(data));
//        R data = comEventService.pageByComEvent(comEvent, pagination);
//        log.info(JSONObject.toJSONString(data));
    }

    @Test
@@ -96,8 +96,8 @@

    @Test
    void calculate() {
        R data = comEventService.calculate();
        log.info(JSONObject.toJSONString(data));
//        R data = comEventService.calculate();
//        log.info(JSONObject.toJSONString(data));
    }

    @Test