新

+package org.jeecg.modules.erp.bidding_info.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 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.bidding_info.entity.TblBiddingShenq;
+import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
+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_bidding_shenq
+ * @Author: jeecg-boot
+ * @Date:   2024-04-22
+ * @Version: V1.0
+ */
+@Api(tags="tbl_bidding_shenq")
+@RestController
+@RequestMapping("/trad/tblBiddingShenq")
+@Slf4j
+public class TblBiddingShenqController extends JeecgController<TblBiddingShenq, ITblBiddingShenqService> {
+	@Autowired
+	private ITblBiddingShenqService tblBiddingShenqService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param tblBiddingShenq
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "tbl_bidding_shenq-分页列表查询")
+	@ApiOperation(value="tbl_bidding_shenq-分页列表查询", notes="tbl_bidding_shenq-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TblBiddingShenq>> queryPageList(TblBiddingShenq tblBiddingShenq,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TblBiddingShenq> queryWrapper = QueryGenerator.initQueryWrapper(tblBiddingShenq, req.getParameterMap());
+		Page<TblBiddingShenq> page = new Page<TblBiddingShenq>(pageNo, pageSize);
+		IPage<TblBiddingShenq> pageList = tblBiddingShenqService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param tblBiddingShenq
+	 * @return
+	 */
+	@AutoLog(value = "tbl_bidding_shenq-添加")
+	@ApiOperation(value="tbl_bidding_shenq-添加", notes="tbl_bidding_shenq-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TblBiddingShenq tblBiddingShenq) {
+		tblBiddingShenqService.save(tblBiddingShenq);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param tblBiddingShenq
+	 * @return
+	 */
+	@AutoLog(value = "tbl_bidding_shenq-编辑")
+	@ApiOperation(value="tbl_bidding_shenq-编辑", notes="tbl_bidding_shenq-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TblBiddingShenq tblBiddingShenq) {
+		tblBiddingShenqService.updateById(tblBiddingShenq);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "tbl_bidding_shenq-通过id删除")
+	@ApiOperation(value="tbl_bidding_shenq-通过id删除", notes="tbl_bidding_shenq-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		tblBiddingShenqService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "tbl_bidding_shenq-批量删除")
+	@ApiOperation(value="tbl_bidding_shenq-批量删除", notes="tbl_bidding_shenq-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.tblBiddingShenqService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "tbl_bidding_shenq-通过id查询")
+	@ApiOperation(value="tbl_bidding_shenq-通过id查询", notes="tbl_bidding_shenq-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TblBiddingShenq> queryById(@RequestParam(name="id",required=true) String id) {
+		TblBiddingShenq tblBiddingShenq = tblBiddingShenqService.getById(id);
+		if(tblBiddingShenq==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(tblBiddingShenq);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param tblBiddingShenq
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TblBiddingShenq tblBiddingShenq) {
+        return super.exportXls(request, tblBiddingShenq, TblBiddingShenq.class, "tbl_bidding_shenq");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TblBiddingShenq.class);
+    }
+
+}

+package org.jeecg.modules.erp.bidding_info.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_bidding_shenq
+ * @Author: jeecg-boot
+ * @Date:   2024-04-22
+ * @Version: V1.0
+ */
+@Data
+@TableName("tbl_bidding_shenq")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tbl_bidding_shenq对象", description="tbl_bidding_shenq")
+public class TblBiddingShenq 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 String productName;
+	/**规格*/
+	@Excel(name = "规格", width = 15)
+    @ApiModelProperty(value = "规格")
+    private String specifications;
+	/**数量*/
+	@Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private Integer num;
+    /**数量*/
+    @Excel(name = "单位", width = 15)
+    @ApiModelProperty(value = "单位")
+    private String danwei;
+    /**到货日期*/
+    @Excel(name = "到货日期", width = 15)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "到货日期")
+    private Date deliveryTime;
+	/**品牌*/
+	@Excel(name = "品牌", width = 15)
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String notes;
+	/**申请人*/
+	@Excel(name = "申请人", width = 15)
+    @ApiModelProperty(value = "申请人")
+    private String applicant;
+	/**一级审批人*/
+	@Excel(name = "一级审批人", width = 15)
+    @ApiModelProperty(value = "一级审批人")
+    private String spOne;
+	/**二级审批人*/
+	@Excel(name = "二级审批人", width = 15)
+    @ApiModelProperty(value = "二级审批人")
+    private String spTwo;
+    /**备注*/
+    @Excel(name = "不同意备注", width = 15)
+    @ApiModelProperty(value = "不同意备注")
+    private String noNotes;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+}

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

+<?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.bidding_info.mapper.TblBiddingShenqMapper">
+
+</mapper>

+package org.jeecg.modules.erp.bidding_info.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
+
+/**
+ * @Description: tbl_bidding_shenq
+ * @Author: jeecg-boot
+ * @Date:   2024-04-22
+ * @Version: V1.0
+ */
+public interface ITblBiddingShenqService extends IService<TblBiddingShenq> {
+
+}

+package org.jeecg.modules.erp.bidding_info.service.impl;
+
+import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
+import org.jeecg.modules.erp.bidding_info.mapper.TblBiddingShenqMapper;
+import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: tbl_bidding_shenq
+ * @Author: jeecg-boot
+ * @Date:   2024-04-22
+ * @Version: V1.0
+ */
+@Service
+public class TblBiddingShenqServiceImpl extends ServiceImpl<TblBiddingShenqMapper, TblBiddingShenq> implements ITblBiddingShenqService {
+
+}

@@ -136,9 +136,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
         master:
         master:
-          url: jdbc:mysql://rm-2zeiuncjm75qti641ho.mysql.rds.aliyuncs.com:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: ntsd_root
-          password: L3bHRJwg6lJ2SC4WFfGA
+          url: jdbc:mysql://localhost:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
           driver-class-name: com.mysql.cj.jdbc.Driver
 #   192.168.110.10    pass#word1   url: jdbc:mysql://rm-2zeiuncjm75qti641ho.mysql.rds.aliyuncs.com:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 #   192.168.110.10    pass#word1   url: jdbc:mysql://rm-2zeiuncjm75qti641ho.mysql.rds.aliyuncs.com:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 #          username: ntsd_root
 #          username: ntsd_root
@@ -153,7 +153,7 @@ spring:
   #redis 配置
   #redis 配置
   redis:
   redis:
     database: 0
     database: 0
-    host: 172.18.0.4
+    host: 127.0.0.1
     lettuce:
     lettuce:
       pool:
       pool:
         max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
         max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
@@ -264,7 +264,7 @@ jeecg:
       data-type: database
       data-type: database
   #分布式锁配置
   #分布式锁配置
   redisson:
   redisson:
-    address: 172.18.0.4:6379
+    address: 127.0.0.1:6379
     password:
     password:
     type: STANDALONE
     type: STANDALONE
     enabled: true
     enabled: true