1.提交设备养护实体类和查询接口文件

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java

@@ -0,0 +1,26 @@
+package com.glxp.api.admin.dao.inventory;
+
+import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity;
+import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest;
+import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface DeviceMaOrderDetailDao {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(DeviceMAOrderDetailEntity record);
+
+    int insertSelective(DeviceMAOrderDetailEntity record);
+
+    DeviceMAOrderDetailEntity selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(DeviceMAOrderDetailEntity record);
+
+    int updateByPrimaryKey(DeviceMAOrderDetailEntity record);
+
+    List<DeviceMAOrderDetailResponse> filterList(FilterDeviceMAOrderDetailRequest detailRequest);
+
+    void deleteByOrderId(@Param("orderIdFk") String orderIdFk);
+}

api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderDetailEntity.java

@@ -0,0 +1,89 @@
+package com.glxp.api.admin.entity.inventory;
+
+import lombok.Data;
+
+/**
+    * 设备养护记录详情表
+    */
+@Data
+public class DeviceMAOrderDetailEntity {
+    /**
+    * id
+    */
+    private Integer id;
+
+    /**
+    * 设备养护记录号
+    */
+    private String orderIdFk;
+
+    /**
+    * 条码
+    */
+    private String code;
+
+    /**
+     * 产品DI
+     */
+    private String nameCode;
+
+    /**
+    * 产品ID
+    */
+    private String productId;
+
+    /**
+    * 批次号
+    */
+    private String batchNo;
+
+    /**
+    * 生产日期
+    */
+    private String produceDate;
+
+    /**
+    * 失效日期
+    */
+    private String expireDate;
+
+    /**
+    * 序列号
+    */
+    private String serialNo;
+
+    /**
+    * 创建时间
+    */
+    private String createTime;
+
+    /**
+    * 更新时间
+    */
+    private String updateTime;
+
+    /**
+    * 设备状态   0：异常      1：正常
+    */
+    private Integer deviceStatus;
+
+    /**
+    * 养护状态   0：未养护   1：已养护
+    */
+    private Integer maintenanceStatus;
+
+    /**
+    * 养护人
+    */
+    private String createUser;
+
+    /**
+    * 养护说明
+    */
+    private String remark;
+
+    /**
+    * 状态
+    */
+    private Boolean status;
+}

api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceMAOrderEntity.java

@@ -0,0 +1,51 @@
+package com.glxp.api.admin.entity.inventory;
+
+import lombok.Data;
+
+/**
+    * 设备养护记录表
+    */
+@Data
+public class DeviceMAOrderEntity {
+    private Integer id;
+
+    /**
+    * 设备养护记录号
+    */
+    private String orderId;
+
+    /**
+    * 设备领用单据号
+    */
+    private String collOrderId;
+
+    /**
+    * 养护时间
+    */
+    private String createTime;
+
+    /**
+    * 更新时间
+    */
+    private String updateTime;
+
+    /**
+    * 养护人
+    */
+    private String createUser;
+
+    /**
+    * 审核人
+    */
+    private String auditUser;
+
+    /**
+    * 养护说明
+    */
+    private String remark;
+
+    /**
+    * 状态 0：草稿 1：已完成
+    */
+    private Integer status;
+}

api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml

@@ -0,0 +1,161 @@
+<?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.glxp.api.admin.dao.inventory.DeviceMAOrderDao">
+    <resultMap id="BaseResultMap" type="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="orderId" jdbcType="VARCHAR" property="orderId"/>
+        <result column="collOrderId" jdbcType="VARCHAR" property="collOrderId"/>
+        <result column="createTime" jdbcType="VARCHAR" property="createTime"/>
+        <result column="updateTime" jdbcType="VARCHAR" property="updateTime"/>
+        <result column="createUser" jdbcType="VARCHAR" property="createUser"/>
+        <result column="auditUser" jdbcType="VARCHAR" property="auditUser"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="status" jdbcType="BOOLEAN" property="status"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        orderId,
+        collOrderId,
+        createTime,
+        updateTime,
+        `createUser`,
+        auditUser,
+        remark,
+        `status`
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from device_ma_order
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete
+        from device_ma_order
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <insert id="insert" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity" useGeneratedKeys="true">
+        insert into device_ma_order (orderId, collOrderId, createTime,
+                                     updateTime, `createUser`, auditUser,
+                                     remark, `status`)
+        values (#{orderId,jdbcType=VARCHAR}, #{collOrderId,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{auditUser,jdbcType=VARCHAR},
+                #{remark,jdbcType=VARCHAR}, #{status,jdbcType=BOOLEAN})
+    </insert>
+
+    <insert id="insertSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity" useGeneratedKeys="true">
+        insert into device_ma_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">
+                orderId,
+            </if>
+            <if test="collOrderId != null">
+                collOrderId,
+            </if>
+            <if test="createTime != null">
+                createTime,
+            </if>
+            <if test="updateTime != null">
+                updateTime,
+            </if>
+            <if test="createUser != null">
+                `createUser`,
+            </if>
+            <if test="auditUser != null">
+                auditUser,
+            </if>
+            <if test="remark != null">
+                remark,
+            </if>
+            <if test="status != null">
+                `status`,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">
+                #{orderId,jdbcType=VARCHAR},
+            </if>
+            <if test="collOrderId != null">
+                #{collOrderId,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=VARCHAR},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="auditUser != null">
+                #{auditUser,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                #{status,jdbcType=BOOLEAN},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity">
+        update device_ma_order
+        <set>
+            <if test="orderId != null">
+                orderId = #{orderId,jdbcType=VARCHAR},
+            </if>
+            <if test="collOrderId != null">
+                collOrderId = #{collOrderId,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                createTime = #{createTime,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                updateTime = #{updateTime,jdbcType=VARCHAR},
+            </if>
+            <if test="createUser != null">
+                `createUser` = #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="auditUser != null">
+                auditUser = #{auditUser,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                remark = #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                `status` = #{status,jdbcType=BOOLEAN},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <update id="updateByPrimaryKey" parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity">
+        update device_ma_order
+        set orderId      = #{orderId,jdbcType=VARCHAR},
+            collOrderId  = #{collOrderId,jdbcType=VARCHAR},
+            createTime   = #{createTime,jdbcType=VARCHAR},
+            updateTime   = #{updateTime,jdbcType=VARCHAR},
+            `createUser` = #{createUser,jdbcType=VARCHAR},
+            auditUser    = #{auditUser,jdbcType=VARCHAR},
+            remark       = #{remark,jdbcType=VARCHAR},
+            `status`     = #{status,jdbcType=BOOLEAN}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <select id="filterList" resultType="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity">
+        select <include refid="Base_Column_List" />
+        from device_ma_order
+        <where>
+            <if test="orderId != null and orderId != ''">
+                AND orderId like concat('%', #{orderId}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>

api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml

@@ -0,0 +1,264 @@
+<?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.glxp.api.admin.dao.inventory.DeviceMaOrderDetailDao">
+    <resultMap id="BaseResultMap" type="com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk"/>
+        <result column="code" jdbcType="VARCHAR" property="code"/>
+        <result column="productId" jdbcType="VARCHAR" property="productId"/>
+        <result column="batchNo" jdbcType="VARCHAR" property="batchNo"/>
+        <result column="produceDate" jdbcType="VARCHAR" property="produceDate"/>
+        <result column="expireDate" jdbcType="VARCHAR" property="expireDate"/>
+        <result column="serialNo" jdbcType="VARCHAR" property="serialNo"/>
+        <result column="createTime" jdbcType="VARCHAR" property="createTime"/>
+        <result column="updateTime" jdbcType="VARCHAR" property="updateTime"/>
+        <result column="deviceStatus" jdbcType="BOOLEAN" property="deviceStatus"/>
+        <result column="maintenanceStatus" jdbcType="BOOLEAN" property="maintenanceStatus"/>
+        <result column="createUser" jdbcType="VARCHAR" property="createUser"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="status" jdbcType="BOOLEAN" property="status"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        orderIdFk,
+        code,
+        productId,
+        batchNo,
+        produceDate,
+        expireDate,
+        serialNo,
+        createTime,
+        updateTime,
+        deviceStatus,
+        maintenanceStatus,
+        `createUser`,
+        remark,
+        `status`
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from device_ma_order_detail
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete
+        from device_ma_order_detail
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <insert id="insert" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity" useGeneratedKeys="true">
+        insert into device_ma_order_detail (orderIdFk, code, productId,
+                                            batchNo, produceDate, expireDate,
+                                            serialNo, createTime, updateTime,
+                                            deviceStatus, maintenanceStatus, `createUser`,
+                                            remark, `status`)
+        values (#{orderIdFk,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR},
+                #{batchNo,jdbcType=VARCHAR}, #{produceDate,jdbcType=VARCHAR}, #{expireDate,jdbcType=VARCHAR},
+                #{serialNo,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR},
+                #{deviceStatus,jdbcType=BOOLEAN}, #{maintenanceStatus,jdbcType=BOOLEAN}, #{createUser,jdbcType=VARCHAR},
+                #{remark,jdbcType=VARCHAR}, #{status,jdbcType=BOOLEAN})
+    </insert>
+
+    <insert id="insertSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity" useGeneratedKeys="true">
+        insert into device_ma_order_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderIdFk != null">
+                orderIdFk,
+            </if>
+            <if test="code != null">
+                code,
+            </if>
+            <if test="productId != null">
+                productId,
+            </if>
+            <if test="batchNo != null">
+                batchNo,
+            </if>
+            <if test="produceDate != null">
+                produceDate,
+            </if>
+            <if test="expireDate != null">
+                expireDate,
+            </if>
+            <if test="serialNo != null">
+                serialNo,
+            </if>
+            <if test="createTime != null">
+                createTime,
+            </if>
+            <if test="updateTime != null">
+                updateTime,
+            </if>
+            <if test="deviceStatus != null">
+                deviceStatus,
+            </if>
+            <if test="maintenanceStatus != null">
+                maintenanceStatus,
+            </if>
+            <if test="createUser != null">
+                `createUser`,
+            </if>
+            <if test="remark != null">
+                remark,
+            </if>
+            <if test="status != null">
+                `status`,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderIdFk != null">
+                #{orderIdFk,jdbcType=VARCHAR},
+            </if>
+            <if test="code != null">
+                #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="productId != null">
+                #{productId,jdbcType=VARCHAR},
+            </if>
+            <if test="batchNo != null">
+                #{batchNo,jdbcType=VARCHAR},
+            </if>
+            <if test="produceDate != null">
+                #{produceDate,jdbcType=VARCHAR},
+            </if>
+            <if test="expireDate != null">
+                #{expireDate,jdbcType=VARCHAR},
+            </if>
+            <if test="serialNo != null">
+                #{serialNo,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=VARCHAR},
+            </if>
+            <if test="deviceStatus != null">
+                #{deviceStatus,jdbcType=BOOLEAN},
+            </if>
+            <if test="maintenanceStatus != null">
+                #{maintenanceStatus,jdbcType=BOOLEAN},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                #{status,jdbcType=BOOLEAN},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity">
+        update device_ma_order_detail
+        <set>
+            <if test="orderIdFk != null">
+                orderIdFk = #{orderIdFk,jdbcType=VARCHAR},
+            </if>
+            <if test="code != null">
+                code = #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="productId != null">
+                productId = #{productId,jdbcType=VARCHAR},
+            </if>
+            <if test="batchNo != null">
+                batchNo = #{batchNo,jdbcType=VARCHAR},
+            </if>
+            <if test="produceDate != null">
+                produceDate = #{produceDate,jdbcType=VARCHAR},
+            </if>
+            <if test="expireDate != null">
+                expireDate = #{expireDate,jdbcType=VARCHAR},
+            </if>
+            <if test="serialNo != null">
+                serialNo = #{serialNo,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                createTime = #{createTime,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                updateTime = #{updateTime,jdbcType=VARCHAR},
+            </if>
+            <if test="deviceStatus != null">
+                deviceStatus = #{deviceStatus,jdbcType=BOOLEAN},
+            </if>
+            <if test="maintenanceStatus != null">
+                maintenanceStatus = #{maintenanceStatus,jdbcType=BOOLEAN},
+            </if>
+            <if test="createUser != null">
+                `createUser` = #{createUser,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                remark = #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                `status` = #{status,jdbcType=BOOLEAN},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <update id="updateByPrimaryKey" parameterType="com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity">
+        update device_ma_order_detail
+        set orderIdFk         = #{orderIdFk,jdbcType=VARCHAR},
+            code              = #{code,jdbcType=VARCHAR},
+            productId         = #{productId,jdbcType=VARCHAR},
+            batchNo           = #{batchNo,jdbcType=VARCHAR},
+            produceDate       = #{produceDate,jdbcType=VARCHAR},
+            expireDate        = #{expireDate,jdbcType=VARCHAR},
+            serialNo          = #{serialNo,jdbcType=VARCHAR},
+            createTime        = #{createTime,jdbcType=VARCHAR},
+            updateTime        = #{updateTime,jdbcType=VARCHAR},
+            deviceStatus      = #{deviceStatus,jdbcType=BOOLEAN},
+            maintenanceStatus = #{maintenanceStatus,jdbcType=BOOLEAN},
+            `createUser`      = #{createUser,jdbcType=VARCHAR},
+            remark            = #{remark,jdbcType=VARCHAR},
+            `status`          = #{status,jdbcType=BOOLEAN}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <select id="filterList" resultType="com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse">
+        select dmod.id,
+        dmod.orderIdFk,
+        dmod.code,
+        dmod.nameCode,
+        dmod.productId,
+        dmod.batchNo,
+        dmod.produceDate,
+        dmod.expireDate,
+        dmod.serialNo,
+        dmod.createTime,
+        dmod.updateTime,
+        dmod.deviceStatus,
+        dmod.maintenanceStatus,
+        dmod.createUser,
+        dmod.remark,
+        dmod.status,
+        bp.cpmctymc productName,
+        bp.ylqxzcrbarmc,
+        bp.zczbhhzbapzbh,
+        bp.ggxh
+        from device_ma_order_detail dmod
+        left join basic_udirel bu on bu.id = dmod.productId
+        left join basic_products bp on bu.uuid = bp.uuid
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+        </where>
+        order by dmod.id
+    </select>
+
+    <delete id="deleteByOrderId">
+        delete from device_ma_order_detail where orderIdFk = #{orderIdFk}
+    </delete>
+</mapper>