重新使用主次表生成作物档案，暂未生成作物阶段。

private-farm/src/main/java/com/jlt/csa/controller/CropPhaseController.java

@@ -1,104 +0,0 @@
-package com.jlt.csa.controller;
-
-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.jlt.csa.domain.CropPhase;
-import com.jlt.csa.service.ICropPhaseService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 作物生长阶段Controller
- * 
- * @author JiaLeitao
- * @date 2022-03-26
- */
-@RestController
-@RequestMapping("/csa/phase")
-public class CropPhaseController extends BaseController
-{
-    @Autowired
-    private ICropPhaseService cropPhaseService;
-
-    /**
-     * 查询作物生长阶段列表
-     */
-    @PreAuthorize("@ss.hasPermi('csa:phase:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(CropPhase cropPhase)
-    {
-        startPage();
-        List<CropPhase> list = cropPhaseService.selectCropPhaseList(cropPhase);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出作物生长阶段列表
-     */
-    @PreAuthorize("@ss.hasPermi('csa:phase:export')")
-    @Log(title = "作物生长阶段", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CropPhase cropPhase)
-    {
-        List<CropPhase> list = cropPhaseService.selectCropPhaseList(cropPhase);
-        ExcelUtil<CropPhase> util = new ExcelUtil<CropPhase>(CropPhase.class);
-        util.exportExcel(response, list, "作物生长阶段数据");
-    }
-
-    /**
-     * 获取作物生长阶段详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('csa:phase:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(cropPhaseService.selectCropPhaseById(id));
-    }
-
-    /**
-     * 新增作物生长阶段
-     */
-    @PreAuthorize("@ss.hasPermi('csa:phase:add')")
-    @Log(title = "作物生长阶段", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CropPhase cropPhase)
-    {
-        return toAjax(cropPhaseService.insertCropPhase(cropPhase));
-    }
-
-    /**
-     * 修改作物生长阶段
-     */
-    @PreAuthorize("@ss.hasPermi('csa:phase:edit')")
-    @Log(title = "作物生长阶段", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CropPhase cropPhase)
-    {
-        return toAjax(cropPhaseService.updateCropPhase(cropPhase));
-    }
-
-    /**
-     * 删除作物生长阶段
-     */
-    @PreAuthorize("@ss.hasPermi('csa:phase:remove')")
-    @Log(title = "作物生长阶段", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(cropPhaseService.deleteCropPhaseByIds(ids));
-    }
-}

private-farm/src/main/java/com/jlt/csa/domain/CropFile.java

@@ -1,26 +1,27 @@
 package com.jlt.csa.domain;
 
+import java.util.List;
 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;
 
 /**
- * 作物档案对象 csa_crop_files
+ * 作物档案对象 csa_crop_file
  * 
- * @author JiaLeitao
+ * @author 郏磊涛
- * @date 2022-03-25
+ * @date 2022-03-30
  */
-public class CropFiles extends BaseEntity
+public class CropFile extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 作物档案id */
-    private Long id;
+    private Long cropId;
 
     /** 作物名称 */
     @Excel(name = "作物名称")
-    private String name;
+    private String cropName;
 
     /** 种植指南 */
     private String plantGuide;
@@ -30,6 +31,7 @@ public class CropFiles extends BaseEntity
     private String picture;
 
     /** 作物描述 */
+    @Excel(name = "作物描述")
     private String description;
 
     /** 状态 */
@@ -39,23 +41,26 @@ public class CropFiles extends BaseEntity
     /** 删除标志 */
     private String delFlag;
 
-    public void setId(Long id) 
+    /** 作物生长阶段信息 */
+    private List<CropPhase> cropPhaseList;
+
+    public void setCropId(Long cropId) 
     {
-        this.id = id;
+        this.cropId = cropId;
     }
 
-    public Long getId() 
+    public Long getCropId() 
     {
-        return id;
+        return cropId;
     }
-    public void setName(String name) 
+    public void setCropName(String cropName) 
     {
-        this.name = name;
+        this.cropName = cropName;
     }
 
-    public String getName() 
+    public String getCropName() 
     {
-        return name;
+        return cropName;
     }
     public void setPlantGuide(String plantGuide) 
     {
@@ -103,11 +108,21 @@ public class CropFiles extends BaseEntity
         return delFlag;
     }
 
+    public List<CropPhase> getCropPhaseList()
+    {
+        return cropPhaseList;
+    }
+
+    public void setCropPhaseList(List<CropPhase> cropPhaseList)
+    {
+        this.cropPhaseList = cropPhaseList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
+            .append("cropId", getCropId())
-            .append("name", getName())
+            .append("cropName", getCropName())
             .append("plantGuide", getPlantGuide())
             .append("picture", getPicture())
             .append("description", getDescription())
@@ -118,6 +133,7 @@ public class CropFiles extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("cropPhaseList", getCropPhaseList())
             .toString();
     }
 }

private-farm/src/main/java/com/jlt/csa/domain/CropPhase.java

@@ -8,22 +8,23 @@ import com.ruoyi.common.core.domain.BaseEntity;
 /**
  * 作物生长阶段对象 csa_crop_phase
  * 
- * @author JiaLeitao
+ * @author 郏磊涛
- * @date 2022-03-26
+ * @date 2022-03-30
  */
 public class CropPhase extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 阶段id */
-    private Long id;
+    private Long phaseId;
 
-    /** 作物id */
+    /** 作物 */
+    @Excel(name = "作物")
     private Long cropId;
 
     /** 阶段名称 */
     @Excel(name = "阶段名称")
-    private String name;
+    private String phaseName;
 
     /** 产出 */
     @Excel(name = "产出")
@@ -33,21 +34,21 @@ public class CropPhase extends BaseEntity
     @Excel(name = "代表图片")
     private String picture;
 
-    /** 状态 */
+    /** 状态（0正常 1停用） */
-    @Excel(name = "状态")
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /** 删除标志 */
+    /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
-    public void setId(Long id) 
+    public void setPhaseId(Long phaseId) 
     {
-        this.id = id;
+        this.phaseId = phaseId;
     }
 
-    public Long getId() 
+    public Long getPhaseId() 
     {
-        return id;
+        return phaseId;
     }
     public void setCropId(Long cropId) 
     {
@@ -58,14 +59,14 @@ public class CropPhase extends BaseEntity
     {
         return cropId;
     }
-    public void setName(String name) 
+    public void setPhaseName(String phaseName) 
     {
-        this.name = name;
+        this.phaseName = phaseName;
     }
 
-    public String getName() 
+    public String getPhaseName() 
     {
-        return name;
+        return phaseName;
     }
     public void setProduction(String production) 
     {
@@ -107,9 +108,9 @@ public class CropPhase extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
+            .append("phaseId", getPhaseId())
             .append("cropId", getCropId())
-            .append("name", getName())
+            .append("phaseName", getPhaseName())
             .append("production", getProduction())
             .append("picture", getPicture())
             .append("status", getStatus())

private-farm/src/main/java/com/jlt/csa/mapper/CropFileMapper.java

@@ -0,0 +1,87 @@
+package com.jlt.csa.mapper;
+
+import java.util.List;
+import com.jlt.csa.domain.CropFile;
+import com.jlt.csa.domain.CropPhase;
+
+/**
+ * 作物档案Mapper接口
+ * 
+ * @author 郏磊涛
+ * @date 2022-03-30
+ */
+public interface CropFileMapper 
+{
+    /**
+     * 查询作物档案
+     * 
+     * @param cropId 作物档案主键
+     * @return 作物档案
+     */
+    public CropFile selectCropFileByCropId(Long cropId);
+
+    /**
+     * 查询作物档案列表
+     * 
+     * @param cropFile 作物档案
+     * @return 作物档案集合
+     */
+    public List<CropFile> selectCropFileList(CropFile cropFile);
+
+    /**
+     * 新增作物档案
+     * 
+     * @param cropFile 作物档案
+     * @return 结果
+     */
+    public int insertCropFile(CropFile cropFile);
+
+    /**
+     * 修改作物档案
+     * 
+     * @param cropFile 作物档案
+     * @return 结果
+     */
+    public int updateCropFile(CropFile cropFile);
+
+    /**
+     * 删除作物档案
+     * 
+     * @param cropId 作物档案主键
+     * @return 结果
+     */
+    public int deleteCropFileByCropId(Long cropId);
+
+    /**
+     * 批量删除作物档案
+     * 
+     * @param cropIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCropFileByCropIds(Long[] cropIds);
+
+    /**
+     * 批量删除作物生长阶段
+     * 
+     * @param cropIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCropPhaseByCropIds(Long[] cropIds);
+    
+    /**
+     * 批量新增作物生长阶段
+     * 
+     * @param cropPhaseList 作物生长阶段列表
+     * @return 结果
+     */
+    public int batchCropPhase(List<CropPhase> cropPhaseList);
+    
+
+    /**
+     * 通过作物档案主键删除作物生长阶段信息
+     * 
+     * @param cropId 作物档案ID
+     * @return 结果
+     */
+    public int deleteCropPhaseByCropId(Long cropId);
+}

private-farm/src/main/java/com/jlt/csa/mapper/CropFilesMapper.java

@@ -1,61 +0,0 @@
-package com.jlt.csa.mapper;
-
-import java.util.List;
-import com.jlt.csa.domain.CropFiles;
-
-/**
- * 作物档案Mapper接口
- * 
- * @author JiaLeitao
- * @date 2022-03-25
- */
-public interface CropFilesMapper 
-{
-    /**
-     * 查询作物档案
-     * 
-     * @param id 作物档案主键
-     * @return 作物档案
-     */
-    public CropFiles selectCropFilesById(Long id);
-
-    /**
-     * 查询作物档案列表
-     * 
-     * @param cropFiles 作物档案
-     * @return 作物档案集合
-     */
-    public List<CropFiles> selectCropFilesList(CropFiles cropFiles);
-
-    /**
-     * 新增作物档案
-     * 
-     * @param cropFiles 作物档案
-     * @return 结果
-     */
-    public int insertCropFiles(CropFiles cropFiles);
-
-    /**
-     * 修改作物档案
-     * 
-     * @param cropFiles 作物档案
-     * @return 结果
-     */
-    public int updateCropFiles(CropFiles cropFiles);
-
-    /**
-     * 删除作物档案
-     * 
-     * @param id 作物档案主键
-     * @return 结果
-     */
-    public int deleteCropFilesById(Long id);
-
-    /**
-     * 批量删除作物档案
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCropFilesByIds(Long[] ids);
-}

private-farm/src/main/java/com/jlt/csa/mapper/CropPhaseMapper.java

@@ -1,61 +0,0 @@
-package com.jlt.csa.mapper;
-
-import java.util.List;
-import com.jlt.csa.domain.CropPhase;
-
-/**
- * 作物生长阶段Mapper接口
- * 
- * @author JiaLeitao
- * @date 2022-03-26
- */
-public interface CropPhaseMapper 
-{
-    /**
-     * 查询作物生长阶段
-     * 
-     * @param id 作物生长阶段主键
-     * @return 作物生长阶段
-     */
-    public CropPhase selectCropPhaseById(Long id);
-
-    /**
-     * 查询作物生长阶段列表
-     * 
-     * @param cropPhase 作物生长阶段
-     * @return 作物生长阶段集合
-     */
-    public List<CropPhase> selectCropPhaseList(CropPhase cropPhase);
-
-    /**
-     * 新增作物生长阶段
-     * 
-     * @param cropPhase 作物生长阶段
-     * @return 结果
-     */
-    public int insertCropPhase(CropPhase cropPhase);
-
-    /**
-     * 修改作物生长阶段
-     * 
-     * @param cropPhase 作物生长阶段
-     * @return 结果
-     */
-    public int updateCropPhase(CropPhase cropPhase);
-
-    /**
-     * 删除作物生长阶段
-     * 
-     * @param id 作物生长阶段主键
-     * @return 结果
-     */
-    public int deleteCropPhaseById(Long id);
-
-    /**
-     * 批量删除作物生长阶段
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCropPhaseByIds(Long[] ids);
-}

private-farm/src/main/java/com/jlt/csa/service/ICropFileService.java

@@ -0,0 +1,61 @@
+package com.jlt.csa.service;
+
+import java.util.List;
+import com.jlt.csa.domain.CropFile;
+
+/**
+ * 作物档案Service接口
+ * 
+ * @author 郏磊涛
+ * @date 2022-03-30
+ */
+public interface ICropFileService 
+{
+    /**
+     * 查询作物档案
+     * 
+     * @param cropId 作物档案主键
+     * @return 作物档案
+     */
+    public CropFile selectCropFileByCropId(Long cropId);
+
+    /**
+     * 查询作物档案列表
+     * 
+     * @param cropFile 作物档案
+     * @return 作物档案集合
+     */
+    public List<CropFile> selectCropFileList(CropFile cropFile);
+
+    /**
+     * 新增作物档案
+     * 
+     * @param cropFile 作物档案
+     * @return 结果
+     */
+    public int insertCropFile(CropFile cropFile);
+
+    /**
+     * 修改作物档案
+     * 
+     * @param cropFile 作物档案
+     * @return 结果
+     */
+    public int updateCropFile(CropFile cropFile);
+
+    /**
+     * 批量删除作物档案
+     * 
+     * @param cropIds 需要删除的作物档案主键集合
+     * @return 结果
+     */
+    public int deleteCropFileByCropIds(Long[] cropIds);
+
+    /**
+     * 删除作物档案信息
+     * 
+     * @param cropId 作物档案主键
+     * @return 结果
+     */
+    public int deleteCropFileByCropId(Long cropId);
+}

private-farm/src/main/java/com/jlt/csa/service/ICropFilesService.java

@@ -1,61 +0,0 @@
-package com.jlt.csa.service;
-
-import java.util.List;
-import com.jlt.csa.domain.CropFiles;
-
-/**
- * 作物档案Service接口
- * 
- * @author JiaLeitao
- * @date 2022-03-25
- */
-public interface ICropFilesService 
-{
-    /**
-     * 查询作物档案
-     * 
-     * @param id 作物档案主键
-     * @return 作物档案
-     */
-    public CropFiles selectCropFilesById(Long id);
-
-    /**
-     * 查询作物档案列表
-     * 
-     * @param cropFiles 作物档案
-     * @return 作物档案集合
-     */
-    public List<CropFiles> selectCropFilesList(CropFiles cropFiles);
-
-    /**
-     * 新增作物档案
-     * 
-     * @param cropFiles 作物档案
-     * @return 结果
-     */
-    public int insertCropFiles(CropFiles cropFiles);
-
-    /**
-     * 修改作物档案
-     * 
-     * @param cropFiles 作物档案
-     * @return 结果
-     */
-    public int updateCropFiles(CropFiles cropFiles);
-
-    /**
-     * 批量删除作物档案
-     * 
-     * @param ids 需要删除的作物档案主键集合
-     * @return 结果
-     */
-    public int deleteCropFilesByIds(Long[] ids);
-
-    /**
-     * 删除作物档案信息
-     * 
-     * @param id 作物档案主键
-     * @return 结果
-     */
-    public int deleteCropFilesById(Long id);
-}

private-farm/src/main/java/com/jlt/csa/service/ICropPhaseService.java

@@ -1,61 +0,0 @@
-package com.jlt.csa.service;
-
-import java.util.List;
-import com.jlt.csa.domain.CropPhase;
-
-/**
- * 作物生长阶段Service接口
- * 
- * @author JiaLeitao
- * @date 2022-03-26
- */
-public interface ICropPhaseService 
-{
-    /**
-     * 查询作物生长阶段
-     * 
-     * @param id 作物生长阶段主键
-     * @return 作物生长阶段
-     */
-    public CropPhase selectCropPhaseById(Long id);
-
-    /**
-     * 查询作物生长阶段列表
-     * 
-     * @param cropPhase 作物生长阶段
-     * @return 作物生长阶段集合
-     */
-    public List<CropPhase> selectCropPhaseList(CropPhase cropPhase);
-
-    /**
-     * 新增作物生长阶段
-     * 
-     * @param cropPhase 作物生长阶段
-     * @return 结果
-     */
-    public int insertCropPhase(CropPhase cropPhase);
-
-    /**
-     * 修改作物生长阶段
-     * 
-     * @param cropPhase 作物生长阶段
-     * @return 结果
-     */
-    public int updateCropPhase(CropPhase cropPhase);
-
-    /**
-     * 批量删除作物生长阶段
-     * 
-     * @param ids 需要删除的作物生长阶段主键集合
-     * @return 结果
-     */
-    public int deleteCropPhaseByIds(Long[] ids);
-
-    /**
-     * 删除作物生长阶段信息
-     * 
-     * @param id 作物生长阶段主键
-     * @return 结果
-     */
-    public int deleteCropPhaseById(Long id);
-}

private-farm/src/main/java/com/jlt/csa/service/impl/CropFileServiceImpl.java

@@ -0,0 +1,134 @@
+package com.jlt.csa.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 java.util.ArrayList;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.jlt.csa.domain.CropPhase;
+import com.jlt.csa.mapper.CropFileMapper;
+import com.jlt.csa.domain.CropFile;
+import com.jlt.csa.service.ICropFileService;
+
+/**
+ * 作物档案Service业务层处理
+ * 
+ * @author 郏磊涛
+ * @date 2022-03-30
+ */
+@Service
+public class CropFileServiceImpl implements ICropFileService 
+{
+    @Autowired
+    private CropFileMapper cropFileMapper;
+
+    /**
+     * 查询作物档案
+     * 
+     * @param cropId 作物档案主键
+     * @return 作物档案
+     */
+    @Override
+    public CropFile selectCropFileByCropId(Long cropId)
+    {
+        return cropFileMapper.selectCropFileByCropId(cropId);
+    }
+
+    /**
+     * 查询作物档案列表
+     * 
+     * @param cropFile 作物档案
+     * @return 作物档案
+     */
+    @Override
+    public List<CropFile> selectCropFileList(CropFile cropFile)
+    {
+        return cropFileMapper.selectCropFileList(cropFile);
+    }
+
+    /**
+     * 新增作物档案
+     * 
+     * @param cropFile 作物档案
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertCropFile(CropFile cropFile)
+    {
+        cropFile.setCreateTime(DateUtils.getNowDate());
+        int rows = cropFileMapper.insertCropFile(cropFile);
+        insertCropPhase(cropFile);
+        return rows;
+    }
+
+    /**
+     * 修改作物档案
+     * 
+     * @param cropFile 作物档案
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateCropFile(CropFile cropFile)
+    {
+        cropFile.setUpdateTime(DateUtils.getNowDate());
+        cropFileMapper.deleteCropPhaseByCropId(cropFile.getCropId());
+        insertCropPhase(cropFile);
+        return cropFileMapper.updateCropFile(cropFile);
+    }
+
+    /**
+     * 批量删除作物档案
+     * 
+     * @param cropIds 需要删除的作物档案主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteCropFileByCropIds(Long[] cropIds)
+    {
+        cropFileMapper.deleteCropPhaseByCropIds(cropIds);
+        return cropFileMapper.deleteCropFileByCropIds(cropIds);
+    }
+
+    /**
+     * 删除作物档案信息
+     * 
+     * @param cropId 作物档案主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteCropFileByCropId(Long cropId)
+    {
+        cropFileMapper.deleteCropPhaseByCropId(cropId);
+        return cropFileMapper.deleteCropFileByCropId(cropId);
+    }
+
+    /**
+     * 新增作物生长阶段信息
+     * 
+     * @param cropFile 作物档案对象
+     */
+    public void insertCropPhase(CropFile cropFile)
+    {
+        List<CropPhase> cropPhaseList = cropFile.getCropPhaseList();
+        Long cropId = cropFile.getCropId();
+        if (StringUtils.isNotNull(cropPhaseList))
+        {
+            List<CropPhase> list = new ArrayList<CropPhase>();
+            for (CropPhase cropPhase : cropPhaseList)
+            {
+                cropPhase.setCropId(cropId);
+                list.add(cropPhase);
+            }
+            if (list.size() > 0)
+            {
+                cropFileMapper.batchCropPhase(list);
+            }
+        }
+    }
+}

private-farm/src/main/java/com/jlt/csa/service/impl/CropFilesServiceImpl.java

@@ -1,96 +0,0 @@
-package com.jlt.csa.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.jlt.csa.mapper.CropFilesMapper;
-import com.jlt.csa.domain.CropFiles;
-import com.jlt.csa.service.ICropFilesService;
-
-/**
- * 作物档案Service业务层处理
- * 
- * @author JiaLeitao
- * @date 2022-03-25
- */
-@Service
-public class CropFilesServiceImpl implements ICropFilesService 
-{
-    @Autowired
-    private CropFilesMapper cropFilesMapper;
-
-    /**
-     * 查询作物档案
-     * 
-     * @param id 作物档案主键
-     * @return 作物档案
-     */
-    @Override
-    public CropFiles selectCropFilesById(Long id)
-    {
-        return cropFilesMapper.selectCropFilesById(id);
-    }
-
-    /**
-     * 查询作物档案列表
-     * 
-     * @param cropFiles 作物档案
-     * @return 作物档案
-     */
-    @Override
-    public List<CropFiles> selectCropFilesList(CropFiles cropFiles)
-    {
-        return cropFilesMapper.selectCropFilesList(cropFiles);
-    }
-
-    /**
-     * 新增作物档案
-     * 
-     * @param cropFiles 作物档案
-     * @return 结果
-     */
-    @Override
-    public int insertCropFiles(CropFiles cropFiles)
-    {
-        cropFiles.setCreateTime(DateUtils.getNowDate());
-        return cropFilesMapper.insertCropFiles(cropFiles);
-    }
-
-    /**
-     * 修改作物档案
-     * 
-     * @param cropFiles 作物档案
-     * @return 结果
-     */
-    @Override
-    public int updateCropFiles(CropFiles cropFiles)
-    {
-        cropFiles.setUpdateTime(DateUtils.getNowDate());
-        return cropFilesMapper.updateCropFiles(cropFiles);
-    }
-
-    /**
-     * 批量删除作物档案
-     * 
-     * @param ids 需要删除的作物档案主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCropFilesByIds(Long[] ids)
-    {
-        return cropFilesMapper.deleteCropFilesByIds(ids);
-    }
-
-    /**
-     * 删除作物档案信息
-     * 
-     * @param id 作物档案主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCropFilesById(Long id)
-    {
-        return cropFilesMapper.deleteCropFilesById(id);
-    }
-}

private-farm/src/main/java/com/jlt/csa/service/impl/CropPhaseServiceImpl.java

@@ -1,96 +0,0 @@
-package com.jlt.csa.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.jlt.csa.mapper.CropPhaseMapper;
-import com.jlt.csa.domain.CropPhase;
-import com.jlt.csa.service.ICropPhaseService;
-
-/**
- * 作物生长阶段Service业务层处理
- * 
- * @author JiaLeitao
- * @date 2022-03-26
- */
-@Service
-public class CropPhaseServiceImpl implements ICropPhaseService 
-{
-    @Autowired
-    private CropPhaseMapper cropPhaseMapper;
-
-    /**
-     * 查询作物生长阶段
-     * 
-     * @param id 作物生长阶段主键
-     * @return 作物生长阶段
-     */
-    @Override
-    public CropPhase selectCropPhaseById(Long id)
-    {
-        return cropPhaseMapper.selectCropPhaseById(id);
-    }
-
-    /**
-     * 查询作物生长阶段列表
-     * 
-     * @param cropPhase 作物生长阶段
-     * @return 作物生长阶段
-     */
-    @Override
-    public List<CropPhase> selectCropPhaseList(CropPhase cropPhase)
-    {
-        return cropPhaseMapper.selectCropPhaseList(cropPhase);
-    }
-
-    /**
-     * 新增作物生长阶段
-     * 
-     * @param cropPhase 作物生长阶段
-     * @return 结果
-     */
-    @Override
-    public int insertCropPhase(CropPhase cropPhase)
-    {
-        cropPhase.setCreateTime(DateUtils.getNowDate());
-        return cropPhaseMapper.insertCropPhase(cropPhase);
-    }
-
-    /**
-     * 修改作物生长阶段
-     * 
-     * @param cropPhase 作物生长阶段
-     * @return 结果
-     */
-    @Override
-    public int updateCropPhase(CropPhase cropPhase)
-    {
-        cropPhase.setUpdateTime(DateUtils.getNowDate());
-        return cropPhaseMapper.updateCropPhase(cropPhase);
-    }
-
-    /**
-     * 批量删除作物生长阶段
-     * 
-     * @param ids 需要删除的作物生长阶段主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCropPhaseByIds(Long[] ids)
-    {
-        return cropPhaseMapper.deleteCropPhaseByIds(ids);
-    }
-
-    /**
-     * 删除作物生长阶段信息
-     * 
-     * @param id 作物生长阶段主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCropPhaseById(Long id)
-    {
-        return cropPhaseMapper.deleteCropPhaseById(id);
-    }
-}

private-farm/src/main/resources/mapper/csa/CropFileMapper.xml

@@ -0,0 +1,137 @@
+<?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.jlt.csa.mapper.CropFileMapper">
+    
+    <resultMap type="CropFile" id="CropFileResult">
+        <result property="cropId"    column="crop_id"    />
+        <result property="cropName"    column="crop_name"    />
+        <result property="plantGuide"    column="plant_guide"    />
+        <result property="picture"    column="picture"    />
+        <result property="description"    column="description"    />
+        <result property="status"    column="status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <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>
+
+    <resultMap id="CropFileCropPhaseResult" type="CropFile" extends="CropFileResult">
+        <collection property="cropPhaseList" notNullColumn="sub_phase_id" javaType="java.util.List" resultMap="CropPhaseResult" />
+    </resultMap>
+
+    <resultMap type="CropPhase" id="CropPhaseResult">
+        <result property="phaseId"    column="sub_phase_id"    />
+        <result property="cropId"    column="sub_crop_id"    />
+        <result property="phaseName"    column="sub_phase_name"    />
+        <result property="production"    column="sub_production"    />
+        <result property="picture"    column="sub_picture"    />
+        <result property="status"    column="sub_status"    />
+        <result property="delFlag"    column="sub_del_flag"    />
+        <result property="createBy"    column="sub_create_by"    />
+        <result property="createTime"    column="sub_create_time"    />
+        <result property="updateBy"    column="sub_update_by"    />
+        <result property="updateTime"    column="sub_update_time"    />
+        <result property="remark"    column="sub_remark"    />
+    </resultMap>
+
+    <sql id="selectCropFileVo">
+        select crop_id, crop_name, plant_guide, picture, description, status, del_flag, create_by, create_time, update_by, update_time, remark from csa_crop_file
+    </sql>
+
+    <select id="selectCropFileList" parameterType="CropFile" resultMap="CropFileResult">
+        <include refid="selectCropFileVo"/>
+        <where>  
+            <if test="cropName != null  and cropName != ''"> and crop_name like concat('%', #{cropName}, '%')</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectCropFileByCropId" parameterType="Long" resultMap="CropFileCropPhaseResult">
+        select a.crop_id, a.crop_name, a.plant_guide, a.picture, a.description, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
+ b.phase_id as sub_phase_id, b.crop_id as sub_crop_id, b.phase_name as sub_phase_name, b.production as sub_production, b.picture as sub_picture, b.status as sub_status, b.del_flag as sub_del_flag, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
+        from csa_crop_file a
+        left join csa_crop_phase b on b.crop_id = a.crop_id
+        where a.crop_id = #{cropId}
+    </select>
+        
+    <insert id="insertCropFile" parameterType="CropFile" useGeneratedKeys="true" keyProperty="cropId">
+        insert into csa_crop_file
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cropName != null and cropName != ''">crop_name,</if>
+            <if test="plantGuide != null">plant_guide,</if>
+            <if test="picture != null">picture,</if>
+            <if test="description != null">description,</if>
+            <if test="status != null">status,</if>
+            <if test="delFlag != null">del_flag,</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="cropName != null and cropName != ''">#{cropName},</if>
+            <if test="plantGuide != null">#{plantGuide},</if>
+            <if test="picture != null">#{picture},</if>
+            <if test="description != null">#{description},</if>
+            <if test="status != null">#{status},</if>
+            <if test="delFlag != null">#{delFlag},</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="updateCropFile" parameterType="CropFile">
+        update csa_crop_file
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cropName != null and cropName != ''">crop_name = #{cropName},</if>
+            <if test="plantGuide != null">plant_guide = #{plantGuide},</if>
+            <if test="picture != null">picture = #{picture},</if>
+            <if test="description != null">description = #{description},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</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 crop_id = #{cropId}
+    </update>
+
+    <delete id="deleteCropFileByCropId" parameterType="Long">
+        delete from csa_crop_file where crop_id = #{cropId}
+    </delete>
+
+    <delete id="deleteCropFileByCropIds" parameterType="String">
+        delete from csa_crop_file where crop_id in 
+        <foreach item="cropId" collection="array" open="(" separator="," close=")">
+            #{cropId}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteCropPhaseByCropIds" parameterType="String">
+        delete from csa_crop_phase where crop_id in 
+        <foreach item="cropId" collection="array" open="(" separator="," close=")">
+            #{cropId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteCropPhaseByCropId" parameterType="Long">
+        delete from csa_crop_phase where crop_id = #{cropId}
+    </delete>
+
+    <insert id="batchCropPhase">
+        insert into csa_crop_phase( phase_id, crop_id, phase_name, production, picture, status, del_flag, create_by, create_time, update_by, update_time, remark) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.phaseId}, #{item.cropId}, #{item.phaseName}, #{item.production}, #{item.picture}, #{item.status}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
+        </foreach>
+    </insert>
+</mapper>

private-farm/src/main/resources/mapper/csa/CropFilesMapper.xml

@@ -1,96 +0,0 @@
-<?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.jlt.csa.mapper.CropFilesMapper">
-    
-    <resultMap type="CropFiles" id="CropFilesResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="plantGuide"    column="plant_guide"    />
-        <result property="picture"    column="picture"    />
-        <result property="description"    column="description"    />
-        <result property="status"    column="status"    />
-        <result property="delFlag"    column="del_flag"    />
-        <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="selectCropFilesVo">
-        select id, name, plant_guide, picture, description, status, del_flag, create_by, create_time, update_by, update_time, remark from csa_crop_files
-    </sql>
-
-    <select id="selectCropFilesList" parameterType="CropFiles" resultMap="CropFilesResult">
-        <include refid="selectCropFilesVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectCropFilesById" parameterType="Long" resultMap="CropFilesResult">
-        <include refid="selectCropFilesVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertCropFiles" parameterType="CropFiles" useGeneratedKeys="true" keyProperty="id">
-        insert into csa_crop_files
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null and name != ''">name,</if>
-            <if test="plantGuide != null">plant_guide,</if>
-            <if test="picture != null">picture,</if>
-            <if test="description != null">description,</if>
-            <if test="status != null">status,</if>
-            <if test="delFlag != null">del_flag,</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="name != null and name != ''">#{name},</if>
-            <if test="plantGuide != null">#{plantGuide},</if>
-            <if test="picture != null">#{picture},</if>
-            <if test="description != null">#{description},</if>
-            <if test="status != null">#{status},</if>
-            <if test="delFlag != null">#{delFlag},</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="updateCropFiles" parameterType="CropFiles">
-        update csa_crop_files
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null and name != ''">name = #{name},</if>
-            <if test="plantGuide != null">plant_guide = #{plantGuide},</if>
-            <if test="picture != null">picture = #{picture},</if>
-            <if test="description != null">description = #{description},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</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 id = #{id}
-    </update>
-
-    <delete id="deleteCropFilesById" parameterType="Long">
-        delete from csa_crop_files where id = #{id}
-    </delete>
-
-    <delete id="deleteCropFilesByIds" parameterType="String">
-        delete from csa_crop_files where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-ui/src/api/csa/cropfile.js

@@ -1,44 +1,44 @@
 import request from '@/utils/request'
 
 // 查询作物档案列表
-export function listCropfiles(query) {
+export function listCropfile(query) {
   return request({
-    url: '/csa/cropfiles/list',
+    url: '/csa/cropfile/list',
     method: 'get',
     params: query
   })
 }
 
 // 查询作物档案详细
-export function getCropfiles(id) {
+export function getCropfile(cropId) {
   return request({
-    url: '/csa/cropfiles/' + id,
+    url: '/csa/cropfile/' + cropId,
     method: 'get'
   })
 }
 
 // 新增作物档案
-export function addCropfiles(data) {
+export function addCropfile(data) {
   return request({
-    url: '/csa/cropfiles',
+    url: '/csa/cropfile',
     method: 'post',
     data: data
   })
 }
 
 // 修改作物档案
-export function updateCropfiles(data) {
+export function updateCropfile(data) {
   return request({
-    url: '/csa/cropfiles',
+    url: '/csa/cropfile',
     method: 'put',
     data: data
   })
 }
 
 // 删除作物档案
-export function delCropfiles(id) {
+export function delCropfile(cropId) {
   return request({
-    url: '/csa/cropfiles/' + id,
+    url: '/csa/cropfile/' + cropId,
     method: 'delete'
   })
 }

ruoyi-ui/src/api/csa/phase.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询作物生长阶段列表
-export function listPhase(query) {
-  return request({
-    url: '/csa/phase/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询作物生长阶段详细
-export function getPhase(id) {
-  return request({
-    url: '/csa/phase/' + id,
-    method: 'get'
-  })
-}
-
-// 新增作物生长阶段
-export function addPhase(data) {
-  return request({
-    url: '/csa/phase',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改作物生长阶段
-export function updatePhase(data) {
-  return request({
-    url: '/csa/phase',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除作物生长阶段
-export function delPhase(id) {
-  return request({
-    url: '/csa/phase/' + id,
-    method: 'delete'
-  })
-}

ruoyi-ui/src/views/csa/cropfile/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="作物名称" prop="name">
+      <el-form-item label="作物名称" prop="cropName">
         <el-input
-          v-model="queryParams.name"
+          v-model="queryParams.cropName"
           placeholder="请输入作物名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -23,7 +23,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['csa:cropfiles:add']"
+          v-hasPermi="['csa:cropfile:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -34,7 +34,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['csa:cropfiles:edit']"
+          v-hasPermi="['csa:cropfile:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -45,7 +45,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['csa:cropfiles:remove']"
+          v-hasPermi="['csa:cropfile:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -55,21 +55,22 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['csa:cropfiles:export']"
+          v-hasPermi="['csa:cropfile:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="cropfilesList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="cropfileList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="作物名称" align="center" prop="name" />
+      <el-table-column label="作物档案id" align="center" prop="cropId" />
-      <el-table-column label="生长阶段" align="center" prop="name">
+      <el-table-column label="作物名称" align="center" prop="cropName" />
+      <el-table-column label="代表图片" align="center" prop="picture" width="100">
         <template slot-scope="scope">
-          <el-button>生长阶段</el-button>
+          <image-preview :src="scope.row.picture" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="代表图片" align="center" prop="picture" />
+      <el-table-column label="作物描述" align="center" prop="description" />
       <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -79,14 +80,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['csa:cropfiles:edit']"
+            v-hasPermi="['csa:cropfile:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['csa:cropfiles:remove']"
+            v-hasPermi="['csa:cropfile:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -103,21 +104,53 @@
     <!-- 添加或修改作物档案对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="作物名称" prop="name">
+        <el-form-item label="作物名称" prop="cropName">
-          <el-input v-model="form.name" placeholder="请输入作物名称" />
+          <el-input v-model="form.cropName" placeholder="请输入作物名称" />
         </el-form-item>
-        <el-form-item label="种植指南" prop="plantGuide">
+<!--        <el-form-item label="种植指南" prop="plantGuide">-->
-          <el-input v-model="form.plantGuide" type="textarea" placeholder="请输入内容" />
+<!--          <el-input v-model="form.plantGuide" type="textarea" placeholder="请输入内容" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="代表图片" prop="picture">
+        <el-form-item label="代表图片">
-          <el-input v-model="form.picture" placeholder="请输入代表图片" />
+          <image-upload v-model="form.picture"/>
         </el-form-item>
         <el-form-item label="作物描述" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-divider content-position="center">作物生长阶段信息</el-divider>
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-row :gutter="10" class="mb8">
-        </el-form-item>
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddCropPhase">添加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteCropPhase">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="cropPhaseList" :row-class-name="rowCropPhaseIndex" @selection-change="handleCropPhaseSelectionChange" ref="cropPhase">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
+          <el-table-column label="阶段名称" prop="phaseName" width="150">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.phaseName" placeholder="请输入阶段名称" />
+            </template>
+          </el-table-column>
+          <el-table-column label="产出" prop="production" width="150">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.production" placeholder="请输入产出" />
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" prop="status" width="150">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.status" placeholder="请选择状态">
+                <el-option label="请选择字典生成" value="" />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" prop="remark" width="150">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark" placeholder="请输入备注" />
+            </template>
+          </el-table-column>
+        </el-table>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -128,16 +161,18 @@
 </template>
 
 <script>
-import { listCropfiles, getCropfiles, delCropfiles, addCropfiles, updateCropfiles } from "@/api/csa/cropfiles";
+import { listCropfile, getCropfile, delCropfile, addCropfile, updateCropfile } from "@/api/csa/cropfile";
 
 export default {
-  name: "Cropfiles",
+  name: "Cropfile",
   data() {
     return {
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
+      // 子表选中数据
+      checkedCropPhase: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -147,7 +182,9 @@ export default {
       // 总条数
       total: 0,
       // 作物档案表格数据
-      cropfilesList: [],
+      cropfileList: [],
+      // 作物生长阶段表格数据
+      cropPhaseList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -156,13 +193,14 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        name: null,
+        cropName: null,
+        status: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        name: [
+        cropName: [
           { required: true, message: "作物名称不能为空", trigger: "blur" }
         ],
       }
@@ -175,8 +213,8 @@ export default {
     /** 查询作物档案列表 */
     getList() {
       this.loading = true;
-      listCropfiles(this.queryParams).then(response => {
+      listCropfile(this.queryParams).then(response => {
-        this.cropfilesList = response.rows;
+        this.cropfileList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -189,14 +227,18 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
+        cropId: null,
-        name: null,
+        cropName: null,
         plantGuide: null,
         picture: null,
         description: null,
         status: "0",
-        delFlag: "0",
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
       };
+      this.cropPhaseList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -211,7 +253,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map(item => item.cropId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -224,9 +266,10 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const cropId = row.cropId || this.ids
-      getCropfiles(id).then(response => {
+      getCropfile(cropId).then(response => {
         this.form = response.data;
+        this.cropPhaseList = response.data.cropPhaseList;
         this.open = true;
         this.title = "修改作物档案";
       });
@@ -235,14 +278,15 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
+          this.form.cropPhaseList = this.cropPhaseList;
-            updateCropfiles(this.form).then(response => {
+          if (this.form.cropId != null) {
+            updateCropfile(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addCropfiles(this.form).then(response => {
+            addCropfile(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -253,19 +297,49 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const cropIds = row.cropId || this.ids;
-      this.$modal.confirm('是否确认删除作物档案编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除作物档案编号为"' + cropIds + '"的数据项？').then(function() {
-        return delCropfiles(ids);
+        return delCropfile(cropIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
+    },
+	/** 作物生长阶段序号 */
+    rowCropPhaseIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 作物生长阶段添加按钮操作 */
+    handleAddCropPhase() {
+      let obj = {};
+      obj.phaseName = "";
+      obj.production = "";
+      obj.picture = "";
+      obj.status = "";
+      obj.remark = "";
+      this.cropPhaseList.push(obj);
+    },
+    /** 作物生长阶段删除按钮操作 */
+    handleDeleteCropPhase() {
+      if (this.checkedCropPhase.length == 0) {
+        this.$modal.msgError("请先选择要删除的作物生长阶段数据");
+      } else {
+        const cropPhaseList = this.cropPhaseList;
+        const checkedCropPhase = this.checkedCropPhase;
+        this.cropPhaseList = cropPhaseList.filter(function(item) {
+          return checkedCropPhase.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handleCropPhaseSelectionChange(selection) {
+      this.checkedCropPhase = selection.map(item => item.index)
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('csa/cropfiles/export', {
+      this.download('csa/cropfile/export', {
         ...this.queryParams
-      }, `cropfiles_${new Date().getTime()}.xlsx`)
+      }, `cropfile_${new Date().getTime()}.xlsx`)
     }
   }
 };

ruoyi-ui/src/views/csa/phase/index.vue

@@ -1,290 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="作物id" prop="cropId">
-        <el-input
-          v-model="queryParams.cropId"
-          placeholder="请输入作物id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="阶段名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入阶段名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['csa:phase:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['csa:phase:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['csa:phase:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['csa:phase:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="phaseList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="阶段id" align="center" prop="id" />
-      <el-table-column label="阶段名称" align="center" prop="name" />
-      <el-table-column label="产出" align="center" prop="production" />
-      <el-table-column label="代表图片" align="center" prop="picture" />
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['csa:phase:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['csa:phase:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改作物生长阶段对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="作物id" prop="cropId">
-          <el-input v-model="form.cropId" placeholder="请输入作物id" />
-        </el-form-item>
-        <el-form-item label="阶段名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入阶段名称" />
-        </el-form-item>
-        <el-form-item label="产出" prop="production">
-          <el-input v-model="form.production" placeholder="请输入产出" />
-        </el-form-item>
-        <el-form-item label="代表图片" prop="picture">
-          <el-input v-model="form.picture" placeholder="请输入代表图片" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listPhase, getPhase, delPhase, addPhase, updatePhase } from "@/api/csa/phase";
-
-export default {
-  name: "Phase",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 作物生长阶段表格数据
-      phaseList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        cropId: null,
-        name: null,
-        status: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        cropId: [
-          { required: true, message: "作物id不能为空", trigger: "blur" }
-        ],
-        name: [
-          { required: true, message: "阶段名称不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询作物生长阶段列表 */
-    getList() {
-      this.loading = true;
-      listPhase(this.queryParams).then(response => {
-        this.phaseList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        cropId: null,
-        name: null,
-        production: null,
-        picture: null,
-        status: "0",
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加作物生长阶段";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getPhase(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改作物生长阶段";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updatePhase(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPhase(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除作物生长阶段编号为"' + ids + '"的数据项？').then(function() {
-        return delPhase(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('csa/phase/export', {
-        ...this.queryParams
-      }, `phase_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>

sql/csa.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50731
  File Encoding         : 65001
 
- Date: 29/03/2022 22:24:37
+ Date: 30/03/2022 23:22:02
 */
 
 SET NAMES utf8mb4;
@@ -129,12 +129,12 @@ CREATE TABLE `csa_communicate_record`  (
 -- ----------------------------
 
 -- ----------------------------
--- Table structure for csa_crop_files
+-- Table structure for csa_crop_file
 -- ----------------------------
-DROP TABLE IF EXISTS `csa_crop_files`;
+DROP TABLE IF EXISTS `csa_crop_file`;
-CREATE TABLE `csa_crop_files`  (
+CREATE TABLE `csa_crop_file`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '作物档案id',
+  `crop_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '作物档案id',
-  `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '作物名称',
+  `crop_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '作物名称',
   `plant_guide` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '种植指南',
   `picture` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '代表图片',
   `description` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '作物描述',
@@ -145,22 +145,22 @@ CREATE TABLE `csa_crop_files`  (
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`crop_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '作物档案' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
--- Records of csa_crop_files
+-- Records of csa_crop_file
 -- ----------------------------
-INSERT INTO `csa_crop_files` VALUES (1, '辣椒', NULL, NULL, NULL, '0', '0', '', '2022-03-25 22:33:34', '', '2022-03-25 22:33:42', NULL);
+INSERT INTO `csa_crop_file` VALUES (1, '白菜', NULL, NULL, NULL, '0', '0', '', '2022-03-25 22:33:34', '', '2022-03-25 22:33:42', NULL);
 
 -- ----------------------------
 -- Table structure for csa_crop_phase
 -- ----------------------------
 DROP TABLE IF EXISTS `csa_crop_phase`;
 CREATE TABLE `csa_crop_phase`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '阶段id',
+  `phase_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '阶段id',
   `crop_id` int(11) NOT NULL COMMENT '作物id',
-  `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '阶段名称',
+  `phase_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '阶段名称',
   `production` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '产出',
   `picture` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '代表图片',
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1停用）',
@@ -170,7 +170,7 @@ CREATE TABLE `csa_crop_phase`  (
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`phase_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '作物生长阶段' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
@@ -307,20 +307,23 @@ CREATE TABLE `csa_garden`  (
   `remark` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `code`(`code`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜地' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 102 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜地' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of csa_garden
 -- ----------------------------
 INSERT INTO `csa_garden` VALUES (1, 1, '8001', '百草园', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-07 19:31:52', '101', '2022-03-29 15:35:54', NULL);
-INSERT INTO `csa_garden` VALUES (2, 1, '8002', '香草居', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-07 19:33:34', '101', '2022-03-29 21:04:29', NULL);
+INSERT INTO `csa_garden` VALUES (2, 1, '8002', '香草居', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-07 19:33:34', '101', '2022-03-30 22:10:58', NULL);
-INSERT INTO `csa_garden` VALUES (3, 1, '8003', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-07 13:15:43', '101', '2022-03-29 21:04:29', NULL);
+INSERT INTO `csa_garden` VALUES (3, 1, '8003', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'Y', '0', '0', '101', '2022-03-07 13:15:43', '101', '2022-03-30 22:10:58', NULL);
 INSERT INTO `csa_garden` VALUES (4, 1, '8004', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-07 13:20:38', '101', '2022-03-29 21:04:29', '');
 INSERT INTO `csa_garden` VALUES (5, 1, '8005', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-29 21:05:48', '', NULL, NULL);
 INSERT INTO `csa_garden` VALUES (6, 1, '8006', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-29 22:07:11', '', NULL, NULL);
 INSERT INTO `csa_garden` VALUES (7, 1, '8007', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-29 22:07:56', '', NULL, NULL);
 INSERT INTO `csa_garden` VALUES (8, 1, '8008', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-29 22:13:41', '', NULL, NULL);
 INSERT INTO `csa_garden` VALUES (9, 1, '8009', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-29 22:15:24', '', NULL, NULL);
+INSERT INTO `csa_garden` VALUES (10, 1, '8010', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-30 22:06:38', '', NULL, NULL);
+INSERT INTO `csa_garden` VALUES (11, 1, '8011', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-30 22:06:38', '', NULL, NULL);
+INSERT INTO `csa_garden` VALUES (12, 1, '8012', '', 30.0000, NULL, NULL, NULL, NULL, 'N', 'N', 'N', '0', '0', '101', '2022-03-30 22:06:38', '', NULL, NULL);
 
 -- ----------------------------
 -- Table structure for csa_garden_log
@@ -548,15 +551,13 @@ CREATE TABLE `gen_table`  (
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`table_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 25 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 28 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of gen_table
 -- ----------------------------
 INSERT INTO `gen_table` VALUES (1, 'csa_farm_zone', '农场分区', NULL, NULL, 'FarmZone', 'crud', 'com.jlt.csa', 'csa', 'farmzone', '农场分区', '郏磊涛', '0', '/', '{\"parentMenuId\":\"2002\"}', 'admin', '2022-03-24 19:16:52', '', '2022-03-28 22:04:22', NULL);
 INSERT INTO `gen_table` VALUES (2, 'csa_garden', '菜地', NULL, NULL, 'Garden', 'crud', 'com.jlt.csa', 'csa', 'garden', '菜地划分', '郏磊涛', '0', '/', '{\"parentMenuId\":\"2002\"}', 'admin', '2022-03-24 22:23:32', '', '2022-03-29 12:05:51', NULL);
-INSERT INTO `gen_table` VALUES (13, 'csa_crop_files', '作物档案', NULL, NULL, 'CropFiles', 'crud', 'com.jlt.csa', 'csa', 'cropfiles', '作物档案', 'JiaLeitao', '0', '/', '{\"parentMenuId\":2002}', 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53', NULL);
-INSERT INTO `gen_table` VALUES (14, 'csa_crop_phase', '作物生长阶段', NULL, NULL, 'CropPhase', 'crud', 'com.jlt.csa', 'csa', 'phase', '作物生长阶段', 'JiaLeitao', '0', '/', '{\"parentMenuId\":2002}', 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:51', NULL);
 INSERT INTO `gen_table` VALUES (15, 'csa_farmer', '私家农场会员', NULL, NULL, 'CsaFarmer', 'crud', 'com.jlt.csa', 'csa', 'farmer', '私家农场会员', 'JiaLeitao', '0', '/', '{\"parentMenuId\":\"2021\"}', 'admin', '2022-03-26 14:34:03', '', '2022-03-26 14:40:49', NULL);
 INSERT INTO `gen_table` VALUES (16, 'csa_member_card', '私家农场会员卡', NULL, NULL, 'CsaMemberCard', 'crud', 'com.jlt.csa', 'csa', 'card', '会员卡', 'JiaLeitao', '0', '/', '{\"parentMenuId\":\"2028\"}', 'admin', '2022-03-26 16:11:17', '', '2022-03-26 16:21:07', NULL);
 INSERT INTO `gen_table` VALUES (17, 'csa_arched_record', '拱棚使用记录', NULL, NULL, 'ArchedRecord', 'crud', 'com.jlt.csa', 'csa', 'archedrecord', '拱棚使用记录', 'JiaLeitao', '0', '/', '{\"parentMenuId\":\"2021\"}', 'admin', '2022-03-27 17:59:21', '', '2022-03-27 19:23:55', NULL);
@@ -567,6 +568,8 @@ INSERT INTO `gen_table` VALUES (21, 'csa_garden_log_attach', '菜地日志附件
 INSERT INTO `gen_table` VALUES (22, 'csa_garden_strain', '菜地品种', NULL, NULL, 'GardenStrain', 'crud', 'com.jlt.csa', 'csa', 'strain', '菜地品种', 'JiaLeitao', '0', '/', '{\"parentMenuId\":2021}', 'admin', '2022-03-27 17:59:21', '', '2022-03-27 18:02:34', NULL);
 INSERT INTO `gen_table` VALUES (23, 'csa_pick_detail', '采摘任务明细', NULL, NULL, 'PickDetail', 'crud', 'com.jlt.csa', 'csa', 'detail', '采摘任务明细', 'JiaLeitao', '0', '/', '{\"parentMenuId\":2021}', 'admin', '2022-03-27 17:59:21', '', '2022-03-27 18:19:02', NULL);
 INSERT INTO `gen_table` VALUES (24, 'csa_tend_task', '打理任务', NULL, NULL, 'TendTask', 'crud', 'com.jlt.csa', 'csa', 'task', '打理任务', 'JiaLeitao', '0', '/', '{\"parentMenuId\":\"2021\"}', 'admin', '2022-03-27 17:59:21', '', '2022-03-27 18:12:16', NULL);
+INSERT INTO `gen_table` VALUES (25, 'csa_crop_file', '作物档案', 'csa_crop_phase', 'crop_id', 'CropFile', 'sub', 'com.jlt.csa', 'csa', 'cropfile', '作物档案', '郏磊涛', '0', '/', '{\"parentMenuId\":\"2002\"}', 'admin', '2022-03-30 22:33:19', '', '2022-03-30 22:41:00', NULL);
+INSERT INTO `gen_table` VALUES (27, 'csa_crop_phase', '作物生长阶段', NULL, NULL, 'CropPhase', 'crud', 'com.jlt.csa', 'csa', 'cropphase', '作物生长阶段', '郏磊涛', '0', '/', '{}', 'admin', '2022-03-30 22:38:47', '', '2022-03-30 22:40:17', NULL);
 
 -- ----------------------------
 -- Table structure for gen_table_column
@@ -596,7 +599,7 @@ CREATE TABLE `gen_table_column`  (
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`column_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 344 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 380 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of gen_table_column
@@ -628,30 +631,6 @@ INSERT INTO `gen_table_column` VALUES (26, '2', 'create_time', '创建时间', '
 INSERT INTO `gen_table_column` VALUES (27, '2', 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', NULL, 17, 'admin', '2022-03-24 22:23:32', NULL, '2022-03-29 12:05:51');
 INSERT INTO `gen_table_column` VALUES (28, '2', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', NULL, 18, 'admin', '2022-03-24 22:23:32', NULL, '2022-03-29 12:05:51');
 INSERT INTO `gen_table_column` VALUES (29, '2', 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 19, 'admin', '2022-03-24 22:23:32', NULL, '2022-03-29 12:05:51');
-INSERT INTO `gen_table_column` VALUES (150, '13', 'id', '作物档案id', 'int(11)', 'Long', 'id', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (151, '13', 'name', '作物名称', 'varchar(32)', 'String', 'name', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 2, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (152, '13', 'plant_guide', '种植指南', 'varchar(1024)', 'String', 'plantGuide', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'textarea', '', 3, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (153, '13', 'picture', '代表图片', 'varchar(255)', 'String', 'picture', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 4, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (154, '13', 'description', '作物描述', 'varchar(1024)', 'String', 'description', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'textarea', '', 5, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (155, '13', 'status', '状态', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'radio', '', 6, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (156, '13', 'del_flag', '删除标志', 'char(1)', 'String', 'delFlag', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 7, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (157, '13', 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 8, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (158, '13', 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 9, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (159, '13', 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 10, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (160, '13', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 11, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (161, '13', 'remark', '备注', 'varchar(100)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 12, 'admin', '2022-03-25 22:20:58', '', '2022-03-25 22:23:53');
-INSERT INTO `gen_table_column` VALUES (162, '14', 'id', '阶段id', 'int(11)', 'Long', 'id', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:51');
-INSERT INTO `gen_table_column` VALUES (163, '14', 'crop_id', '作物id', 'int(11)', 'Long', 'cropId', '0', '0', '1', '1', '1', NULL, '1', 'EQ', 'input', '', 2, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
-INSERT INTO `gen_table_column` VALUES (164, '14', 'name', '阶段名称', 'varchar(20)', 'String', 'name', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
-INSERT INTO `gen_table_column` VALUES (165, '14', 'production', '产出', 'varchar(20)', 'String', 'production', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 4, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
-INSERT INTO `gen_table_column` VALUES (166, '14', 'picture', '代表图片', 'varchar(255)', 'String', 'picture', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 5, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
-INSERT INTO `gen_table_column` VALUES (167, '14', 'status', '状态', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 6, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
-INSERT INTO `gen_table_column` VALUES (168, '14', 'del_flag', '删除标志', 'char(1)', 'String', 'delFlag', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 7, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
-INSERT INTO `gen_table_column` VALUES (169, '14', 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 8, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
-INSERT INTO `gen_table_column` VALUES (170, '14', 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 9, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
-INSERT INTO `gen_table_column` VALUES (171, '14', 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 10, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
-INSERT INTO `gen_table_column` VALUES (172, '14', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 11, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
-INSERT INTO `gen_table_column` VALUES (173, '14', 'remark', '备注', 'varchar(100)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 12, 'admin', '2022-03-26 10:44:00', '', '2022-03-26 10:45:52');
 INSERT INTO `gen_table_column` VALUES (174, '15', 'id', '会员id', 'int(11)', 'Long', 'id', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', NULL, 1, 'admin', '2022-03-26 14:34:03', NULL, '2022-03-26 14:40:49');
 INSERT INTO `gen_table_column` VALUES (175, '15', 'name', '会员姓名', 'varchar(50)', 'String', 'name', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 2, 'admin', '2022-03-26 14:34:03', NULL, '2022-03-26 14:40:49');
 INSERT INTO `gen_table_column` VALUES (176, '15', 'gender', '性别', 'varchar(2)', 'String', 'gender', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 3, 'admin', '2022-03-26 14:34:03', NULL, '2022-03-26 14:40:49');
@@ -820,6 +799,30 @@ INSERT INTO `gen_table_column` VALUES (340, '24', 'remark', '备注', 'varchar(1
 INSERT INTO `gen_table_column` VALUES (341, '1', 'type', '分区类型', 'varchar(10)', 'String', 'type', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'select', 'csa_zone_type', 3, '', '2022-03-27 20:47:50', NULL, '2022-03-28 22:04:22');
 INSERT INTO `gen_table_column` VALUES (342, '1', 'id', '分区id', 'int(11)', 'Long', 'id', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, '', '2022-03-28 21:38:50', '', '2022-03-28 22:04:22');
 INSERT INTO `gen_table_column` VALUES (343, '2', 'zone_id', '农场分区', 'int(11)', 'Long', 'zoneId', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 2, '', '2022-03-29 11:37:14', '', '2022-03-29 12:05:51');
+INSERT INTO `gen_table_column` VALUES (344, '25', 'crop_id', '作物档案id', 'int(11)', 'Long', 'cropId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (345, '25', 'crop_name', '作物名称', 'varchar(32)', 'String', 'cropName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 2, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (346, '25', 'plant_guide', '种植指南', 'varchar(1024)', 'String', 'plantGuide', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'textarea', '', 3, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (347, '25', 'picture', '代表图片', 'varchar(255)', 'String', 'picture', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'imageUpload', '', 4, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (348, '25', 'description', '作物描述', 'varchar(1024)', 'String', 'description', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'textarea', '', 5, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (349, '25', 'status', '状态', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 6, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (350, '25', 'del_flag', '删除标志', 'char(1)', 'String', 'delFlag', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 7, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (351, '25', 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 8, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (352, '25', 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 9, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (353, '25', 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 10, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (354, '25', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 11, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (355, '25', 'remark', '备注', 'varchar(100)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 12, 'admin', '2022-03-30 22:33:20', '', '2022-03-30 22:41:00');
+INSERT INTO `gen_table_column` VALUES (368, '27', 'phase_id', '阶段id', 'int(11)', 'Long', 'phaseId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (369, '27', 'crop_id', '作物', 'int(11)', 'Long', 'cropId', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 2, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (370, '27', 'phase_name', '阶段名称', 'varchar(20)', 'String', 'phaseName', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (371, '27', 'production', '产出', 'varchar(20)', 'String', 'production', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 4, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (372, '27', 'picture', '代表图片', 'varchar(255)', 'String', 'picture', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'imageUpload', '', 5, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (373, '27', 'status', '状态（0正常 1停用）', 'char(1)', 'String', 'status', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 6, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (374, '27', 'del_flag', '删除标志（0代表存在 2代表删除）', 'char(1)', 'String', 'delFlag', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 7, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (375, '27', 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 8, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (376, '27', 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 9, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (377, '27', 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 10, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (378, '27', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 11, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
+INSERT INTO `gen_table_column` VALUES (379, '27', 'remark', '备注', 'varchar(100)', 'String', 'remark', '0', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 12, 'admin', '2022-03-30 22:38:48', '', '2022-03-30 22:40:17');
 
 -- ----------------------------
 -- Table structure for qrtz_blob_triggers
@@ -1254,7 +1257,7 @@ CREATE TABLE `sys_logininfor`  (
   `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '提示消息',
   `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间',
   PRIMARY KEY (`info_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 172 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 174 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_logininfor
@@ -1331,6 +1334,8 @@ INSERT INTO `sys_logininfor` VALUES (168, '101', '127.0.0.1', '内网IP', 'Chrom
 INSERT INTO `sys_logininfor` VALUES (169, '101', '127.0.0.1', '内网IP', 'Chrome 9', 'Windows 10', '0', '退出成功', '2022-03-29 20:32:16');
 INSERT INTO `sys_logininfor` VALUES (170, 'admin', '127.0.0.1', '内网IP', 'Chrome 9', 'Windows 10', '0', '登录成功', '2022-03-29 20:32:21');
 INSERT INTO `sys_logininfor` VALUES (171, '101', '127.0.0.1', '内网IP', 'Chrome 9', 'Windows 10', '0', '登录成功', '2022-03-29 20:33:33');
+INSERT INTO `sys_logininfor` VALUES (172, 'admin', '127.0.0.1', '内网IP', 'Firefox 9', 'Windows 10', '0', '登录成功', '2022-03-30 22:05:33');
+INSERT INTO `sys_logininfor` VALUES (173, '101', '127.0.0.1', '内网IP', 'Chrome 9', 'Windows 10', '0', '登录成功', '2022-03-30 22:05:56');
 
 -- ----------------------------
 -- Table structure for sys_menu
@@ -1456,12 +1461,10 @@ INSERT INTO `sys_menu` VALUES (2009, '菜地划分', 2002, 20, 'garden', 'csa/ga
 INSERT INTO `sys_menu` VALUES (2010, '菜地查询', 2009, 10, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:garden:query', '#', 'admin', '2022-03-24 22:30:32', 'admin', '2022-03-29 17:15:05', '');
 INSERT INTO `sys_menu` VALUES (2011, '菜地划分', 2009, 20, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:garden:update', '#', 'admin', '2022-03-24 22:30:32', 'admin', '2022-03-29 18:39:21', '');
 INSERT INTO `sys_menu` VALUES (2014, '菜地导出', 2009, 30, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:garden:export', '#', 'admin', '2022-03-24 22:30:33', 'admin', '2022-03-29 17:16:36', '');
-INSERT INTO `sys_menu` VALUES (2015, '作物档案', 2002, 30, 'cropfiles', 'csa/cropfiles/index', NULL, 1, 0, 'C', '0', '0', 'csa:cropfiles:list', 'documentation', 'admin', '2022-03-25 22:25:59', 'admin', '2022-03-29 17:15:45', '作物档案菜单');
+INSERT INTO `sys_menu` VALUES (2015, '作物档案', 2002, 30, 'cropfile', 'csa/cropfile/index', NULL, 1, 0, 'C', '0', '0', 'csa:cropfile:query', 'documentation', 'admin', '2022-03-25 22:25:59', 'admin', '2022-03-30 22:31:10', '作物档案菜单');
-INSERT INTO `sys_menu` VALUES (2016, '作物档案查询', 2015, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:cropfiles:query', '#', 'admin', '2022-03-25 22:25:59', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2016, '作物档案查询', 2015, 10, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:cropfile:query', '#', 'admin', '2022-03-25 22:25:59', 'admin', '2022-03-30 22:30:33', '');
-INSERT INTO `sys_menu` VALUES (2017, '作物档案新增', 2015, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:cropfiles:add', '#', 'admin', '2022-03-25 22:25:59', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2017, '作物档案更新', 2015, 20, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:cropfile:update', '#', 'admin', '2022-03-25 22:25:59', 'admin', '2022-03-30 22:32:35', '');
-INSERT INTO `sys_menu` VALUES (2018, '作物档案修改', 2015, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:cropfiles:edit', '#', 'admin', '2022-03-25 22:25:59', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2020, '作物档案导出', 2015, 30, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:cropfile:export', '#', 'admin', '2022-03-25 22:25:59', 'admin', '2022-03-30 22:31:55', '');
-INSERT INTO `sys_menu` VALUES (2019, '作物档案删除', 2015, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:cropfiles:remove', '#', 'admin', '2022-03-25 22:25:59', '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2020, '作物档案导出', 2015, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:cropfiles:export', '#', 'admin', '2022-03-25 22:25:59', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (2021, '会员服务', 0, 200, 'member', NULL, NULL, 1, 0, 'M', '0', '0', '', 'people', 'admin', '2022-03-25 22:43:43', 'admin', '2022-03-26 14:33:42', '');
 INSERT INTO `sys_menu` VALUES (2022, '私家农场会员', 2021, 1, 'farmer', 'csa/farmer/index', NULL, 1, 0, 'C', '0', '0', 'csa:farmer:list', '#', 'admin', '2022-03-26 14:48:06', '', NULL, '私家农场会员菜单');
 INSERT INTO `sys_menu` VALUES (2023, '私家农场会员查询', 2022, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'csa:farmer:query', '#', 'admin', '2022-03-26 14:48:06', '', NULL, '');
@@ -1577,7 +1580,7 @@ CREATE TABLE `sys_oper_log`  (
   `error_msg` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '错误消息',
   `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间',
   PRIMARY KEY (`oper_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 414 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 440 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_oper_log
@@ -1896,6 +1899,32 @@ INSERT INTO `sys_oper_log` VALUES (410, '菜地划分', 1, 'com.jlt.csa.controll
 INSERT INTO `sys_oper_log` VALUES (411, '菜地划分', 1, 'com.jlt.csa.controller.GardenController.add()', 'POST', 1, '101', NULL, '/csa/garden', '127.0.0.1', '内网IP', '{\"code\":\"8007\",\"m2\":30,\"params\":{},\"createBy\":\"101\",\"createTime\":1648562876418,\"zoneId\":1,\"isCompleted\":\"N\"} {\"zoneId\":\"1\",\"code\":\"8007\",\"m2\":\"30\",\"isCompleted\":\"N\",\"amount\":\"1\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-29 22:07:56');
 INSERT INTO `sys_oper_log` VALUES (412, '菜地划分', 1, 'com.jlt.csa.controller.GardenController.add()', 'POST', 1, '101', NULL, '/csa/garden', '127.0.0.1', '内网IP', '{\"code\":\"8008\",\"m2\":30,\"params\":{},\"createBy\":\"101\",\"createTime\":1648563220768,\"zoneId\":1,\"isCompleted\":\"N\"} {\"zoneId\":1,\"code\":\"8008\",\"m2\":\"30\",\"isCompleted\":\"N\",\"amount\":2}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-29 22:13:40');
 INSERT INTO `sys_oper_log` VALUES (413, '菜地划分', 1, 'com.jlt.csa.controller.GardenController.add()', 'POST', 1, '101', NULL, '/csa/garden', '127.0.0.1', '内网IP', '{\"code\":\"8009\",\"m2\":30,\"params\":{},\"createBy\":\"101\",\"createTime\":1648563324216,\"zoneId\":1,\"isCompleted\":\"N\"} {\"zoneId\":1,\"code\":\"8009\",\"m2\":\"30\",\"isCompleted\":\"N\",\"amount\":2}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-29 22:15:24');
+INSERT INTO `sys_oper_log` VALUES (414, '菜地划分', 1, 'com.jlt.csa.controller.GardenController.add()', 'POST', 1, '101', NULL, '/csa/garden', '127.0.0.1', '内网IP', '{\"code\":\"8012\",\"m2\":30,\"params\":{},\"createBy\":\"101\",\"createTime\":1648649198480,\"zoneId\":1,\"isCompleted\":\"N\"} {\"zoneId\":1,\"code\":\"8010\",\"m2\":\"30\",\"isCompleted\":\"N\",\"amount\":3}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:06:38');
+INSERT INTO `sys_oper_log` VALUES (415, '菜地划分', 1, 'com.jlt.csa.controller.GardenController.add()', 'POST', 1, '101', NULL, '/csa/garden', '127.0.0.1', '内网IP', '{\"code\":\"AA\",\"m2\":30,\"params\":{},\"createBy\":\"101\",\"createTime\":1648649222106,\"zoneId\":1,\"isCompleted\":\"N\"} {\"zoneId\":1,\"code\":\"AA\",\"m2\":\"30\",\"isCompleted\":\"N\",\"amount\":2}', NULL, 1, '菜地编号格式不正确！', '2022-03-30 22:07:02');
+INSERT INTO `sys_oper_log` VALUES (416, '菜地划分', 1, 'com.jlt.csa.controller.GardenController.add()', 'POST', 1, '101', NULL, '/csa/garden', '127.0.0.1', '内网IP', '{\"code\":\"99\",\"m2\":30,\"params\":{},\"createBy\":\"101\",\"createTime\":1648649243772,\"zoneId\":1,\"isCompleted\":\"N\"} {\"zoneId\":1,\"code\":\"11\",\"m2\":\"30\",\"isCompleted\":\"N\",\"amount\":89}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:07:26');
+INSERT INTO `sys_oper_log` VALUES (417, '菜地划分', 1, 'com.jlt.csa.controller.GardenController.add()', 'POST', 1, '101', NULL, '/csa/garden', '127.0.0.1', '内网IP', '{\"code\":\"11\",\"m2\":30,\"params\":{},\"createBy\":\"101\",\"createTime\":1648649392178,\"zoneId\":1,\"isCompleted\":\"N\"} {\"zoneId\":1,\"code\":\"11\",\"m2\":\"30\",\"isCompleted\":\"N\",\"amount\":90}', NULL, 1, '菜地编号数字部分长度不够！', '2022-03-30 22:09:52');
+INSERT INTO `sys_oper_log` VALUES (418, '菜地划分', 1, 'com.jlt.csa.controller.GardenController.add()', 'POST', 1, '101', NULL, '/csa/garden', '127.0.0.1', '内网IP', '{\"code\":\"11\",\"m2\":30,\"params\":{},\"createBy\":\"101\",\"createTime\":1648649396131,\"zoneId\":1,\"isCompleted\":\"N\"} {\"zoneId\":1,\"code\":\"11\",\"m2\":\"30\",\"isCompleted\":\"N\",\"amount\":90}', NULL, 1, '菜地编号数字部分长度不够！', '2022-03-30 22:09:56');
+INSERT INTO `sys_oper_log` VALUES (419, '菜地划分', 1, 'com.jlt.csa.controller.GardenController.add()', 'POST', 1, '101', NULL, '/csa/garden', '127.0.0.1', '内网IP', '{\"code\":\"11\",\"m2\":30,\"params\":{},\"createBy\":\"101\",\"createTime\":1648649399773,\"zoneId\":1,\"isCompleted\":\"N\"} {\"zoneId\":1,\"code\":\"11\",\"m2\":\"30\",\"isCompleted\":\"N\",\"amount\":90}', NULL, 1, '菜地编号数字部分长度不够！', '2022-03-30 22:09:59');
+INSERT INTO `sys_oper_log` VALUES (420, '菜地划分', 2, 'com.jlt.csa.controller.GardenController.updateStatus()', 'PUT', 1, '101', NULL, '/csa/garden/2,3', '127.0.0.1', '内网IP', '{\"updateTime\":1648649458136,\"params\":{},\"updateBy\":\"101\",\"isCompleted\":\"Y\"} [2,3]', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:10:58');
+INSERT INTO `sys_oper_log` VALUES (421, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"visible\":\"0\",\"icon\":\"documentation\",\"orderNum\":30,\"menuName\":\"作物档案\",\"params\":{},\"parentId\":2002,\"isCache\":\"0\",\"path\":\"cropfile\",\"component\":\"csa/cropfile/index\",\"children\":[],\"createTime\":1648218359000,\"updateBy\":\"admin\",\"isFrame\":\"1\",\"menuId\":2015,\"menuType\":\"C\",\"perms\":\"csa:cropfile:list\",\"status\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:30:16');
+INSERT INTO `sys_oper_log` VALUES (422, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"visible\":\"0\",\"icon\":\"#\",\"orderNum\":10,\"menuName\":\"作物档案查询\",\"params\":{},\"parentId\":2015,\"isCache\":\"0\",\"path\":\"#\",\"component\":\"\",\"children\":[],\"createTime\":1648218359000,\"updateBy\":\"admin\",\"isFrame\":\"1\",\"menuId\":2016,\"menuType\":\"F\",\"perms\":\"csa:cropfile:query\",\"status\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:30:33');
+INSERT INTO `sys_oper_log` VALUES (423, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"visible\":\"0\",\"icon\":\"#\",\"orderNum\":20,\"menuName\":\"作物档案新增\",\"params\":{},\"parentId\":2015,\"isCache\":\"0\",\"path\":\"#\",\"component\":\"\",\"children\":[],\"createTime\":1648218359000,\"updateBy\":\"admin\",\"isFrame\":\"1\",\"menuId\":2017,\"menuType\":\"F\",\"perms\":\"csa:cropfile:add\",\"status\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:30:51');
+INSERT INTO `sys_oper_log` VALUES (424, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"visible\":\"0\",\"icon\":\"documentation\",\"orderNum\":30,\"menuName\":\"作物档案\",\"params\":{},\"parentId\":2002,\"isCache\":\"0\",\"path\":\"cropfile\",\"component\":\"csa/cropfile/index\",\"children\":[],\"createTime\":1648218359000,\"updateBy\":\"admin\",\"isFrame\":\"1\",\"menuId\":2015,\"menuType\":\"C\",\"perms\":\"csa:cropfile:query\",\"status\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:31:10');
+INSERT INTO `sys_oper_log` VALUES (425, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"visible\":\"0\",\"icon\":\"#\",\"orderNum\":3,\"menuName\":\"作物档案更新\",\"params\":{},\"parentId\":2015,\"isCache\":\"0\",\"path\":\"#\",\"component\":\"\",\"children\":[],\"createTime\":1648218359000,\"updateBy\":\"admin\",\"isFrame\":\"1\",\"menuId\":2018,\"menuType\":\"F\",\"perms\":\"csa:cropfile:update\",\"status\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:31:31');
+INSERT INTO `sys_oper_log` VALUES (426, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"visible\":\"0\",\"icon\":\"#\",\"orderNum\":30,\"menuName\":\"作物档案导出\",\"params\":{},\"parentId\":2015,\"isCache\":\"0\",\"path\":\"#\",\"component\":\"\",\"children\":[],\"createTime\":1648218359000,\"updateBy\":\"admin\",\"isFrame\":\"1\",\"menuId\":2020,\"menuType\":\"F\",\"perms\":\"csa:cropfile:export\",\"status\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:31:55');
+INSERT INTO `sys_oper_log` VALUES (427, '菜单管理', 3, 'com.ruoyi.web.controller.system.SysMenuController.remove()', 'DELETE', 1, 'admin', NULL, '/system/menu/2019', '127.0.0.1', '内网IP', '{menuId=2019}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:32:00');
+INSERT INTO `sys_oper_log` VALUES (428, '菜单管理', 3, 'com.ruoyi.web.controller.system.SysMenuController.remove()', 'DELETE', 1, 'admin', NULL, '/system/menu/2018', '127.0.0.1', '内网IP', '{menuId=2018}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:32:21');
+INSERT INTO `sys_oper_log` VALUES (429, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"visible\":\"0\",\"icon\":\"#\",\"orderNum\":20,\"menuName\":\"作物档案更新\",\"params\":{},\"parentId\":2015,\"isCache\":\"0\",\"path\":\"#\",\"component\":\"\",\"children\":[],\"createTime\":1648218359000,\"updateBy\":\"admin\",\"isFrame\":\"1\",\"menuId\":2017,\"menuType\":\"F\",\"perms\":\"csa:cropfile:update\",\"status\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:32:35');
+INSERT INTO `sys_oper_log` VALUES (430, '代码生成', 3, 'com.ruoyi.generator.controller.GenController.remove()', 'DELETE', 1, 'admin', NULL, '/tool/gen/13', '127.0.0.1', '内网IP', '{tableIds=13}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:33:13');
+INSERT INTO `sys_oper_log` VALUES (431, '代码生成', 6, 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/tool/gen/importTable', '127.0.0.1', '内网IP', 'csa_crop_file', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:33:20');
+INSERT INTO `sys_oper_log` VALUES (432, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/tool/gen', '127.0.0.1', '内网IP', '{\"sub\":false,\"functionAuthor\":\"郏磊涛\",\"columns\":[{\"capJavaField\":\"CropId\",\"usableColumn\":false,\"columnId\":344,\"isIncrement\":\"1\",\"increment\":true,\"insert\":true,\"dictType\":\"\",\"required\":false,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"javaField\":\"cropId\",\"htmlType\":\"input\",\"edit\":false,\"query\":false,\"columnComment\":\"作物档案id\",\"sort\":1,\"list\":false,\"params\":{},\"javaType\":\"Long\",\"queryType\":\"EQ\",\"columnType\":\"int(11)\",\"createBy\":\"admin\",\"isPk\":\"1\",\"createTime\":1648650800000,\"tableId\":25,\"pk\":true,\"columnName\":\"crop_id\"},{\"capJavaField\":\"CropName\",\"usableColumn\":false,\"columnId\":345,\"isIncrement\":\"0\",\"increment\":false,\"insert\":true,\"isList\":\"1\",\"dictType\":\"\",\"required\":true,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"isRequired\":\"1\",\"javaField\":\"cropName\",\"htmlType\":\"input\",\"edit\":true,\"query\":true,\"columnComment\":\"作物名称\",\"isQuery\":\"1\",\"sort\":2,\"list\":true,\"params\":{},\"javaType\":\"String\",\"queryType\":\"LIKE\",\"columnType\":\"varchar(32)\",\"createBy\":\"admin\",\"isPk\":\"0\",\"createTime\":1648650800000,\"isEdit\":\"1\",\"tableId\":25,\"pk\":false,\"columnName\":\"crop_name\"},{\"capJavaField\":\"PlantGuide\",\"usableColumn\":false,\"columnId\":346,\"isIncrement\":\"0\",\"increment\":false,\"insert\":true,\"dictType\":\"\",\"required\":false,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"javaField\":\"plantGuide\",\"htmlType\":\"textarea\",\"edit\":true,\"query\":false,\"columnComment\":\"种植指南\",\"sort\":3,\"list\":false,\"params\":{},\"javaType\":\"String\",\"queryType\":\"EQ\",\"columnType\":\"varchar(1024)\",\"createBy\":\"admin\",\"isPk\":\"0\",\"createTime\":1648650800000,\"isEdit\":\"1\",\"tableId\":25,\"pk\":false,\"columnName\":\"plant_guide\"},{\"capJavaField\":\"Picture\",\"usableColumn\":false,\"columnId\":347,\"isIncrement\":\"0\",\"increment\":false,\"insert\":true,\"isList\":\"1\",\"dictType\":\"\",\"required\":false,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"javaField\":\"picture\",\"htmlType\":\"imageUpload\",\"edit\":true,\"query\":false,\"columnComment\":\"代表图片\",\"sort\":4,\"list\":true,\"params\":{},\"javaType\":\"String\",\"queryType\":\"EQ\",\"columnType\":\"varchar(255)\",\"createBy\":\"admin\"', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:35:26');
+INSERT INTO `sys_oper_log` VALUES (433, '代码生成', 3, 'com.ruoyi.generator.controller.GenController.remove()', 'DELETE', 1, 'admin', NULL, '/tool/gen/14', '127.0.0.1', '内网IP', '{tableIds=14}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:35:46');
+INSERT INTO `sys_oper_log` VALUES (434, '代码生成', 6, 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/tool/gen/importTable', '127.0.0.1', '内网IP', 'csa_crop_phase', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:35:51');
+INSERT INTO `sys_oper_log` VALUES (435, '代码生成', 3, 'com.ruoyi.generator.controller.GenController.remove()', 'DELETE', 1, 'admin', NULL, '/tool/gen/26', '127.0.0.1', '内网IP', '{tableIds=26}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:37:16');
+INSERT INTO `sys_oper_log` VALUES (436, '代码生成', 6, 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/tool/gen/importTable', '127.0.0.1', '内网IP', 'csa_crop_phase', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:38:48');
+INSERT INTO `sys_oper_log` VALUES (437, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/tool/gen', '127.0.0.1', '内网IP', '{\"sub\":false,\"functionAuthor\":\"郏磊涛\",\"columns\":[{\"capJavaField\":\"PhaseId\",\"usableColumn\":false,\"columnId\":368,\"isIncrement\":\"1\",\"increment\":true,\"insert\":true,\"dictType\":\"\",\"required\":false,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"javaField\":\"phaseId\",\"htmlType\":\"input\",\"edit\":false,\"query\":false,\"columnComment\":\"阶段id\",\"sort\":1,\"list\":false,\"params\":{},\"javaType\":\"Long\",\"queryType\":\"EQ\",\"columnType\":\"int(11)\",\"createBy\":\"admin\",\"isPk\":\"1\",\"createTime\":1648651128000,\"tableId\":27,\"pk\":true,\"columnName\":\"phase_id\"},{\"capJavaField\":\"CropId\",\"usableColumn\":false,\"columnId\":369,\"isIncrement\":\"0\",\"increment\":false,\"insert\":true,\"isList\":\"1\",\"dictType\":\"\",\"required\":true,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"isRequired\":\"1\",\"javaField\":\"cropId\",\"htmlType\":\"input\",\"edit\":true,\"query\":true,\"columnComment\":\"作物\",\"isQuery\":\"1\",\"sort\":2,\"list\":true,\"params\":{},\"javaType\":\"Long\",\"queryType\":\"EQ\",\"columnType\":\"int(11)\",\"createBy\":\"admin\",\"isPk\":\"0\",\"createTime\":1648651128000,\"isEdit\":\"1\",\"tableId\":27,\"pk\":false,\"columnName\":\"crop_id\"},{\"capJavaField\":\"PhaseName\",\"usableColumn\":false,\"columnId\":370,\"isIncrement\":\"0\",\"increment\":false,\"insert\":true,\"isList\":\"1\",\"dictType\":\"\",\"required\":true,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"isRequired\":\"1\",\"javaField\":\"phaseName\",\"htmlType\":\"input\",\"edit\":true,\"query\":true,\"columnComment\":\"阶段名称\",\"isQuery\":\"1\",\"sort\":3,\"list\":true,\"params\":{},\"javaType\":\"String\",\"queryType\":\"LIKE\",\"columnType\":\"varchar(20)\",\"createBy\":\"admin\",\"isPk\":\"0\",\"createTime\":1648651128000,\"isEdit\":\"1\",\"tableId\":27,\"pk\":false,\"columnName\":\"phase_name\"},{\"capJavaField\":\"Production\",\"usableColumn\":false,\"columnId\":371,\"isIncrement\":\"0\",\"increment\":false,\"insert\":true,\"isList\":\"1\",\"dictType\":\"\",\"required\":false,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"javaField\":\"production\",\"htmlType\":\"input\",\"edit\":true,\"query\":false,\"columnComment\":\"产出\",\"sort\":4,\"list\":true,\"params\":{},\"javaType\":\"String\",\"queryType\":\"EQ\",\"columnType\":\"varchar(20)\",\"', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:40:17');
+INSERT INTO `sys_oper_log` VALUES (438, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/tool/gen', '127.0.0.1', '内网IP', '{\"sub\":true,\"subTableName\":\"csa_crop_phase\",\"functionAuthor\":\"郏磊涛\",\"columns\":[{\"capJavaField\":\"CropId\",\"usableColumn\":false,\"columnId\":344,\"isIncrement\":\"1\",\"increment\":true,\"insert\":true,\"dictType\":\"\",\"required\":false,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"javaField\":\"cropId\",\"htmlType\":\"input\",\"edit\":false,\"query\":false,\"columnComment\":\"作物档案id\",\"updateTime\":1648650926000,\"sort\":1,\"list\":false,\"params\":{},\"javaType\":\"Long\",\"queryType\":\"EQ\",\"columnType\":\"int(11)\",\"createBy\":\"admin\",\"isPk\":\"1\",\"createTime\":1648650800000,\"tableId\":25,\"pk\":true,\"columnName\":\"crop_id\"},{\"capJavaField\":\"CropName\",\"usableColumn\":false,\"columnId\":345,\"isIncrement\":\"0\",\"increment\":false,\"insert\":true,\"isList\":\"1\",\"dictType\":\"\",\"required\":true,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"isRequired\":\"1\",\"javaField\":\"cropName\",\"htmlType\":\"input\",\"edit\":true,\"query\":true,\"columnComment\":\"作物名称\",\"isQuery\":\"1\",\"updateTime\":1648650926000,\"sort\":2,\"list\":true,\"params\":{},\"javaType\":\"String\",\"queryType\":\"LIKE\",\"columnType\":\"varchar(32)\",\"createBy\":\"admin\",\"isPk\":\"0\",\"createTime\":1648650800000,\"isEdit\":\"1\",\"tableId\":25,\"pk\":false,\"columnName\":\"crop_name\"},{\"capJavaField\":\"PlantGuide\",\"usableColumn\":false,\"columnId\":346,\"isIncrement\":\"0\",\"increment\":false,\"insert\":true,\"dictType\":\"\",\"required\":false,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"javaField\":\"plantGuide\",\"htmlType\":\"textarea\",\"edit\":true,\"query\":false,\"columnComment\":\"种植指南\",\"updateTime\":1648650926000,\"sort\":3,\"list\":false,\"params\":{},\"javaType\":\"String\",\"queryType\":\"EQ\",\"columnType\":\"varchar(1024)\",\"createBy\":\"admin\",\"isPk\":\"0\",\"createTime\":1648650800000,\"isEdit\":\"1\",\"tableId\":25,\"pk\":false,\"columnName\":\"plant_guide\"},{\"capJavaField\":\"Picture\",\"usableColumn\":false,\"columnId\":347,\"isIncrement\":\"0\",\"increment\":false,\"insert\":true,\"isList\":\"1\",\"dictType\":\"\",\"required\":false,\"superColumn\":false,\"updateBy\":\"\",\"isInsert\":\"1\",\"javaField\":\"picture\",\"htmlType\":\"imageUpload\",\"edit\":true,\"query\":false,\"columnComment\":\"代表图片\",\"upd', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-03-30 22:41:00');
+INSERT INTO `sys_oper_log` VALUES (439, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{}', NULL, 0, NULL, '2022-03-30 22:41:16');
 
 -- ----------------------------
 -- Table structure for sys_post
@@ -2106,9 +2135,9 @@ CREATE TABLE `sys_user`  (
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES (1, 103, 'admin', '超级管理员', '00', '', '', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-03-29 20:32:22', 'admin', '2022-03-20 21:45:25', '', '2022-03-29 20:32:21', '管理员');
+INSERT INTO `sys_user` VALUES (1, 103, 'admin', '超级管理员', '00', '', '', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-03-30 22:05:34', 'admin', '2022-03-20 21:45:25', '', '2022-03-30 22:05:33', '管理员');
 INSERT INTO `sys_user` VALUES (2, 101, 'boss', '农场管理员', '00', '', '', '2', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-03-20 21:45:25', 'admin', '2022-03-20 21:45:25', 'admin', '2022-03-29 17:51:59', '');
-INSERT INTO `sys_user` VALUES (100, 104, '101', '场长', '00', '88@66.com', '18888888888', '0', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-03-29 20:31:46', 'admin', '2022-03-29 18:18:00', 'admin', '2022-03-29 20:35:09', NULL);
+INSERT INTO `sys_user` VALUES (100, 104, '101', '场长', '00', '88@66.com', '18888888888', '0', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-03-30 22:05:56', 'admin', '2022-03-29 18:18:00', 'admin', '2022-03-30 22:05:56', NULL);
 
 -- ----------------------------
 -- Table structure for sys_user_post