Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-28 73a0ffbc8f1c5c625ce4bb3225c0e5e30179520e

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	medicalWaste-system/src/main/java/com/sinata/system/domain/MwCollectRecord.java

 medicalWaste-admin/src/test/java/MybatisPlusGeneraotr.java

@@ -48,7 +48,7 @@
                            builder
                                    // 在这里添加数据库表名
                                    //.addInclude("MW_BOX")
                                    .addInclude("MW_DISPOSAL_HANDLE_RECORD")// 设置需要生成的表名，多个表之间可以用逗号隔开
                                    .addInclude("MW_DISPOSAL_HANDLE_RECORD_ITEM")// 设置需要生成的表名，多个表之间可以用逗号隔开
                                    // .addExclude("BBZQ_USER","BBZQ_USER_LOG")
                                    .controllerBuilder().enableRestStyle()         // controller配置策略
                                    .serviceBuilder().formatServiceFileName("%sService")            // service配置策略

 medicalWaste-system/src/main/java/com/sinata/system/domain/MwCollectRecord.java

@@ -98,9 +98,7 @@
    private Date receiveTime;


    @ApiModelProperty("处置记录id")
    @TableField("DISPOSAL_HANDLE_RECORD_ID")
    private Long disposalHandleRecordId;



}

 medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalHandleRecord.java

@@ -48,9 +48,6 @@
    @TableField("DISPOSAL_USER_ID")
    private Long disposalUserId;

    @ApiModelProperty("处置接收记录ID")
    @TableField("DISPOSAL_RECORD_ID")
    private Long disposalRecordId;


}

 medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalHandleRecordItem.java

New file
@@ -0,0 +1,46 @@
package com.sinata.system.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.sinata.common.entity.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * 处置记录项
 * </p>
 *
 * @author mitao
 * @since 2024-12-28
 */
@Getter
@Setter
@TableName("MW_DISPOSAL_HANDLE_RECORD_ITEM")
@ApiModel(value = "MwDisposalHandleRecordItem对象", description = "处置记录项")
public class MwDisposalHandleRecordItem extends BaseModel {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键ID")
    @TableId(value = "ID", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("处置接收记录ID")
    @TableField("DISPOSAL_RECORD_ID")
    private Long disposalRecordId;

    @ApiModelProperty("收集记录ID")
    @TableField("COLLECT_RECORD_ID")
    private Long collectRecordId;

    @ApiModelProperty("处置记录ID")
    @TableField("DISPOSAL_HANDLE_RECORD_ID")
    private Long disposalHandleRecordId;


}

 medicalWaste-system/src/main/java/com/sinata/system/mapper/MwDisposalHandleRecordItemMapper.java

New file
@@ -0,0 +1,18 @@
package com.sinata.system.mapper;

import com.sinata.system.domain.MwDisposalHandleRecordItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 * 处置记录项 Mapper 接口
 * </p>
 *
 * @author mitao
 * @since 2024-12-28
 */
@Mapper
public interface MwDisposalHandleRecordItemMapper extends BaseMapper<MwDisposalHandleRecordItem> {

}

 medicalWaste-system/src/main/java/com/sinata/system/mapper/xml/MwDisposalHandleRecordItemMapper.xml

New file
@@ -0,0 +1,18 @@
<?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.sinata.system.mapper.MwDisposalHandleRecordItemMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.sinata.system.domain.MwDisposalHandleRecordItem">
        <id column="ID" property="id" />
        <result column="DISPOSAL_RECORD_ID" property="disposalRecordId" />
        <result column="COLLECT_RECORD_ID" property="collectRecordId" />
        <result column="DISPOSAL_HANDLE_RECORD_ID" property="disposalHandleRecordId" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        ID, DISPOSAL_RECORD_ID, COLLECT_RECORD_ID, DISPOSAL_HANDLE_RECORD_ID
    </sql>

</mapper>

 medicalWaste-system/src/main/java/com/sinata/system/service/MwDisposalHandleRecordItemService.java

New file
@@ -0,0 +1,16 @@
package com.sinata.system.service;

import com.sinata.system.domain.MwDisposalHandleRecordItem;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 处置记录项 服务类
 * </p>
 *
 * @author mitao
 * @since 2024-12-28
 */
public interface MwDisposalHandleRecordItemService extends IService<MwDisposalHandleRecordItem> {

}

 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwDisposalHandleRecordItemServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.sinata.system.service.impl;

import com.sinata.system.domain.MwDisposalHandleRecordItem;
import com.sinata.system.mapper.MwDisposalHandleRecordItemMapper;
import com.sinata.system.service.MwDisposalHandleRecordItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 处置记录项 服务实现类
 * </p>
 *
 * @author mitao
 * @since 2024-12-28
 */
@Service
public class MwDisposalHandleRecordItemServiceImpl extends ServiceImpl<MwDisposalHandleRecordItemMapper, MwDisposalHandleRecordItem> implements MwDisposalHandleRecordItemService {

}