ソースを参照

Merge remote-tracking branch 'origin/master'

Administrator 1 年間 前
コミット
d8446a34f9
18 ファイル変更1593 行追加0 行削除
  1. 104 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/DoumuProductFiController.java
  2. 104 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/DoumuProductHistoryController.java
  3. 104 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/DoumuProductInfoController.java
  4. 80 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductFi.java
  5. 134 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductHistory.java
  6. 134 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductInfo.java
  7. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/DoumuProductFiMapper.java
  8. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/DoumuProductHistoryMapper.java
  9. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/DoumuProductInfoMapper.java
  10. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuProductFiService.java
  11. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuProductHistoryService.java
  12. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuProductInfoService.java
  13. 93 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductFiServiceImpl.java
  14. 96 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductHistoryServiceImpl.java
  15. 96 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductInfoServiceImpl.java
  16. 70 0
      ruoyi-system/src/main/resources/mapper/system/DoumuProductFiMapper.xml
  17. 106 0
      ruoyi-system/src/main/resources/mapper/system/DoumuProductHistoryMapper.xml
  18. 106 0
      ruoyi-system/src/main/resources/mapper/system/DoumuProductInfoMapper.xml

+ 104 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/DoumuProductFiController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.doumu;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.DoumuProductFi;
+import com.ruoyi.system.service.IDoumuProductFiService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 痘姆古陶_附件Controller
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+@RestController
+@RequestMapping("/system/fi")
+public class DoumuProductFiController extends BaseController
+{
+    @Autowired
+    private IDoumuProductFiService doumuProductFiService;
+
+    /**
+     * 查询痘姆古陶_附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:fi:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DoumuProductFi doumuProductFi)
+    {
+        startPage();
+        List<DoumuProductFi> list = doumuProductFiService.selectDoumuProductFiList(doumuProductFi);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出痘姆古陶_附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:fi:export')")
+    @Log(title = "痘姆古陶_附件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DoumuProductFi doumuProductFi)
+    {
+        List<DoumuProductFi> list = doumuProductFiService.selectDoumuProductFiList(doumuProductFi);
+        ExcelUtil<DoumuProductFi> util = new ExcelUtil<DoumuProductFi>(DoumuProductFi.class);
+        util.exportExcel(response, list, "痘姆古陶_附件数据");
+    }
+
+    /**
+     * 获取痘姆古陶_附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:fi:query')")
+    @GetMapping(value = "/{fiId}")
+    public AjaxResult getInfo(@PathVariable("fiId") Long fiId)
+    {
+        return success(doumuProductFiService.selectDoumuProductFiByFiId(fiId));
+    }
+
+    /**
+     * 新增痘姆古陶_附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:fi:add')")
+    @Log(title = "痘姆古陶_附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DoumuProductFi doumuProductFi)
+    {
+        return toAjax(doumuProductFiService.insertDoumuProductFi(doumuProductFi));
+    }
+
+    /**
+     * 修改痘姆古陶_附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:fi:edit')")
+    @Log(title = "痘姆古陶_附件", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody DoumuProductFi doumuProductFi)
+    {
+        return toAjax(doumuProductFiService.updateDoumuProductFi(doumuProductFi));
+    }
+
+    /**
+     * 删除痘姆古陶_附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:fi:remove')")
+    @Log(title = "痘姆古陶_附件", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{fiIds}")
+    public AjaxResult remove(@PathVariable Long[] fiIds)
+    {
+        return toAjax(doumuProductFiService.deleteDoumuProductFiByFiIds(fiIds));
+    }
+}

+ 104 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/DoumuProductHistoryController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.doumu;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.DoumuProductHistory;
+import com.ruoyi.system.service.IDoumuProductHistoryService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 痘姆古陶主历史信息Controller
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+@RestController
+@RequestMapping("/system/history")
+public class DoumuProductHistoryController extends BaseController
+{
+    @Autowired
+    private IDoumuProductHistoryService doumuProductHistoryService;
+
+    /**
+     * 查询痘姆古陶主历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:history:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DoumuProductHistory doumuProductHistory)
+    {
+        startPage();
+        List<DoumuProductHistory> list = doumuProductHistoryService.selectDoumuProductHistoryList(doumuProductHistory);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出痘姆古陶主历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:history:export')")
+    @Log(title = "痘姆古陶主历史信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DoumuProductHistory doumuProductHistory)
+    {
+        List<DoumuProductHistory> list = doumuProductHistoryService.selectDoumuProductHistoryList(doumuProductHistory);
+        ExcelUtil<DoumuProductHistory> util = new ExcelUtil<DoumuProductHistory>(DoumuProductHistory.class);
+        util.exportExcel(response, list, "痘姆古陶主历史信息数据");
+    }
+
+    /**
+     * 获取痘姆古陶主历史信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:history:query')")
+    @GetMapping(value = "/{historyId}")
+    public AjaxResult getInfo(@PathVariable("historyId") Long historyId)
+    {
+        return success(doumuProductHistoryService.selectDoumuProductHistoryByHistoryId(historyId));
+    }
+
+    /**
+     * 新增痘姆古陶主历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:history:add')")
+    @Log(title = "痘姆古陶主历史信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DoumuProductHistory doumuProductHistory)
+    {
+        return toAjax(doumuProductHistoryService.insertDoumuProductHistory(doumuProductHistory));
+    }
+
+    /**
+     * 修改痘姆古陶主历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:history:edit')")
+    @Log(title = "痘姆古陶主历史信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody DoumuProductHistory doumuProductHistory)
+    {
+        return toAjax(doumuProductHistoryService.updateDoumuProductHistory(doumuProductHistory));
+    }
+
+    /**
+     * 删除痘姆古陶主历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:history:remove')")
+    @Log(title = "痘姆古陶主历史信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{historyIds}")
+    public AjaxResult remove(@PathVariable Long[] historyIds)
+    {
+        return toAjax(doumuProductHistoryService.deleteDoumuProductHistoryByHistoryIds(historyIds));
+    }
+}

+ 104 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/DoumuProductInfoController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.doumu;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.DoumuProductInfo;
+import com.ruoyi.system.service.IDoumuProductInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 痘姆古陶信息Controller
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+@RestController
+@RequestMapping("/system/info")
+public class DoumuProductInfoController extends BaseController
+{
+    @Autowired
+    private IDoumuProductInfoService doumuProductInfoService;
+
+    /**
+     * 查询痘姆古陶信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DoumuProductInfo doumuProductInfo)
+    {
+        startPage();
+        List<DoumuProductInfo> list = doumuProductInfoService.selectDoumuProductInfoList(doumuProductInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出痘姆古陶信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:export')")
+    @Log(title = "痘姆古陶信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DoumuProductInfo doumuProductInfo)
+    {
+        List<DoumuProductInfo> list = doumuProductInfoService.selectDoumuProductInfoList(doumuProductInfo);
+        ExcelUtil<DoumuProductInfo> util = new ExcelUtil<DoumuProductInfo>(DoumuProductInfo.class);
+        util.exportExcel(response, list, "痘姆古陶信息数据");
+    }
+
+    /**
+     * 获取痘姆古陶信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:query')")
+    @GetMapping(value = "/{productId}")
+    public AjaxResult getInfo(@PathVariable("productId") Long productId)
+    {
+        return success(doumuProductInfoService.selectDoumuProductInfoByProductId(productId));
+    }
+
+    /**
+     * 新增痘姆古陶信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:add')")
+    @Log(title = "痘姆古陶信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DoumuProductInfo doumuProductInfo)
+    {
+        return toAjax(doumuProductInfoService.insertDoumuProductInfo(doumuProductInfo));
+    }
+
+    /**
+     * 修改痘姆古陶信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:edit')")
+    @Log(title = "痘姆古陶信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody DoumuProductInfo doumuProductInfo)
+    {
+        return toAjax(doumuProductInfoService.updateDoumuProductInfo(doumuProductInfo));
+    }
+
+    /**
+     * 删除痘姆古陶信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:remove')")
+    @Log(title = "痘姆古陶信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{productIds}")
+    public AjaxResult remove(@PathVariable Long[] productIds)
+    {
+        return toAjax(doumuProductInfoService.deleteDoumuProductInfoByProductIds(productIds));
+    }
+}

+ 80 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductFi.java

@@ -0,0 +1,80 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 痘姆古陶_附件对象 doumu_product_fi
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+public class DoumuProductFi extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long fiId;
+
+    /** 痘姆古陶主表id */
+    @Excel(name = "痘姆古陶主表id")
+    private Long productId;
+
+    /** 附件名称 */
+    @Excel(name = "附件名称")
+    private String fjName;
+
+    /** 附件地址 */
+    @Excel(name = "附件地址")
+    private String path;
+
+    public void setFiId(Long fiId) 
+    {
+        this.fiId = fiId;
+    }
+
+    public Long getFiId() 
+    {
+        return fiId;
+    }
+    public void setProductId(Long productId) 
+    {
+        this.productId = productId;
+    }
+
+    public Long getProductId() 
+    {
+        return productId;
+    }
+    public void setFjName(String fjName) 
+    {
+        this.fjName = fjName;
+    }
+
+    public String getFjName() 
+    {
+        return fjName;
+    }
+    public void setPath(String path) 
+    {
+        this.path = path;
+    }
+
+    public String getPath() 
+    {
+        return path;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fiId", getFiId())
+            .append("productId", getProductId())
+            .append("fjName", getFjName())
+            .append("path", getPath())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 134 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductHistory.java

@@ -0,0 +1,134 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 痘姆古陶主历史信息对象 doumu_product_history
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+public class DoumuProductHistory extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long historyId;
+
+    /** 痘姆古陶主表id(doumu_product_info) */
+    @Excel(name = "痘姆古陶主表id", readConverterExp = "d=oumu_product_info")
+    private Long productId;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderNumber;
+
+    /** 联系人姓名 */
+    @Excel(name = "联系人姓名")
+    private String name;
+
+    /** 交付方式(1:邮寄,2:自取) */
+    @Excel(name = "交付方式", readConverterExp = "1=:邮寄,2:自取")
+    private String deliveryType;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String phonenumber;
+
+    /** 收货地址 */
+    @Excel(name = "收货地址")
+    private String address;
+
+    /** 当前流程记录(字典值,用户自己配置) */
+    @Excel(name = "当前流程记录", readConverterExp = "字=典值,用户自己配置")
+    private String flowType;
+
+    public void setHistoryId(Long historyId) 
+    {
+        this.historyId = historyId;
+    }
+
+    public Long getHistoryId() 
+    {
+        return historyId;
+    }
+    public void setProductId(Long productId) 
+    {
+        this.productId = productId;
+    }
+
+    public Long getProductId() 
+    {
+        return productId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setDeliveryType(String deliveryType) 
+    {
+        this.deliveryType = deliveryType;
+    }
+
+    public String getDeliveryType() 
+    {
+        return deliveryType;
+    }
+    public void setPhonenumber(String phonenumber) 
+    {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getPhonenumber() 
+    {
+        return phonenumber;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setFlowType(String flowType) 
+    {
+        this.flowType = flowType;
+    }
+
+    public String getFlowType() 
+    {
+        return flowType;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    @Override
+    public String toString() {
+        return "DoumuProductHistory{" +
+                "historyId=" + historyId +
+                ", productId=" + productId +
+                ", orderNumber='" + orderNumber + '\'' +
+                ", name='" + name + '\'' +
+                ", deliveryType='" + deliveryType + '\'' +
+                ", phonenumber='" + phonenumber + '\'' +
+                ", address='" + address + '\'' +
+                ", flowType='" + flowType + '\'' +
+                '}';
+    }
+}

+ 134 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductInfo.java

@@ -0,0 +1,134 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 痘姆古陶信息对象 doumu_product_info
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+public class DoumuProductInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long productId;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderNumber;
+
+    /** 联系人姓名 */
+    @Excel(name = "联系人姓名")
+    private String name;
+
+    /** 交付方式(1:邮寄,2:自取) */
+    @Excel(name = "交付方式", readConverterExp = "1=:邮寄,2:自取")
+    private String deliveryType;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String phonenumber;
+
+    /** 收货地址 */
+    @Excel(name = "收货地址")
+    private String address;
+
+    /** 当前流程记录(字典值,用户自己配置) */
+    @Excel(name = "当前流程记录", readConverterExp = "字=典值,用户自己配置")
+    private String flowType;
+
+    /** 快递单号 */
+    @Excel(name = "快递单号")
+    private String mailNo;
+
+    public void setProductId(Long productId) 
+    {
+        this.productId = productId;
+    }
+
+    public Long getProductId() 
+    {
+        return productId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setDeliveryType(String deliveryType) 
+    {
+        this.deliveryType = deliveryType;
+    }
+
+    public String getDeliveryType() 
+    {
+        return deliveryType;
+    }
+    public void setPhonenumber(String phonenumber) 
+    {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getPhonenumber() 
+    {
+        return phonenumber;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setFlowType(String flowType) 
+    {
+        this.flowType = flowType;
+    }
+
+    public String getFlowType() 
+    {
+        return flowType;
+    }
+    public void setMailNo(String mailNo) 
+    {
+        this.mailNo = mailNo;
+    }
+
+    public String getMailNo() 
+    {
+        return mailNo;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    @Override
+    public String toString() {
+        return "DoumuProductInfo{" +
+                "productId=" + productId +
+                ", orderNumber='" + orderNumber + '\'' +
+                ", name='" + name + '\'' +
+                ", deliveryType='" + deliveryType + '\'' +
+                ", phonenumber='" + phonenumber + '\'' +
+                ", address='" + address + '\'' +
+                ", flowType='" + flowType + '\'' +
+                ", mailNo='" + mailNo + '\'' +
+                '}';
+    }
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/DoumuProductFiMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.DoumuProductFi;
+
+/**
+ * 痘姆古陶_附件Mapper接口
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+public interface DoumuProductFiMapper 
+{
+    /**
+     * 查询痘姆古陶_附件
+     * 
+     * @param fiId 痘姆古陶_附件主键
+     * @return 痘姆古陶_附件
+     */
+    public DoumuProductFi selectDoumuProductFiByFiId(Long fiId);
+
+    /**
+     * 查询痘姆古陶_附件列表
+     * 
+     * @param doumuProductFi 痘姆古陶_附件
+     * @return 痘姆古陶_附件集合
+     */
+    public List<DoumuProductFi> selectDoumuProductFiList(DoumuProductFi doumuProductFi);
+
+    /**
+     * 新增痘姆古陶_附件
+     * 
+     * @param doumuProductFi 痘姆古陶_附件
+     * @return 结果
+     */
+    public int insertDoumuProductFi(DoumuProductFi doumuProductFi);
+
+    /**
+     * 修改痘姆古陶_附件
+     * 
+     * @param doumuProductFi 痘姆古陶_附件
+     * @return 结果
+     */
+    public int updateDoumuProductFi(DoumuProductFi doumuProductFi);
+
+    /**
+     * 删除痘姆古陶_附件
+     * 
+     * @param fiId 痘姆古陶_附件主键
+     * @return 结果
+     */
+    public int deleteDoumuProductFiByFiId(Long fiId);
+
+    /**
+     * 批量删除痘姆古陶_附件
+     * 
+     * @param fiIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDoumuProductFiByFiIds(Long[] fiIds);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/DoumuProductHistoryMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.DoumuProductHistory;
+
+/**
+ * 痘姆古陶主历史信息Mapper接口
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+public interface DoumuProductHistoryMapper 
+{
+    /**
+     * 查询痘姆古陶主历史信息
+     * 
+     * @param historyId 痘姆古陶主历史信息主键
+     * @return 痘姆古陶主历史信息
+     */
+    public DoumuProductHistory selectDoumuProductHistoryByHistoryId(Long historyId);
+
+    /**
+     * 查询痘姆古陶主历史信息列表
+     * 
+     * @param doumuProductHistory 痘姆古陶主历史信息
+     * @return 痘姆古陶主历史信息集合
+     */
+    public List<DoumuProductHistory> selectDoumuProductHistoryList(DoumuProductHistory doumuProductHistory);
+
+    /**
+     * 新增痘姆古陶主历史信息
+     * 
+     * @param doumuProductHistory 痘姆古陶主历史信息
+     * @return 结果
+     */
+    public int insertDoumuProductHistory(DoumuProductHistory doumuProductHistory);
+
+    /**
+     * 修改痘姆古陶主历史信息
+     * 
+     * @param doumuProductHistory 痘姆古陶主历史信息
+     * @return 结果
+     */
+    public int updateDoumuProductHistory(DoumuProductHistory doumuProductHistory);
+
+    /**
+     * 删除痘姆古陶主历史信息
+     * 
+     * @param historyId 痘姆古陶主历史信息主键
+     * @return 结果
+     */
+    public int deleteDoumuProductHistoryByHistoryId(Long historyId);
+
+    /**
+     * 批量删除痘姆古陶主历史信息
+     * 
+     * @param historyIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDoumuProductHistoryByHistoryIds(Long[] historyIds);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/DoumuProductInfoMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.DoumuProductInfo;
+
+/**
+ * 痘姆古陶信息Mapper接口
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+public interface DoumuProductInfoMapper 
+{
+    /**
+     * 查询痘姆古陶信息
+     * 
+     * @param productId 痘姆古陶信息主键
+     * @return 痘姆古陶信息
+     */
+    public DoumuProductInfo selectDoumuProductInfoByProductId(Long productId);
+
+    /**
+     * 查询痘姆古陶信息列表
+     * 
+     * @param doumuProductInfo 痘姆古陶信息
+     * @return 痘姆古陶信息集合
+     */
+    public List<DoumuProductInfo> selectDoumuProductInfoList(DoumuProductInfo doumuProductInfo);
+
+    /**
+     * 新增痘姆古陶信息
+     * 
+     * @param doumuProductInfo 痘姆古陶信息
+     * @return 结果
+     */
+    public int insertDoumuProductInfo(DoumuProductInfo doumuProductInfo);
+
+    /**
+     * 修改痘姆古陶信息
+     * 
+     * @param doumuProductInfo 痘姆古陶信息
+     * @return 结果
+     */
+    public int updateDoumuProductInfo(DoumuProductInfo doumuProductInfo);
+
+    /**
+     * 删除痘姆古陶信息
+     * 
+     * @param productId 痘姆古陶信息主键
+     * @return 结果
+     */
+    public int deleteDoumuProductInfoByProductId(Long productId);
+
+    /**
+     * 批量删除痘姆古陶信息
+     * 
+     * @param productIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDoumuProductInfoByProductIds(Long[] productIds);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuProductFiService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.DoumuProductFi;
+
+/**
+ * 痘姆古陶_附件Service接口
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+public interface IDoumuProductFiService 
+{
+    /**
+     * 查询痘姆古陶_附件
+     * 
+     * @param fiId 痘姆古陶_附件主键
+     * @return 痘姆古陶_附件
+     */
+    public DoumuProductFi selectDoumuProductFiByFiId(Long fiId);
+
+    /**
+     * 查询痘姆古陶_附件列表
+     * 
+     * @param doumuProductFi 痘姆古陶_附件
+     * @return 痘姆古陶_附件集合
+     */
+    public List<DoumuProductFi> selectDoumuProductFiList(DoumuProductFi doumuProductFi);
+
+    /**
+     * 新增痘姆古陶_附件
+     * 
+     * @param doumuProductFi 痘姆古陶_附件
+     * @return 结果
+     */
+    public int insertDoumuProductFi(DoumuProductFi doumuProductFi);
+
+    /**
+     * 修改痘姆古陶_附件
+     * 
+     * @param doumuProductFi 痘姆古陶_附件
+     * @return 结果
+     */
+    public int updateDoumuProductFi(DoumuProductFi doumuProductFi);
+
+    /**
+     * 批量删除痘姆古陶_附件
+     * 
+     * @param fiIds 需要删除的痘姆古陶_附件主键集合
+     * @return 结果
+     */
+    public int deleteDoumuProductFiByFiIds(Long[] fiIds);
+
+    /**
+     * 删除痘姆古陶_附件信息
+     * 
+     * @param fiId 痘姆古陶_附件主键
+     * @return 结果
+     */
+    public int deleteDoumuProductFiByFiId(Long fiId);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuProductHistoryService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.DoumuProductHistory;
+
+/**
+ * 痘姆古陶主历史信息Service接口
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+public interface IDoumuProductHistoryService 
+{
+    /**
+     * 查询痘姆古陶主历史信息
+     * 
+     * @param historyId 痘姆古陶主历史信息主键
+     * @return 痘姆古陶主历史信息
+     */
+    public DoumuProductHistory selectDoumuProductHistoryByHistoryId(Long historyId);
+
+    /**
+     * 查询痘姆古陶主历史信息列表
+     * 
+     * @param doumuProductHistory 痘姆古陶主历史信息
+     * @return 痘姆古陶主历史信息集合
+     */
+    public List<DoumuProductHistory> selectDoumuProductHistoryList(DoumuProductHistory doumuProductHistory);
+
+    /**
+     * 新增痘姆古陶主历史信息
+     * 
+     * @param doumuProductHistory 痘姆古陶主历史信息
+     * @return 结果
+     */
+    public int insertDoumuProductHistory(DoumuProductHistory doumuProductHistory);
+
+    /**
+     * 修改痘姆古陶主历史信息
+     * 
+     * @param doumuProductHistory 痘姆古陶主历史信息
+     * @return 结果
+     */
+    public int updateDoumuProductHistory(DoumuProductHistory doumuProductHistory);
+
+    /**
+     * 批量删除痘姆古陶主历史信息
+     * 
+     * @param historyIds 需要删除的痘姆古陶主历史信息主键集合
+     * @return 结果
+     */
+    public int deleteDoumuProductHistoryByHistoryIds(Long[] historyIds);
+
+    /**
+     * 删除痘姆古陶主历史信息信息
+     * 
+     * @param historyId 痘姆古陶主历史信息主键
+     * @return 结果
+     */
+    public int deleteDoumuProductHistoryByHistoryId(Long historyId);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuProductInfoService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.DoumuProductInfo;
+
+/**
+ * 痘姆古陶信息Service接口
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+public interface IDoumuProductInfoService 
+{
+    /**
+     * 查询痘姆古陶信息
+     * 
+     * @param productId 痘姆古陶信息主键
+     * @return 痘姆古陶信息
+     */
+    public DoumuProductInfo selectDoumuProductInfoByProductId(Long productId);
+
+    /**
+     * 查询痘姆古陶信息列表
+     * 
+     * @param doumuProductInfo 痘姆古陶信息
+     * @return 痘姆古陶信息集合
+     */
+    public List<DoumuProductInfo> selectDoumuProductInfoList(DoumuProductInfo doumuProductInfo);
+
+    /**
+     * 新增痘姆古陶信息
+     * 
+     * @param doumuProductInfo 痘姆古陶信息
+     * @return 结果
+     */
+    public int insertDoumuProductInfo(DoumuProductInfo doumuProductInfo);
+
+    /**
+     * 修改痘姆古陶信息
+     * 
+     * @param doumuProductInfo 痘姆古陶信息
+     * @return 结果
+     */
+    public int updateDoumuProductInfo(DoumuProductInfo doumuProductInfo);
+
+    /**
+     * 批量删除痘姆古陶信息
+     * 
+     * @param productIds 需要删除的痘姆古陶信息主键集合
+     * @return 结果
+     */
+    public int deleteDoumuProductInfoByProductIds(Long[] productIds);
+
+    /**
+     * 删除痘姆古陶信息信息
+     * 
+     * @param productId 痘姆古陶信息主键
+     * @return 结果
+     */
+    public int deleteDoumuProductInfoByProductId(Long productId);
+}

+ 93 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductFiServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.DoumuProductFiMapper;
+import com.ruoyi.system.domain.DoumuProductFi;
+import com.ruoyi.system.service.IDoumuProductFiService;
+
+/**
+ * 痘姆古陶_附件Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+@Service
+public class DoumuProductFiServiceImpl implements IDoumuProductFiService 
+{
+    @Autowired
+    private DoumuProductFiMapper doumuProductFiMapper;
+
+    /**
+     * 查询痘姆古陶_附件
+     * 
+     * @param fiId 痘姆古陶_附件主键
+     * @return 痘姆古陶_附件
+     */
+    @Override
+    public DoumuProductFi selectDoumuProductFiByFiId(Long fiId)
+    {
+        return doumuProductFiMapper.selectDoumuProductFiByFiId(fiId);
+    }
+
+    /**
+     * 查询痘姆古陶_附件列表
+     * 
+     * @param doumuProductFi 痘姆古陶_附件
+     * @return 痘姆古陶_附件
+     */
+    @Override
+    public List<DoumuProductFi> selectDoumuProductFiList(DoumuProductFi doumuProductFi)
+    {
+        return doumuProductFiMapper.selectDoumuProductFiList(doumuProductFi);
+    }
+
+    /**
+     * 新增痘姆古陶_附件
+     * 
+     * @param doumuProductFi 痘姆古陶_附件
+     * @return 结果
+     */
+    @Override
+    public int insertDoumuProductFi(DoumuProductFi doumuProductFi)
+    {
+        return doumuProductFiMapper.insertDoumuProductFi(doumuProductFi);
+    }
+
+    /**
+     * 修改痘姆古陶_附件
+     * 
+     * @param doumuProductFi 痘姆古陶_附件
+     * @return 结果
+     */
+    @Override
+    public int updateDoumuProductFi(DoumuProductFi doumuProductFi)
+    {
+        return doumuProductFiMapper.updateDoumuProductFi(doumuProductFi);
+    }
+
+    /**
+     * 批量删除痘姆古陶_附件
+     * 
+     * @param fiIds 需要删除的痘姆古陶_附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDoumuProductFiByFiIds(Long[] fiIds)
+    {
+        return doumuProductFiMapper.deleteDoumuProductFiByFiIds(fiIds);
+    }
+
+    /**
+     * 删除痘姆古陶_附件信息
+     * 
+     * @param fiId 痘姆古陶_附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDoumuProductFiByFiId(Long fiId)
+    {
+        return doumuProductFiMapper.deleteDoumuProductFiByFiId(fiId);
+    }
+}

+ 96 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductHistoryServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.DoumuProductHistoryMapper;
+import com.ruoyi.system.domain.DoumuProductHistory;
+import com.ruoyi.system.service.IDoumuProductHistoryService;
+
+/**
+ * 痘姆古陶主历史信息Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+@Service
+public class DoumuProductHistoryServiceImpl implements IDoumuProductHistoryService 
+{
+    @Autowired
+    private DoumuProductHistoryMapper doumuProductHistoryMapper;
+
+    /**
+     * 查询痘姆古陶主历史信息
+     * 
+     * @param historyId 痘姆古陶主历史信息主键
+     * @return 痘姆古陶主历史信息
+     */
+    @Override
+    public DoumuProductHistory selectDoumuProductHistoryByHistoryId(Long historyId)
+    {
+        return doumuProductHistoryMapper.selectDoumuProductHistoryByHistoryId(historyId);
+    }
+
+    /**
+     * 查询痘姆古陶主历史信息列表
+     * 
+     * @param doumuProductHistory 痘姆古陶主历史信息
+     * @return 痘姆古陶主历史信息
+     */
+    @Override
+    public List<DoumuProductHistory> selectDoumuProductHistoryList(DoumuProductHistory doumuProductHistory)
+    {
+        return doumuProductHistoryMapper.selectDoumuProductHistoryList(doumuProductHistory);
+    }
+
+    /**
+     * 新增痘姆古陶主历史信息
+     * 
+     * @param doumuProductHistory 痘姆古陶主历史信息
+     * @return 结果
+     */
+    @Override
+    public int insertDoumuProductHistory(DoumuProductHistory doumuProductHistory)
+    {
+        doumuProductHistory.setCreateTime(DateUtils.getNowDate());
+        return doumuProductHistoryMapper.insertDoumuProductHistory(doumuProductHistory);
+    }
+
+    /**
+     * 修改痘姆古陶主历史信息
+     * 
+     * @param doumuProductHistory 痘姆古陶主历史信息
+     * @return 结果
+     */
+    @Override
+    public int updateDoumuProductHistory(DoumuProductHistory doumuProductHistory)
+    {
+        doumuProductHistory.setUpdateTime(DateUtils.getNowDate());
+        return doumuProductHistoryMapper.updateDoumuProductHistory(doumuProductHistory);
+    }
+
+    /**
+     * 批量删除痘姆古陶主历史信息
+     * 
+     * @param historyIds 需要删除的痘姆古陶主历史信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDoumuProductHistoryByHistoryIds(Long[] historyIds)
+    {
+        return doumuProductHistoryMapper.deleteDoumuProductHistoryByHistoryIds(historyIds);
+    }
+
+    /**
+     * 删除痘姆古陶主历史信息信息
+     * 
+     * @param historyId 痘姆古陶主历史信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDoumuProductHistoryByHistoryId(Long historyId)
+    {
+        return doumuProductHistoryMapper.deleteDoumuProductHistoryByHistoryId(historyId);
+    }
+}

+ 96 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductInfoServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.DoumuProductInfoMapper;
+import com.ruoyi.system.domain.DoumuProductInfo;
+import com.ruoyi.system.service.IDoumuProductInfoService;
+
+/**
+ * 痘姆古陶信息Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+@Service
+public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService 
+{
+    @Autowired
+    private DoumuProductInfoMapper doumuProductInfoMapper;
+
+    /**
+     * 查询痘姆古陶信息
+     * 
+     * @param productId 痘姆古陶信息主键
+     * @return 痘姆古陶信息
+     */
+    @Override
+    public DoumuProductInfo selectDoumuProductInfoByProductId(Long productId)
+    {
+        return doumuProductInfoMapper.selectDoumuProductInfoByProductId(productId);
+    }
+
+    /**
+     * 查询痘姆古陶信息列表
+     * 
+     * @param doumuProductInfo 痘姆古陶信息
+     * @return 痘姆古陶信息
+     */
+    @Override
+    public List<DoumuProductInfo> selectDoumuProductInfoList(DoumuProductInfo doumuProductInfo)
+    {
+        return doumuProductInfoMapper.selectDoumuProductInfoList(doumuProductInfo);
+    }
+
+    /**
+     * 新增痘姆古陶信息
+     * 
+     * @param doumuProductInfo 痘姆古陶信息
+     * @return 结果
+     */
+    @Override
+    public int insertDoumuProductInfo(DoumuProductInfo doumuProductInfo)
+    {
+        doumuProductInfo.setCreateTime(DateUtils.getNowDate());
+        return doumuProductInfoMapper.insertDoumuProductInfo(doumuProductInfo);
+    }
+
+    /**
+     * 修改痘姆古陶信息
+     * 
+     * @param doumuProductInfo 痘姆古陶信息
+     * @return 结果
+     */
+    @Override
+    public int updateDoumuProductInfo(DoumuProductInfo doumuProductInfo)
+    {
+        doumuProductInfo.setUpdateTime(DateUtils.getNowDate());
+        return doumuProductInfoMapper.updateDoumuProductInfo(doumuProductInfo);
+    }
+
+    /**
+     * 批量删除痘姆古陶信息
+     * 
+     * @param productIds 需要删除的痘姆古陶信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDoumuProductInfoByProductIds(Long[] productIds)
+    {
+        return doumuProductInfoMapper.deleteDoumuProductInfoByProductIds(productIds);
+    }
+
+    /**
+     * 删除痘姆古陶信息信息
+     * 
+     * @param productId 痘姆古陶信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDoumuProductInfoByProductId(Long productId)
+    {
+        return doumuProductInfoMapper.deleteDoumuProductInfoByProductId(productId);
+    }
+}

+ 70 - 0
ruoyi-system/src/main/resources/mapper/system/DoumuProductFiMapper.xml

@@ -0,0 +1,70 @@
+<?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.ruoyi.system.mapper.DoumuProductFiMapper">
+    
+    <resultMap type="DoumuProductFi" id="DoumuProductFiResult">
+        <result property="fiId"    column="fi_id"    />
+        <result property="productId"    column="product_id"    />
+        <result property="fjName"    column="fj_name"    />
+        <result property="path"    column="path"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDoumuProductFiVo">
+        select fi_id, product_id, fj_name, path, remark from doumu_product_fi
+    </sql>
+
+    <select id="selectDoumuProductFiList" parameterType="DoumuProductFi" resultMap="DoumuProductFiResult">
+        <include refid="selectDoumuProductFiVo"/>
+        <where>  
+            <if test="productId != null "> and product_id = #{productId}</if>
+            <if test="fjName != null  and fjName != ''"> and fj_name like concat('%', #{fjName}, '%')</if>
+            <if test="path != null  and path != ''"> and path = #{path}</if>
+        </where>
+    </select>
+    
+    <select id="selectDoumuProductFiByFiId" parameterType="Long" resultMap="DoumuProductFiResult">
+        <include refid="selectDoumuProductFiVo"/>
+        where fi_id = #{fiId}
+    </select>
+        
+    <insert id="insertDoumuProductFi" parameterType="DoumuProductFi" useGeneratedKeys="true" keyProperty="fiId">
+        insert into doumu_product_fi
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="productId != null">product_id,</if>
+            <if test="fjName != null and fjName != ''">fj_name,</if>
+            <if test="path != null">path,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="productId != null">#{productId},</if>
+            <if test="fjName != null and fjName != ''">#{fjName},</if>
+            <if test="path != null">#{path},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDoumuProductFi" parameterType="DoumuProductFi">
+        update doumu_product_fi
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="fjName != null and fjName != ''">fj_name = #{fjName},</if>
+            <if test="path != null">path = #{path},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where fi_id = #{fiId}
+    </update>
+
+    <delete id="deleteDoumuProductFiByFiId" parameterType="Long">
+        delete from doumu_product_fi where fi_id = #{fiId}
+    </delete>
+
+    <delete id="deleteDoumuProductFiByFiIds" parameterType="String">
+        delete from doumu_product_fi where fi_id in 
+        <foreach item="fiId" collection="array" open="(" separator="," close=")">
+            #{fiId}
+        </foreach>
+    </delete>
+</mapper>

+ 106 - 0
ruoyi-system/src/main/resources/mapper/system/DoumuProductHistoryMapper.xml

@@ -0,0 +1,106 @@
+<?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.ruoyi.system.mapper.DoumuProductHistoryMapper">
+    
+    <resultMap type="DoumuProductHistory" id="DoumuProductHistoryResult">
+        <result property="historyId"    column="history_id"    />
+        <result property="productId"    column="product_id"    />
+        <result property="orderNumber"    column="order_number"    />
+        <result property="name"    column="name"    />
+        <result property="deliveryType"    column="delivery_type"    />
+        <result property="phonenumber"    column="phonenumber"    />
+        <result property="address"    column="address"    />
+        <result property="flowType"    column="flow_type"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDoumuProductHistoryVo">
+        select history_id,order_number, product_id, name, delivery_type, phonenumber, address, flow_type, create_by, create_time, update_by, update_time, remark from doumu_product_history
+    </sql>
+
+    <select id="selectDoumuProductHistoryList" parameterType="DoumuProductHistory" resultMap="DoumuProductHistoryResult">
+        <include refid="selectDoumuProductHistoryVo"/>
+        <where>  
+            <if test="productId != null "> and product_id = #{productId}</if>
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="deliveryType != null  and deliveryType != ''"> and delivery_type = #{deliveryType}</if>
+            <if test="phonenumber != null  and phonenumber != ''"> and phonenumber = #{phonenumber}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="flowType != null  and flowType != ''"> and flow_type = #{flowType}</if>
+        </where>
+    </select>
+    
+    <select id="selectDoumuProductHistoryByHistoryId" parameterType="Long" resultMap="DoumuProductHistoryResult">
+        <include refid="selectDoumuProductHistoryVo"/>
+        where history_id = #{historyId}
+    </select>
+        
+    <insert id="insertDoumuProductHistory" parameterType="DoumuProductHistory" useGeneratedKeys="true" keyProperty="historyId">
+        insert into doumu_product_history
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="productId != null">product_id,</if>
+            <if test="orderNumber != null "> order_number,</if>
+            <if test="name != null and name != ''">name,</if>
+            <if test="deliveryType != null">delivery_type,</if>
+            <if test="phonenumber != null">phonenumber,</if>
+            <if test="address != null">address,</if>
+            <if test="flowType != null">flow_type,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="productId != null">#{productId},</if>
+            <if test="orderNumber != null ">#{orderNumber},</if>
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="deliveryType != null">#{deliveryType},</if>
+            <if test="phonenumber != null">#{phonenumber},</if>
+            <if test="address != null">#{address},</if>
+            <if test="flowType != null">#{flowType},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDoumuProductHistory" parameterType="DoumuProductHistory">
+        update doumu_product_history
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="orderNumber != null  and orderNumber != ''"> order_number = #{orderNumber},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="deliveryType != null">delivery_type = #{deliveryType},</if>
+            <if test="phonenumber != null">phonenumber = #{phonenumber},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="flowType != null">flow_type = #{flowType},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where history_id = #{historyId}
+    </update>
+
+    <delete id="deleteDoumuProductHistoryByHistoryId" parameterType="Long">
+        delete from doumu_product_history where history_id = #{historyId}
+    </delete>
+
+    <delete id="deleteDoumuProductHistoryByHistoryIds" parameterType="String">
+        delete from doumu_product_history where history_id in 
+        <foreach item="historyId" collection="array" open="(" separator="," close=")">
+            #{historyId}
+        </foreach>
+    </delete>
+</mapper>

+ 106 - 0
ruoyi-system/src/main/resources/mapper/system/DoumuProductInfoMapper.xml

@@ -0,0 +1,106 @@
+<?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.ruoyi.system.mapper.DoumuProductInfoMapper">
+    
+    <resultMap type="DoumuProductInfo" id="DoumuProductInfoResult">
+        <result property="productId"    column="product_id"    />
+        <result property="orderNumber"    column="order_number"    />
+        <result property="name"    column="name"    />
+        <result property="deliveryType"    column="delivery_type"    />
+        <result property="phonenumber"    column="phonenumber"    />
+        <result property="address"    column="address"    />
+        <result property="flowType"    column="flow_type"    />
+        <result property="mailNo"    column="mailNo"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDoumuProductInfoVo">
+        select product_id,order_number, name, delivery_type, phonenumber, address, flow_type, mailNo, create_by, create_time, update_by, update_time, remark from doumu_product_info
+    </sql>
+
+    <select id="selectDoumuProductInfoList" parameterType="DoumuProductInfo" resultMap="DoumuProductInfoResult">
+        <include refid="selectDoumuProductInfoVo"/>
+        <where>
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="deliveryType != null  and deliveryType != ''"> and delivery_type = #{deliveryType}</if>
+            <if test="phonenumber != null  and phonenumber != ''"> and phonenumber = #{phonenumber}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="flowType != null  and flowType != ''"> and flow_type = #{flowType}</if>
+            <if test="mailNo != null  and mailNo != ''"> and mailNo = #{mailNo}</if>
+        </where>
+    </select>
+    
+    <select id="selectDoumuProductInfoByProductId" parameterType="Long" resultMap="DoumuProductInfoResult">
+        <include refid="selectDoumuProductInfoVo"/>
+        where product_id = #{productId}
+    </select>
+        
+    <insert id="insertDoumuProductInfo" parameterType="DoumuProductInfo" useGeneratedKeys="true" keyProperty="productId">
+        insert into doumu_product_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null "> order_number,</if>
+            <if test="name != null and name != ''">name,</if>
+            <if test="deliveryType != null">delivery_type,</if>
+            <if test="phonenumber != null">phonenumber,</if>
+            <if test="address != null">address,</if>
+            <if test="flowType != null">flow_type,</if>
+            <if test="mailNo != null">mailNo,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null ">#{orderNumber},</if>
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="deliveryType != null">#{deliveryType},</if>
+            <if test="phonenumber != null">#{phonenumber},</if>
+            <if test="address != null">#{address},</if>
+            <if test="flowType != null">#{flowType},</if>
+            <if test="mailNo != null">#{mailNo},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDoumuProductInfo" parameterType="DoumuProductInfo">
+        update doumu_product_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNumber != null  and orderNumber != ''"> order_number = #{orderNumber},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="deliveryType != null">delivery_type = #{deliveryType},</if>
+            <if test="phonenumber != null">phonenumber = #{phonenumber},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="flowType != null">flow_type = #{flowType},</if>
+            <if test="mailNo != null">mailNo = #{mailNo},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where product_id = #{productId}
+    </update>
+
+    <delete id="deleteDoumuProductInfoByProductId" parameterType="Long">
+        delete from doumu_product_info where product_id = #{productId}
+    </delete>
+
+    <delete id="deleteDoumuProductInfoByProductIds" parameterType="String">
+        delete from doumu_product_info where product_id in 
+        <foreach item="productId" collection="array" open="(" separator="," close=")">
+            #{productId}
+        </foreach>
+    </delete>
+</mapper>