更新采购

ruoyi-admin/src/main/resources/application-dev.yml

@@ -80,4 +80,20 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: RuoYi
+    # 版本
+    version: 3.9.0
+    # 版权年份
+    copyrightYear: 2025
+    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: D:/.doc/file/ruoyi
+    #  profile: /file
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数字计算 char 字符验证
+    captchaType: math

ruoyi-admin/src/main/resources/application-prod.yml

@@ -80,4 +80,19 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: RuoYi
+    # 版本
+    version: 3.9.0
+    # 版权年份
+    copyrightYear: 2025
+    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: /file
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数字计算 char 字符验证
+    captchaType: math

ruoyi-admin/src/main/resources/application.yml

@@ -1,19 +1,3 @@
-# 项目相关配置
-ruoyi:
-  # 名称
-  name: RuoYi
-  # 版本
-  version: 3.9.0
-  # 版权年份
-  copyrightYear: 2025
-  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/.doc/file/ruoyi
-#  profile: /file
-  # 获取ip地址开关
-  addressEnabled: false
-  # 验证码类型 math 数字计算 char 字符验证
-  captchaType: math
-
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080

ruoyi-service/src/main/java/com/ruoyi/web/controller/CgInfoController.java

@@ -1,9 +1,16 @@
 package com.ruoyi.web.controller;
 
+import java.text.DecimalFormat;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.web.domain.CgYmq;
+import com.ruoyi.web.service.ICgYmqService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,7 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 采购信息Controller
  * 
  * @author shenzx
- * @date 2025-09-26
+ * @date 2025-09-28
  */
 @RestController
 @RequestMapping("/cg/info")
@@ -39,10 +46,35 @@ public class CgInfoController extends BaseController
         this.cgInfoService = cgInfoService;
     }
 
+    private ICgYmqService cgYmqService;
+    @Autowired
+    public void setCgYmqService(ICgYmqService cgYmqService) {
+        this.cgYmqService = cgYmqService;
+    }
+
+    @GetMapping("cgpc")
+    @ApiOperation("获取采购批次")
+    public AjaxResult cgpc(String splx){
+        QueryWrapper<CgInfo> qw = new QueryWrapper<>();
+        qw.lambda().eq(CgInfo::getSplx,splx).orderByDesc(CgInfo::getCgsj);
+        return success(cgInfoService.list(qw));
+    }
+
+    /**
+     * 查询采购信息全部列表
+     */
+    @GetMapping("/all")
+    public AjaxResult all(CgInfo cgInfo)
+    {
+        QueryWrapper<CgInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(cgInfo);
+        List<CgInfo> cgInfoList = cgInfoService.list(queryWrapper);
+        return success(cgInfoList);
+    }
+
     /**
      * 查询采购信息列表
      */
-    @PreAuthorize("@ss.hasPermi('cg:info:list')")
     @GetMapping("/list")
     public TableDataInfo list(CgInfo cgInfo)
     {
@@ -56,7 +88,6 @@ public class CgInfoController extends BaseController
     /**
      * 导出采购信息列表
      */
-    @PreAuthorize("@ss.hasPermi('cg:info:export')")
     @Log(title = "采购信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CgInfo cgInfo)
@@ -71,45 +102,70 @@ public class CgInfoController extends BaseController
     /**
      * 获取采购信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('cg:info:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(cgInfoService.getById(id));
+        CgInfo cgInfo = cgInfoService.getById(id);
+        QueryWrapper<CgYmq> cyQW = new QueryWrapper<>();
+        cyQW.lambda().eq(CgYmq::getFid,cgInfo.getId());
+        cgInfo.setCgYmq(cgYmqService.getOne(cyQW));
+        return success(cgInfo);
     }
 
     /**
      * 新增采购信息
      */
-    @PreAuthorize("@ss.hasPermi('cg:info:add')")
     @Log(title = "采购信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CgInfo cgInfo)
     {
         cgInfoService.save(cgInfo);
+
+        CgYmq cgYmq = cgInfo.getCgYmq();
+        if (Objects.nonNull(cgYmq)) {
+            cgYmq.setFid(cgInfo.getId());
+            cgYmqService.save(cgYmq);
+        }
         return success(cgInfo);
     }
 
+    private String genCgpc(String splx){
+        LocalDateTime now = LocalDateTime.now();
+        DecimalFormat splxFormat = new DecimalFormat("00");
+        DecimalFormat xhFormat = new DecimalFormat("0000");
+        QueryWrapper<CgInfo> qw = new QueryWrapper<>();
+        qw.lambda().select(CgInfo::getCgpc).orderByDesc(CgInfo::getCgpc);
+        List<CgInfo> list = cgInfoService.list(qw);
+        String cgpc = list.get(0).getCgpc();
+
+    }
+
     /**
      * 修改采购信息
      */
-    @PreAuthorize("@ss.hasPermi('cg:info:edit')")
     @Log(title = "采购信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CgInfo cgInfo)
     {
         cgInfoService.updateById(cgInfo);
+        CgYmq cgYmq = cgInfo.getCgYmq();
+        if(Objects.nonNull(cgYmq)) {
+            cgYmq.setFid(cgInfo.getId());
+            cgYmqService.saveOrUpdate(cgYmq);
+        }
         return success(cgInfo);
     }
 
     /**
      * 删除采购信息
      */
-    @PreAuthorize("@ss.hasPermi('cg:info:remove')")
     @Log(title = "采购信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
+        QueryWrapper<CgYmq> cyQW = new QueryWrapper<>();
+        cyQW.lambda().in(CgYmq::getFid,Arrays.asList(ids));
+        cgYmqService.remove(cyQW);
         return toAjax(cgInfoService.removeByIds(Arrays.asList(ids)));
     }
 }

ruoyi-service/src/main/java/com/ruoyi/web/controller/CgYmqController.java

@@ -0,0 +1,115 @@
+package com.ruoyi.web.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.web.domain.CgYmq;
+import com.ruoyi.web.service.ICgYmqService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 采购信息-羽毛球Controller
+ * 
+ * @author shenzx
+ * @date 2025-09-28
+ */
+@RestController
+@RequestMapping("/cg/ymq")
+public class CgYmqController extends BaseController
+{
+    private ICgYmqService cgYmqService;
+    @Autowired
+    public void setCgYmqService(ICgYmqService cgYmqService) {
+        this.cgYmqService = cgYmqService;
+    }
+
+    /**
+     * 查询采购信息-羽毛球列表
+     */
+    @PreAuthorize("@ss.hasPermi('cg:ymq:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CgYmq cgYmq)
+    {
+        startPage();
+        QueryWrapper<CgYmq> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(cgYmq);
+        List<CgYmq> cgYmqList = cgYmqService.list(queryWrapper);
+        return getDataTable(cgYmqList);
+    }
+
+    /**
+     * 导出采购信息-羽毛球列表
+     */
+    @PreAuthorize("@ss.hasPermi('cg:ymq:export')")
+    @Log(title = "采购信息-羽毛球", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CgYmq cgYmq)
+    {
+        QueryWrapper<CgYmq> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(cgYmq);
+        List<CgYmq> list = cgYmqService.list(queryWrapper);
+        ExcelUtil<CgYmq> util = new ExcelUtil<>(CgYmq.class);
+        util.exportExcel(response, list, "采购信息-羽毛球数据");
+    }
+
+    /**
+     * 获取采购信息-羽毛球详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('cg:ymq:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(cgYmqService.getById(id));
+    }
+
+    /**
+     * 新增采购信息-羽毛球
+     */
+    @PreAuthorize("@ss.hasPermi('cg:ymq:add')")
+    @Log(title = "采购信息-羽毛球", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CgYmq cgYmq)
+    {
+        cgYmqService.save(cgYmq);
+        return success(cgYmq);
+    }
+
+    /**
+     * 修改采购信息-羽毛球
+     */
+    @PreAuthorize("@ss.hasPermi('cg:ymq:edit')")
+    @Log(title = "采购信息-羽毛球", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CgYmq cgYmq)
+    {
+        cgYmqService.updateById(cgYmq);
+        return success(cgYmq);
+    }
+
+    /**
+     * 删除采购信息-羽毛球
+     */
+    @PreAuthorize("@ss.hasPermi('cg:ymq:remove')")
+    @Log(title = "采购信息-羽毛球", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(cgYmqService.removeByIds(Arrays.asList(ids)));
+    }
+}

ruoyi-service/src/main/java/com/ruoyi/web/controller/FileController.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Cleanup;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.util.DigestUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -80,4 +79,16 @@ public class FileController extends BaseController {
         FileUtils.writeBytes(downloadPath, response.getOutputStream());
     }
 
+    @DeleteMapping("{id}")
+    @ApiOperation("文件删除")
+    public AjaxResult delete(@PathVariable Long id) {
+        FileInfo fileInfo = fileInfoService.getById(id);
+        String path = fileInfo.getPath();
+        String localPath = RuoYiConfig.getProfile();
+        String absPath = localPath + FileUtils.stripPrefix(path);
+        FileUtils.deleteFile(absPath);
+        fileInfoService.removeById(id);
+        return success();
+    }
+
 }

ruoyi-service/src/main/java/com/ruoyi/web/controller/FileInfoController.java

@@ -47,7 +47,6 @@ public class FileInfoController extends BaseController
     /**
      * 查询文件信息列表
      */
-    @PreAuthorize("@ss.hasPermi('file:info:list')")
     @GetMapping("/list")
     public TableDataInfo list(FileInfo fileInfo)
     {
@@ -61,7 +60,6 @@ public class FileInfoController extends BaseController
     /**
      * 导出文件信息列表
      */
-    @PreAuthorize("@ss.hasPermi('file:info:export')")
     @Log(title = "文件信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, FileInfo fileInfo)
@@ -76,7 +74,6 @@ public class FileInfoController extends BaseController
     /**
      * 获取文件信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('file:info:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -86,7 +83,6 @@ public class FileInfoController extends BaseController
     /**
      * 新增文件信息
      */
-    @PreAuthorize("@ss.hasPermi('file:info:add')")
     @Log(title = "文件信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FileInfo fileInfo)
@@ -98,7 +94,6 @@ public class FileInfoController extends BaseController
     /**
      * 修改文件信息
      */
-    @PreAuthorize("@ss.hasPermi('file:info:edit')")
     @Log(title = "文件信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FileInfo fileInfo)
@@ -110,7 +105,6 @@ public class FileInfoController extends BaseController
     /**
      * 删除文件信息
      */
-    @PreAuthorize("@ss.hasPermi('file:info:remove')")
     @Log(title = "文件信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-service/src/main/java/com/ruoyi/web/domain/CgInfo.java

@@ -1,15 +1,13 @@
 package com.ruoyi.web.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import lombok.EqualsAndHashCode;
 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 java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 import lombok.Data;
@@ -18,12 +16,11 @@ import lombok.Data;
  * 采购信息对象 cg_info
  * 
  * @author shenzx
- * @date 2025-09-26
+ * @date 2025-09-28
  */
-@EqualsAndHashCode(callSuper = true)
 @TableName(value ="cg_info")
 @Data
-public class CgInfo extends BaseEntity implements Serializable {
+public class CgInfo implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
@@ -38,34 +35,25 @@ public class CgInfo extends BaseEntity implements Serializable {
     @ApiModelProperty("订单号")
     private String ddh;
 
-    /** 品牌 */
-    @Excel(name = "品牌")
-    @ApiModelProperty("品牌")
-    private String pp;
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String spmc;
 
-    /** 型号 */
-    @Excel(name = "型号")
-    @ApiModelProperty("型号")
-    private String xh;
+    /** 商品类型 */
+    @Excel(name = "商品类型")
+    @ApiModelProperty("商品类型")
+    private String splx;
 
-    /** 桶数 */
-    @Excel(name = "桶数")
-    @ApiModelProperty("桶数")
-    private String ts;
-
-    /** 每桶个数 */
-    @Excel(name = "每桶个数")
-    @ApiModelProperty("每桶个数")
-    private String mtgs;
-
-    /** 价格 */
-    @Excel(name = "价格")
-    @ApiModelProperty("价格")
-    private BigDecimal jg;
+    /** 采购数量 */
+    @Excel(name = "采购数量")
+    @ApiModelProperty("采购数量")
+    private String cgsl;
 
     /** 采购时间 */
     @Excel(name = "采购时间")
     @ApiModelProperty("采购时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date cgsj;
 
     /** 商品图片 */
@@ -78,4 +66,12 @@ public class CgInfo extends BaseEntity implements Serializable {
     @ApiModelProperty("订单截图")
     private String fileDdjt;
 
+    /** 采购批次 */
+    @Excel(name = "采购批次")
+    @ApiModelProperty("采购批次")
+    private String cgpc;
+
+    @TableField(exist = false)
+    private CgYmq cgYmq;
+
 }

ruoyi-service/src/main/java/com/ruoyi/web/domain/CgYmq.java

@@ -0,0 +1,52 @@
+package com.ruoyi.web.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+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 java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 采购信息-羽毛球对象 cg_ymq
+ * 
+ * @author shenzx
+ * @date 2025-09-28
+ */
+@TableName(value ="cg_ymq")
+@Data
+public class CgYmq implements Serializable {
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @ApiModelProperty("主键")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** cg_info表主键 */
+    @Excel(name = "cg_info表主键")
+    @ApiModelProperty("cg_info表主键")
+    private Long fid;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    @ApiModelProperty("品牌")
+    private String pp;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    @ApiModelProperty("型号")
+    private String xh;
+
+    /** 每桶数量 */
+    @Excel(name = "每桶数量")
+    @ApiModelProperty("每桶数量")
+    private String mtsl;
+
+}

ruoyi-service/src/main/java/com/ruoyi/web/mapper/CgInfoMapper.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
  * 采购信息Mapper接口
  * 
  * @author shenzx
- * @date 2025-09-26
+ * @date 2025-09-28
  */
 @Repository
 public interface CgInfoMapper extends BaseMapper<CgInfo> {

ruoyi-service/src/main/java/com/ruoyi/web/mapper/CgYmqMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.web.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.domain.CgYmq;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 采购信息-羽毛球Mapper接口
+ * 
+ * @author shenzx
+ * @date 2025-09-28
+ */
+@Repository
+public interface CgYmqMapper extends BaseMapper<CgYmq> {
+
+}

ruoyi-service/src/main/java/com/ruoyi/web/service/ICgInfoService.java

@@ -7,7 +7,7 @@ import com.ruoyi.web.domain.CgInfo;
  * 采购信息Service接口
  * 
  * @author shenzx
- * @date 2025-09-26
+ * @date 2025-09-28
  */
 public interface ICgInfoService extends IService<CgInfo> {
 

ruoyi-service/src/main/java/com/ruoyi/web/service/ICgYmqService.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.domain.CgYmq;
+
+/**
+ * 采购信息-羽毛球Service接口
+ * 
+ * @author shenzx
+ * @date 2025-09-28
+ */
+public interface ICgYmqService extends IService<CgYmq> {
+
+}

ruoyi-service/src/main/java/com/ruoyi/web/service/impl/CgInfoServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * 采购信息Service业务层处理
  * 
  * @author shenzx
- * @date 2025-09-26
+ * @date 2025-09-28
  */
 @Service
 public class CgInfoServiceImpl extends ServiceImpl<CgInfoMapper, CgInfo> implements ICgInfoService {

ruoyi-service/src/main/java/com/ruoyi/web/service/impl/CgYmqServiceImpl.java

@@ -0,0 +1,18 @@
+package com.ruoyi.web.service.impl;
+
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.mapper.CgYmqMapper;
+import com.ruoyi.web.domain.CgYmq;
+import com.ruoyi.web.service.ICgYmqService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 采购信息-羽毛球Service业务层处理
+ * 
+ * @author shenzx
+ * @date 2025-09-28
+ */
+@Service
+public class CgYmqServiceImpl extends ServiceImpl<CgYmqMapper, CgYmq> implements ICgYmqService {
+
+}

ruoyi-service/src/main/resources/mapper/cg/CgInfoMapper.xml

@@ -7,31 +7,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CgInfo" id="CgInfoResult">
         <result property="id"    column="id"    />
         <result property="ddh"    column="ddh"    />
-        <result property="pp"    column="pp"    />
-        <result property="xh"    column="xh"    />
-        <result property="ts"    column="ts"    />
-        <result property="mtgs"    column="mtgs"    />
-        <result property="jg"    column="jg"    />
+        <result property="spmc"    column="spmc"    />
+        <result property="splx"    column="splx"    />
+        <result property="cgsl"    column="cgsl"    />
+        <result property="cgsj"    column="cgsj"    />
+        <result property="fileSptp"    column="file_sptp"    />
         <result property="fileDdjt"    column="file_ddjt"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="Base_Column_List">
         id,
         ddh,
-        pp,
-        xh,
-        ts,
-        mtgs,
-        jg,
-        file_ddjt,
-        create_by,
-        create_time,
-        update_by,
-        update_time
+        spmc,
+        splx,
+        cgsl,
+        cgsj,
+        file_sptp,
+        file_ddjt
     </sql>
 
 </mapper>

ruoyi-service/src/main/resources/mapper/cg/CgYmqMapper.xml

@@ -0,0 +1,23 @@
+<?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.web.mapper.CgYmqMapper">
+    
+    <resultMap type="CgYmq" id="CgYmqResult">
+        <result property="id"    column="id"    />
+        <result property="fid"    column="fid"    />
+        <result property="pp"    column="pp"    />
+        <result property="xh"    column="xh"    />
+        <result property="mtsl"    column="mtsl"    />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        fid,
+        pp,
+        xh,
+        mtsl
+    </sql>
+
+</mapper>