From caf57c76275bae0a2d6e81c27bdb0f4f77b7739a Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期二, 06 八月 2024 10:49:04 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java | 109 ++++++++++++++++++ pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeWorkOrderMapper.java | 26 ++++ pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml | 186 +++++++++++++++++++++++++++++++ 3 files changed, 321 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeWorkOrderMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeWorkOrderMapper.java new file mode 100644 index 0000000..050176b --- /dev/null +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeWorkOrderMapper.java @@ -0,0 +1,26 @@ +package com.dy.pipIrrGlobal.daoOp; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author :WuZeYu + * @Date :2024/8/6 8:47 + * @LastEditTime :2024/8/6 8:47 + * @Description + */ +@Mapper +public interface OpeWorkOrderMapper extends BaseMapper<OpeWorkOrder> { + int deleteByPrimaryKey(Long id); + + int insert(OpeWorkOrder record); + + int insertSelective(OpeWorkOrder record); + + OpeWorkOrder selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(OpeWorkOrder record); + + int updateByPrimaryKey(OpeWorkOrder record); +} \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java new file mode 100644 index 0000000..697722e --- /dev/null +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java @@ -0,0 +1,109 @@ +package com.dy.pipIrrGlobal.pojoOp; + +import com.alibaba.fastjson2.annotation.JSONField; +import com.alibaba.fastjson2.writer.ObjectWriterImplToString; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.dy.common.po.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author :WuZeYu + * @Date :2024/8/6 8:47 + * @LastEditTime :2024/8/6 8:47 + * @Description + */ +/** + * 宸ュ崟琛� + */ +@TableName(value="ope_feedback", autoResultMap = true) +@Data +@ToString +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "宸ュ崟琛�") +public class OpeWorkOrder implements BaseEntity { + /** + * 涓婚敭 + */ + @JSONField(serializeUsing= ObjectWriterImplToString.class) + @TableId(type = IdType.INPUT) + private Long id; + + /** + * 娲惧崟浜篒D + */ + @JSONField(serializeUsing= ObjectWriterImplToString.class) + @NotNull + private Long dispatcher; + + /** + * 宸℃鍛業D + */ + @JSONField(serializeUsing= ObjectWriterImplToString.class) + @NotNull + private Long inspector; + + /** + * 浠诲姟绫诲瀷;1-婕忔崯澶勭悊锛�2-鎶ヨ澶勭悊锛�3-鍙嶉澶勭悊锛�4-鍏朵粬 + */ + private Byte taskType; + + /** + * 浠诲姟鍐呭 + */ + @NotBlank + private String taskContent; + + /** + * 瀹屾垚鏍囧噯 + */ + private String completeCriteria; + + /** + * 瑕佹眰瀹屾垚鏃堕棿;绮剧‘鍒板垎 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deadLine; + + /** + * 娲惧崟鏃堕棿 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dispatchTime; + + /** + * 澶勭悊缁撴灉;1-瀹屾垚锛�2-鏈畬鎴� + */ + private Byte taskResult; + + /** + * 缁撴灉鐓х墖 + */ + private String photos; + + /** + * 瀹屽伐鏃堕棿 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date completeTime; + + /** + * 閫昏緫鍒犻櫎鏍囪瘑;鏈垹闄や负0锛屽凡鍒犻櫎涓哄垹闄ゆ椂闂� + */ + private Long deleted; + + +} \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml new file mode 100644 index 0000000..d5c23ed --- /dev/null +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.dy.pipIrrGlobal.daoOp.OpeWorkOrderMapper"> + <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder"> + <!--@mbg.generated--> + <!--@Table ope_work_order--> + <id column="id" jdbcType="BIGINT" property="id" /> + <result column="dispatcher" jdbcType="BIGINT" property="dispatcher" /> + <result column="inspector" jdbcType="BIGINT" property="inspector" /> + <result column="task_type" jdbcType="TINYINT" property="taskType" /> + <result column="task_content" jdbcType="VARCHAR" property="taskContent" /> + <result column="complete_criteria" jdbcType="VARCHAR" property="completeCriteria" /> + <result column="dead_line" jdbcType="TIMESTAMP" property="deadLine" /> + <result column="dispatch_time" jdbcType="TIMESTAMP" property="dispatchTime" /> + <result column="task_result" jdbcType="TINYINT" property="taskResult" /> + <result column="photos" jdbcType="VARCHAR" property="photos" /> + <result column="complete_time" jdbcType="TIMESTAMP" property="completeTime" /> + <result column="deleted" jdbcType="BIGINT" property="deleted" /> + </resultMap> + <sql id="Base_Column_List"> + <!--@mbg.generated--> + id, dispatcher, inspector, task_type, task_content, complete_criteria, dead_line, + dispatch_time, task_result, photos, complete_time, deleted + </sql> + <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> + <!--@mbg.generated--> + select + <include refid="Base_Column_List" /> + from ope_work_order + where id = #{id,jdbcType=BIGINT} + </select> + <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> + <!--@mbg.generated--> + delete from ope_work_order + where id = #{id,jdbcType=BIGINT} + </delete> + <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder"> + <!--@mbg.generated--> + insert into ope_work_order (id, dispatcher, inspector, + task_type, task_content, complete_criteria, + dead_line, dispatch_time, task_result, + photos, complete_time, deleted + ) + values (#{id,jdbcType=BIGINT}, #{dispatcher,jdbcType=BIGINT}, #{inspector,jdbcType=BIGINT}, + #{taskType,jdbcType=TINYINT}, #{taskContent,jdbcType=VARCHAR}, #{completeCriteria,jdbcType=VARCHAR}, + #{deadLine,jdbcType=TIMESTAMP}, #{dispatchTime,jdbcType=TIMESTAMP}, #{taskResult,jdbcType=TINYINT}, + #{photos,jdbcType=VARCHAR}, #{completeTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIGINT} + ) + </insert> + <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder"> + <!--@mbg.generated--> + insert into ope_work_order + <trim prefix="(" suffix=")" suffixOverrides=","> + <if test="id != null"> + id, + </if> + <if test="dispatcher != null"> + dispatcher, + </if> + <if test="inspector != null"> + inspector, + </if> + <if test="taskType != null"> + task_type, + </if> + <if test="taskContent != null"> + task_content, + </if> + <if test="completeCriteria != null"> + complete_criteria, + </if> + <if test="deadLine != null"> + dead_line, + </if> + <if test="dispatchTime != null"> + dispatch_time, + </if> + <if test="taskResult != null"> + task_result, + </if> + <if test="photos != null"> + photos, + </if> + <if test="completeTime != null"> + complete_time, + </if> + <if test="deleted != null"> + deleted, + </if> + </trim> + <trim prefix="values (" suffix=")" suffixOverrides=","> + <if test="id != null"> + #{id,jdbcType=BIGINT}, + </if> + <if test="dispatcher != null"> + #{dispatcher,jdbcType=BIGINT}, + </if> + <if test="inspector != null"> + #{inspector,jdbcType=BIGINT}, + </if> + <if test="taskType != null"> + #{taskType,jdbcType=TINYINT}, + </if> + <if test="taskContent != null"> + #{taskContent,jdbcType=VARCHAR}, + </if> + <if test="completeCriteria != null"> + #{completeCriteria,jdbcType=VARCHAR}, + </if> + <if test="deadLine != null"> + #{deadLine,jdbcType=TIMESTAMP}, + </if> + <if test="dispatchTime != null"> + #{dispatchTime,jdbcType=TIMESTAMP}, + </if> + <if test="taskResult != null"> + #{taskResult,jdbcType=TINYINT}, + </if> + <if test="photos != null"> + #{photos,jdbcType=VARCHAR}, + </if> + <if test="completeTime != null"> + #{completeTime,jdbcType=TIMESTAMP}, + </if> + <if test="deleted != null"> + #{deleted,jdbcType=BIGINT}, + </if> + </trim> + </insert> + <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder"> + <!--@mbg.generated--> + update ope_work_order + <set> + <if test="dispatcher != null"> + dispatcher = #{dispatcher,jdbcType=BIGINT}, + </if> + <if test="inspector != null"> + inspector = #{inspector,jdbcType=BIGINT}, + </if> + <if test="taskType != null"> + task_type = #{taskType,jdbcType=TINYINT}, + </if> + <if test="taskContent != null"> + task_content = #{taskContent,jdbcType=VARCHAR}, + </if> + <if test="completeCriteria != null"> + complete_criteria = #{completeCriteria,jdbcType=VARCHAR}, + </if> + <if test="deadLine != null"> + dead_line = #{deadLine,jdbcType=TIMESTAMP}, + </if> + <if test="dispatchTime != null"> + dispatch_time = #{dispatchTime,jdbcType=TIMESTAMP}, + </if> + <if test="taskResult != null"> + task_result = #{taskResult,jdbcType=TINYINT}, + </if> + <if test="photos != null"> + photos = #{photos,jdbcType=VARCHAR}, + </if> + <if test="completeTime != null"> + complete_time = #{completeTime,jdbcType=TIMESTAMP}, + </if> + <if test="deleted != null"> + deleted = #{deleted,jdbcType=BIGINT}, + </if> + </set> + where id = #{id,jdbcType=BIGINT} + </update> + <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder"> + <!--@mbg.generated--> + update ope_work_order + set dispatcher = #{dispatcher,jdbcType=BIGINT}, + inspector = #{inspector,jdbcType=BIGINT}, + task_type = #{taskType,jdbcType=TINYINT}, + task_content = #{taskContent,jdbcType=VARCHAR}, + complete_criteria = #{completeCriteria,jdbcType=VARCHAR}, + dead_line = #{deadLine,jdbcType=TIMESTAMP}, + dispatch_time = #{dispatchTime,jdbcType=TIMESTAMP}, + task_result = #{taskResult,jdbcType=TINYINT}, + photos = #{photos,jdbcType=VARCHAR}, + complete_time = #{completeTime,jdbcType=TIMESTAMP}, + deleted = #{deleted,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} + </update> +</mapper> \ No newline at end of file -- Gitblit v1.8.0