新

+package org.jeecg.modules.erp.trad.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.erp.trad.entity.TblTradTou;
+import org.jeecg.modules.erp.trad.service.TblTradTouService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.erp.trad.service.TblTradTouService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: tbl_trad_tou
+ * @Author: jeecg-boot
+ * @Date:   2024-04-12
+ * @Version: V1.0
+ */
+@Api(tags="tbl_trad_tou")
+@RestController
+@RequestMapping("/trad/tblTradTou")
+@Slf4j
+public class TblTradTouController extends JeecgController<TblTradTou, TblTradTouService> {
+	@Autowired
+	private TblTradTouService tblTradTouService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param tblTradTou
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "tbl_trad_tou-分页列表查询")
+	@ApiOperation(value="tbl_trad_tou-分页列表查询", notes="tbl_trad_tou-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TblTradTou>> queryPageList(TblTradTou tblTradTou,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TblTradTou> queryWrapper = QueryGenerator.initQueryWrapper(tblTradTou, req.getParameterMap());
+		Page<TblTradTou> page = new Page<TblTradTou>(pageNo, pageSize);
+		IPage<TblTradTou> pageList = tblTradTouService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param tblTradTou
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_tou-添加")
+	@ApiOperation(value="tbl_trad_tou-添加", notes="tbl_trad_tou-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TblTradTou tblTradTou) {
+		tblTradTouService.save(tblTradTou);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param tblTradTou
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_tou-编辑")
+	@ApiOperation(value="tbl_trad_tou-编辑", notes="tbl_trad_tou-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TblTradTou tblTradTou) {
+		tblTradTouService.updateById(tblTradTou);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_tou-通过id删除")
+	@ApiOperation(value="tbl_trad_tou-通过id删除", notes="tbl_trad_tou-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		tblTradTouService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_tou-批量删除")
+	@ApiOperation(value="tbl_trad_tou-批量删除", notes="tbl_trad_tou-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.tblTradTouService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "tbl_trad_tou-通过id查询")
+	@ApiOperation(value="tbl_trad_tou-通过id查询", notes="tbl_trad_tou-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TblTradTou> queryById(@RequestParam(name="id",required=true) String id) {
+		TblTradTou tblTradTou = tblTradTouService.getById(id);
+		if(tblTradTou==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(tblTradTou);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param tblTradTou
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TblTradTou tblTradTou) {
+        return super.exportXls(request, tblTradTou, TblTradTou.class, "tbl_trad_tou");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TblTradTou.class);
+    }
+
+}

@@ -35,20 +35,7 @@ public class TblTradFphk implements Serializable {
     @TableId(type = IdType.ASSIGN_ID)
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     @ApiModelProperty(value = "id")
     private java.lang.Integer id;
     private java.lang.Integer id;
-    /**送货时间*/
-    @Excel(name = "送货时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "送货时间")
-    private java.util.Date deliveryTime;
-    /**交接人*/
-    @Excel(name = "交接人", width = 15)
-    @ApiModelProperty(value = "交接人")
-    private java.lang.String jiaojieren;
-    /**送货单扫描件*/
-    @Excel(name = "送货单扫描件", width = 15)
-    @ApiModelProperty(value = "送货单扫描件")
-    private java.lang.String scannedCopies;
+
     /**开票时间*/
     /**开票时间*/
     @Excel(name = "开票时间", width = 15, format = "yyyy-MM-dd")
     @Excel(name = "开票时间", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

@@ -35,22 +35,6 @@ public class TblTradTender implements Serializable {
     @TableId(type = IdType.ASSIGN_ID)
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     @ApiModelProperty(value = "id")
     private java.lang.Integer id;
     private java.lang.Integer id;
-    /**投标价格（不含税）*/
-    @Excel(name = "投标价格（不含税）", width = 15)
-    @ApiModelProperty(value = "投标价格（不含税）")
-    private java.math.BigDecimal bidPrice;
-    /**中标单价*/
-    @Excel(name = "中标单价", width = 15)
-    @ApiModelProperty(value = "中标单价")
-    private java.math.BigDecimal zhongPrice;
-    /**中标数量*/
-    @Excel(name = "中标数量", width = 15)
-    @ApiModelProperty(value = "中标数量")
-    private java.lang.Integer zhongNum;
-    /**中标总价*/
-    @Excel(name = "中标总价", width = 15)
-    @ApiModelProperty(value = "中标总价")
-    private java.math.BigDecimal totalPrice;
     /**采购厂商*/
     /**采购厂商*/
     @Excel(name = "采购厂商", width = 15)
     @Excel(name = "采购厂商", width = 15)
     @ApiModelProperty(value = "采购厂商")
     @ApiModelProperty(value = "采购厂商")
@@ -103,6 +87,20 @@ public class TblTradTender implements Serializable {
     @Excel(name = "备注", width = 15)
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     @ApiModelProperty(value = "备注")
     private java.lang.String notes;
     private java.lang.String notes;
+    /**送货时间*/
+    @Excel(name = "送货时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "送货时间")
+    private java.util.Date songTime;
+    /**交接人*/
+    @Excel(name = "交接人", width = 15)
+    @ApiModelProperty(value = "交接人")
+    private java.lang.String jiaojieren;
+    /**送货单扫描件*/
+    @Excel(name = "送货单扫描件", width = 15)
+    @ApiModelProperty(value = "送货单扫描件")
+    private java.lang.String scannedCopies;
     /**毛利润*/
     /**毛利润*/
     @Excel(name = "毛利润", width = 15)
     @Excel(name = "毛利润", width = 15)
     @ApiModelProperty(value = "毛利润")
     @ApiModelProperty(value = "毛利润")

+package org.jeecg.modules.erp.trad.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: tbl_trad_tou
+ * @Author: jeecg-boot
+ * @Date:   2024-04-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("tbl_trad_tou")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tbl_trad_tou对象", description="tbl_trad_tou")
+public class TblTradTou implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+	/**投标价格（不含税）*/
+	@Excel(name = "投标价格（不含税）", width = 15)
+    @ApiModelProperty(value = "投标价格（不含税）")
+    private BigDecimal bidPrice;
+	/**中标单价*/
+	@Excel(name = "中标单价", width = 15)
+    @ApiModelProperty(value = "中标单价")
+    private BigDecimal zhongPrice;
+	/**中标数量*/
+	@Excel(name = "中标数量", width = 15)
+    @ApiModelProperty(value = "中标数量")
+    private Integer zhongNum;
+	/**中标总价*/
+	@Excel(name = "中标总价", width = 15)
+    @ApiModelProperty(value = "中标总价")
+    private BigDecimal totalPrice;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+}

+package org.jeecg.modules.erp.trad.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.erp.trad.entity.TblTradTou;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: tbl_trad_tou
+ * @Author: jeecg-boot
+ * @Date:   2024-04-12
+ * @Version: V1.0
+ */
+public interface TblTradTouMapper extends BaseMapper<TblTradTou> {
+
+}

+<?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="org.jeecg.modules.erp.trad.mapper.TblTradTouMapper">
+
+</mapper>

+package org.jeecg.modules.erp.trad.service;
+
+import org.jeecg.modules.erp.trad.entity.TblTradTou;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: tbl_trad_tou
+ * @Author: jeecg-boot
+ * @Date:   2024-04-12
+ * @Version: V1.0
+ */
+public interface TblTradTouService extends IService<TblTradTou> {
+
+}

+package org.jeecg.modules.erp.trad.service.impl;
+
+import org.jeecg.modules.erp.trad.entity.TblTradTou;
+import org.jeecg.modules.erp.trad.mapper.TblTradTouMapper;
+import org.jeecg.modules.erp.trad.service.TblTradTouService;
+import org.jeecg.modules.erp.trad.service.TblTradTouService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: tbl_trad_tou
+ * @Author: jeecg-boot
+ * @Date:   2024-04-12
+ * @Version: V1.0
+ */
+@Service
+public class TblTradTouServiceImpl extends ServiceImpl<TblTradTouMapper, TblTradTou> implements TblTradTouService {
+
+}