From 465e5994ae7bd3028bde44c31a64abb4a6ffdab6 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Fri, 5 Sep 2025 22:19:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TResourceLandController.java | 128 ++++-- .../TResourceOperationController.java | 103 +++-- .../src/main/resources/application-druid.yml | 2 +- .../ruoyi/business/domain/TResourceLand.java | 121 ------ .../business/domain/TResourceOperation.java | 95 ----- .../ruoyi/resource/domain/TResourceLand.java | 385 ++++++++++++++++++ .../resource/domain/TResourceOperation.java | 310 ++++++++++++++ .../ruoyi/resource/domain/TResourceVo.java | 138 +++++++ .../mapper/TResourceLandMapper.java | 31 +- .../mapper/TResourceOperationMapper.java | 9 +- .../service/ITResourceLandService.java | 23 +- .../service/ITResourceOperationService.java | 9 +- .../impl/TResourceLandServiceImpl.java | 90 ++-- .../impl/TResourceOperationServiceImpl.java | 34 +- .../mapper/business/TResourceLandMapper.xml | 293 ------------- .../mapper/resource/TResourceLandMapper.xml | 274 +++++++++++++ .../TResourceOperationMapper.xml | 62 ++- .../src/main/resources/vm/vue/index.vue.vm | 7 +- 18 files changed, 1400 insertions(+), 714 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{business => resource}/TResourceLandController.java (63%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{business => resource}/TResourceOperationController.java (71%) delete mode 100644 ruoyi-business/src/main/java/com/ruoyi/business/domain/TResourceLand.java delete mode 100644 ruoyi-business/src/main/java/com/ruoyi/business/domain/TResourceOperation.java create mode 100644 ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceLand.java create mode 100644 ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceOperation.java create mode 100644 ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java rename ruoyi-business/src/main/java/com/ruoyi/{business => resource}/mapper/TResourceLandMapper.java (68%) rename ruoyi-business/src/main/java/com/ruoyi/{business => resource}/mapper/TResourceOperationMapper.java (90%) rename ruoyi-business/src/main/java/com/ruoyi/{business => resource}/service/ITResourceLandService.java (75%) rename ruoyi-business/src/main/java/com/ruoyi/{business => resource}/service/ITResourceOperationService.java (91%) rename ruoyi-business/src/main/java/com/ruoyi/{business => resource}/service/impl/TResourceLandServiceImpl.java (76%) rename ruoyi-business/src/main/java/com/ruoyi/{business => resource}/service/impl/TResourceOperationServiceImpl.java (92%) delete mode 100644 ruoyi-business/src/main/resources/mapper/business/TResourceLandMapper.xml create mode 100644 ruoyi-business/src/main/resources/mapper/resource/TResourceLandMapper.xml rename ruoyi-business/src/main/resources/mapper/{business => resource}/TResourceOperationMapper.xml (81%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TResourceLandController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java similarity index 63% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TResourceLandController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java index da9b5c2..215e339 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TResourceLandController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java @@ -1,49 +1,57 @@ -package com.ruoyi.web.controller.business; +package com.ruoyi.web.controller.resource; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.ruoyi.business.domain.TResourceLand; -import com.ruoyi.business.service.ITResourceLandService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.pdf.PageSet; import com.ruoyi.common.core.domain.pdf.PdfProperty; import com.ruoyi.common.core.domain.pdf.ShoulderItem; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.pdf.PdfUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.translation.TranslateUtils; +import com.ruoyi.resource.domain.TResourceLand; +import com.ruoyi.resource.domain.TResourceOperation; +import com.ruoyi.resource.domain.TResourceVo; +import com.ruoyi.resource.service.ITResourceLandService; +import com.ruoyi.resource.service.ITResourceOperationService; +import com.ruoyi.system.service.ISysDeptService; import org.apache.commons.compress.utils.Lists; -import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.BeanUtils; 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.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** * 地块属性Controller * - * @author yfd + * @author rongxin * @date 2025-09-05 */ @RestController -@RequestMapping("/business/resourceLand") +@RequestMapping("/resource/land") public class TResourceLandController extends BaseController { @Autowired private ITResourceLandService tResourceLandService; + @Autowired + private ITResourceOperationService tResourceOperationService; + + @Autowired + private ISysDeptService deptService; + /** * 查询地块属性列表 */ - @PreAuthorize("@ss.hasPermi('business:resourceLand:list')") + @PreAuthorize("@ss.hasPermi('resource:land:list')") @GetMapping("/list") public TableDataInfo list(TResourceLand tResourceLand) { @@ -56,7 +64,7 @@ public class TResourceLandController extends BaseController /** * 导出地块属性列表 */ - @PreAuthorize("@ss.hasPermi('business:resourceLand:export')") + @PreAuthorize("@ss.hasPermi('resource:land:export')") @Log(title = "地块属性", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TResourceLand tResourceLand) @@ -79,7 +87,7 @@ public class TResourceLandController extends BaseController * 地块属性导入 */ @Log(title = "地块属性", businessType = BusinessType.IMPORT) - @PreAuthorize("@ss.hasPermi('business:resourceLand:import')") + @PreAuthorize("@ss.hasPermi('resource:land:import')") @PostMapping("/importData") public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception { ExcelUtil util = new ExcelUtil(TResourceLand.class); @@ -91,39 +99,83 @@ public class TResourceLandController extends BaseController /** * 获取地块属性详细信息 */ - @PreAuthorize("@ss.hasPermi('business:resourceLand:query')") - @GetMapping(value = "/{DKBM}") - public AjaxResult getInfo(@PathVariable("DKBM") String DKBM) + @PreAuthorize("@ss.hasPermi('resource:land:query')") + @GetMapping(value = "/{fid}") + public AjaxResult getInfo(@PathVariable("fid") Long fid) { - return success(tResourceLandService.selectTResourceLandByDKBM(DKBM)); + return success(tResourceLandService.selectTResourceLandByFid(fid)); } /** * 获取地块属性详细信息,翻译字典 */ - @GetMapping(value = "/detail/{DKBM}") - public AjaxResult detail(@PathVariable("DKBM") String DKBM) + @GetMapping(value = "/detail/{fid}") + public AjaxResult detail(@PathVariable("fid") Long fid) { - TResourceLand detail = tResourceLandService.selectTResourceLandByDKBM(DKBM); + TResourceLand detail = tResourceLandService.selectTResourceLandByFid(fid); TranslateUtils.translate(detail, false); return success(detail); } + /** + * 获取地块属性详细信息,翻译字典 ,合并属性及经营数据 + */ + @GetMapping(value = "/detailByDkbm/{dkbm}") + public AjaxResult detailByDkbm(@PathVariable("dkbm") String dkbm) + { + TResourceVo resource = new TResourceVo(); + + TResourceLand land = tResourceLandService.selectTResourceLandByDkbm(dkbm); + + BeanUtils.copyProperties(land, resource); + + TResourceOperation operation = tResourceOperationService.selectTResourceOperationByDkbm(dkbm); + + resource.setJymj(operation.getJymj()); + resource.setJyfs(operation.getJyfs()); + resource.setJydxmc(operation.getJydxmc()); + resource.setJykssj(operation.getJykssj()); + resource.setJyjssj(operation.getJyjssj()); + resource.setCbje(operation.getCbje()); + resource.setBz(operation.getBz()); + resource.setDkImg(operation.getDkImg()); + resource.setSurveyStatus(operation.getSurveyStatus()); + + TranslateUtils.translate(resource, false); + return success(resource); + } + + + + /** * 新增地块属性 */ - @PreAuthorize("@ss.hasPermi('business:resourceLand:add')") + @PreAuthorize("@ss.hasPermi('resource:land:add')") @Log(title = "地块属性", businessType = BusinessType.INSERT) @PostMapping("/add") public AjaxResult add(@RequestBody TResourceLand tResourceLand) { + SysDept dept = deptService.selectDeptById(tResourceLand.getDeptId()); + if(dept.getOrgCode().length() < 12){ + return error("非村、组级行政区划，不允许添加地块！"); + } + + tResourceLand.setImportCode(dept.getImportCode()); + if(StringUtils.isNull(tResourceLand.getDkbm())){ + if(dept.getOrgCode().length() == 12){ // 12 村级，要后缀 00 + tResourceLand.setDkbm(tResourceLandService.selectTResourceLandAutoGenCode(dept.getOrgCode() + "00")); + }else{ // 14 组级 + tResourceLand.setDkbm(tResourceLandService.selectTResourceLandAutoGenCode(dept.getOrgCode())); + } + } return toAjax(tResourceLandService.insertTResourceLand(tResourceLand)); } /** * 修改地块属性 */ - @PreAuthorize("@ss.hasPermi('business:resourceLand:edit')") + @PreAuthorize("@ss.hasPermi('resource:land:edit')") @Log(title = "地块属性", businessType = BusinessType.UPDATE) @PostMapping("/update") public AjaxResult edit(@RequestBody TResourceLand tResourceLand) @@ -134,18 +186,18 @@ public class TResourceLandController extends BaseController /** * 删除地块属性 */ - @PreAuthorize("@ss.hasPermi('business:resourceLand:remove')") + @PreAuthorize("@ss.hasPermi('resource:land:remove')") @Log(title = "地块属性", businessType = BusinessType.DELETE) - @GetMapping("/delete/{DKBMs}") - public AjaxResult remove(@PathVariable String[] DKBMs) + @GetMapping("/delete/{fids}") + public AjaxResult remove(@PathVariable Long[] fids) { - return toAjax(tResourceLandService.deleteTResourceLandByDKBMs(DKBMs)); + return toAjax(tResourceLandService.deleteTResourceLandByFids(fids)); } /** * 打印地块属性 */ - @PreAuthorize("@ss.hasPermi('business:resourceLand:print')") + @PreAuthorize("@ss.hasPermi('resource:land:print')") @Log(title = "地块属性", businessType = BusinessType.PRINT) @GetMapping("/print") public void printPdf(TResourceLand tResourceLand, HttpServletResponse response) throws Exception{ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TResourceOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java similarity index 71% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TResourceOperationController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java index 950871c..c791c0f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TResourceOperationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java @@ -1,51 +1,57 @@ -package com.ruoyi.web.controller.business; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; +package com.ruoyi.web.controller.resource; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.pdf.PageSet; import com.ruoyi.common.core.domain.pdf.PdfProperty; import com.ruoyi.common.core.domain.pdf.ShoulderItem; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.pdf.PdfUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.translation.TranslateUtils; +import com.ruoyi.resource.domain.TResourceLand; +import com.ruoyi.resource.domain.TResourceOperation; +import com.ruoyi.resource.domain.TResourceVo; +import com.ruoyi.resource.service.ITResourceLandService; +import com.ruoyi.resource.service.ITResourceOperationService; +import com.ruoyi.system.service.ISysDeptService; import org.apache.commons.compress.utils.Lists; -import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.business.domain.TResourceOperation; -import com.ruoyi.business.service.ITResourceOperationService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** * 地块经营Controller * - * @author yfd + * @author rongxin * @date 2025-09-05 */ @RestController -@RequestMapping("/business/resourceOperation") +@RequestMapping("/resource/operation") public class TResourceOperationController extends BaseController { @Autowired private ITResourceOperationService tResourceOperationService; + @Autowired + private ITResourceLandService tResourceLandService; + + @Autowired + private ISysDeptService deptService; + + /** * 查询地块经营列表 */ - @PreAuthorize("@ss.hasPermi('business:resourceOperation:list')") + @PreAuthorize("@ss.hasPermi('resource:operation:list')") @GetMapping("/list") public TableDataInfo list(TResourceOperation tResourceOperation) { @@ -58,7 +64,7 @@ public class TResourceOperationController extends BaseController /** * 导出地块经营列表 */ - @PreAuthorize("@ss.hasPermi('business:resourceOperation:export')") + @PreAuthorize("@ss.hasPermi('resource:operation:export')") @Log(title = "地块经营", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TResourceOperation tResourceOperation) @@ -81,7 +87,7 @@ public class TResourceOperationController extends BaseController * 地块经营导入 */ @Log(title = "地块经营", businessType = BusinessType.IMPORT) - @PreAuthorize("@ss.hasPermi('business:resourceOperation:import')") + @PreAuthorize("@ss.hasPermi('resource:operation:import')") @PostMapping("/importData") public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception { ExcelUtil util = new ExcelUtil(TResourceOperation.class); @@ -93,7 +99,7 @@ public class TResourceOperationController extends BaseController /** * 获取地块经营详细信息 */ - @PreAuthorize("@ss.hasPermi('business:resourceOperation:query')") + @PreAuthorize("@ss.hasPermi('resource:operation:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -111,21 +117,56 @@ public class TResourceOperationController extends BaseController return success(detail); } + /** + * 获取地块经营详细信息,翻译字典,合并属性及经营数据 + */ + @GetMapping(value = "/detailByDkbm/{dkbm}") + public AjaxResult detailByDkbm(@PathVariable("dkbm") String dkbm) + { + TResourceVo resource = new TResourceVo(); + + TResourceLand land = tResourceLandService.selectTResourceLandByDkbm(dkbm); + + BeanUtils.copyProperties(land, resource); + + TResourceOperation operation = tResourceOperationService.selectTResourceOperationByDkbm(dkbm); + + resource.setJymj(operation.getJymj()); + resource.setJyfs(operation.getJyfs()); + resource.setJydxmc(operation.getJydxmc()); + resource.setJykssj(operation.getJykssj()); + resource.setJyjssj(operation.getJyjssj()); + resource.setCbje(operation.getCbje()); + resource.setBz(operation.getBz()); + resource.setDkImg(operation.getDkImg()); + resource.setSurveyStatus(operation.getSurveyStatus()); + + TranslateUtils.translate(resource, false); + return success(resource); + } + + /** * 新增地块经营 */ - @PreAuthorize("@ss.hasPermi('business:resourceOperation:add')") + @PreAuthorize("@ss.hasPermi('resource:operation:add')") @Log(title = "地块经营", businessType = BusinessType.INSERT) @PostMapping("/add") public AjaxResult add(@RequestBody TResourceOperation tResourceOperation) { + SysDept dept = deptService.selectDeptById(tResourceOperation.getDeptId()); + if(dept.getOrgCode().length() < 12){ + return error("非村、组级行政区划，不允许添加地块！"); + } + + tResourceOperation.setImportCode(dept.getImportCode()); return toAjax(tResourceOperationService.insertTResourceOperation(tResourceOperation)); } /** * 修改地块经营 */ - @PreAuthorize("@ss.hasPermi('business:resourceOperation:edit')") + @PreAuthorize("@ss.hasPermi('resource:operation:edit')") @Log(title = "地块经营", businessType = BusinessType.UPDATE) @PostMapping("/update") public AjaxResult edit(@RequestBody TResourceOperation tResourceOperation) @@ -136,7 +177,7 @@ public class TResourceOperationController extends BaseController /** * 删除地块经营 */ - @PreAuthorize("@ss.hasPermi('business:resourceOperation:remove')") + @PreAuthorize("@ss.hasPermi('resource:operation:remove')") @Log(title = "地块经营", businessType = BusinessType.DELETE) @GetMapping("/delete/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -147,7 +188,7 @@ public class TResourceOperationController extends BaseController /** * 打印地块经营 */ - @PreAuthorize("@ss.hasPermi('business:resourceOperation:print')") + @PreAuthorize("@ss.hasPermi('resource:operation:print')") @Log(title = "地块经营", businessType = BusinessType.PRINT) @GetMapping("/print") public void printPdf(TResourceOperation tResourceOperation, HttpServletResponse response) throws Exception{ diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 9864822..22d3b04 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.0.119:3318/rongxin_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3318/rongxin_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: nsbjgkwh password: ns61GK32x% # 从库数据源 diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/TResourceLand.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/TResourceLand.java deleted file mode 100644 index 1236208..0000000 --- a/ruoyi-business/src/main/java/com/ruoyi/business/domain/TResourceLand.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.ruoyi.business.domain; - -import java.math.BigDecimal; - -import lombok.Data; -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; - -/** - * 地块属性对象 t_resource_land - * - * @author yfd - * @date 2025-09-05 - */ -@Data -public class TResourceLand extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** fid */ - @Excel(name = "fid ") - private Long fid; - - /** 标识码 */ - @Excel(name = "标识码") - private Integer BSM; - - /** 要素代码 */ - @Excel(name = "要素代码") - private String YSDM; - - /** 地块代码 ：14位行政区划代码（村级12位+‘00’，组级14位） + 5位顺序码 */ - @Excel(name = "地块代码") - private String DKBM; - - /** 地块名称 */ - @Excel(name = "地块名称") - private String DKMC; - - /** 所有权性质 字典 ownership_type */ - @Excel(name = "所有权性质",dictType = "ownership_type") - private String SYQXZ; - - /** 地块类别 字典 land_type */ - @Excel(name = "地块类别",dictType = "land_type") - private String DKLB; - - /** 土地利用类型 字典 land_use */ - @Excel(name = "土地利用类型",dictType = "land_use") - private String TDLYLX; - - /** 地力等级 字典 land_grade_type */ - @Excel(name = "地力等级",dictType = "land_grade_type") - private String DLDJ; - - /** 土地用途 字典 land_use_type */ - @Excel(name = "土地用途",dictType = "land_use_type") - private String TDYT; - - /** 是否基本农田 字典 sys_yes_no */ - @Excel(name = "是否基本农田",dictType = "sys_yes_no") - private String SFJBNT; - - /** 地块东至 */ - @Excel(name = "地块东至") - private String DKDZ; - - /** 地块西至 */ - @Excel(name = "地块西至") - private String DKXZ; - - /** 地块南至 */ - @Excel(name = "地块南至") - private String DKNZ; - - /** 地块北至 */ - @Excel(name = "地块北至") - private String DKBZ; - - /** 备注信息 */ - @Excel(name = "备注信息") - private String DKBZXX; - - /** 指界人姓名 */ - @Excel(name = "指界人姓名") - private String ZJRXM; - - /** 空间坐标 */ - @Excel(name = "空间坐标") - private String KJZB; - - /** 实测面积( ㎡) */ - @Excel(name = "实测面积( ㎡)") - private BigDecimal SCMJ; - - /** 实测面积（亩） */ - @Excel(name = "实测面积", readConverterExp = "亩=") - private BigDecimal SCMJM; - - /** 地块轮廓坐标 */ - @Excel(name = "地块轮廓坐标") - private String theGeom; - - /** 调查状态 字典 survey_status */ - @Excel(name = "调查状态",dictType = "survey_status") - private String surveyStatus; - - /** 部门级联代码 */ - @Excel(name = "部门级联代码") - private String importCode; - - /** 区域位置名称 */ - @Excel(name = "区域位置名称") - private String deptName; - - /** 行政区划代码 */ - private String orgCode; - -} diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/TResourceOperation.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/TResourceOperation.java deleted file mode 100644 index b442a6d..0000000 --- a/ruoyi-business/src/main/java/com/ruoyi/business/domain/TResourceOperation.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.ruoyi.business.domain; - -import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -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; - -/** - * 地块经营对象 t_resource_operation - * - * @author yfd - * @date 2025-09-05 - */ -@Data -public class TResourceOperation extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** id */ - private Long id; - - /** 地块代码 */ - @Excel(name = "地块代码") - private String dkbm; - - /** 地块名称 */ - @Excel(name = "地块名称") - private String dkmc; - - /** 地块东至 */ - @Excel(name = "地块东至") - private String dkdz; - - /** 地块西至 */ - @Excel(name = "地块西至") - private String dkxz; - - /** 地块南至 */ - @Excel(name = "地块南至") - private String dknz; - - /** 地块北至 */ - @Excel(name = "地块北至") - private String dkbz; - - /** 经营面积(亩) */ - @Excel(name = "经营面积(亩)") - private BigDecimal jymj; - - /** 经营方式 */ - @Excel(name = "经营方式") - private String jyfs; - - /** 经营对象名称 */ - @Excel(name = "经营对象名称") - private String jydxmc; - - /** 经营开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "经营开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date jykssj; - - /** 经营结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "经营结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date jyjssj; - - /** 承包金额(元) */ - @Excel(name = "承包金额(元)") - private BigDecimal cbje; - - /** 备注 */ - @Excel(name = "备注") - private String bz; - - /** 实物图 */ - @Excel(name = "实物图") - private String dkImg; - - /** 调查状态 字典 survey_status */ - @Excel(name = "调查状态 字典 survey_status") - private String surveyStatus; - - /** 部门级联代码 */ - @Excel(name = "部门级联代码") - private String importCode; - - /** 区域位置名称 */ - @Excel(name = "区域位置名称") - private String deptName; -} diff --git a/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceLand.java b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceLand.java new file mode 100644 index 0000000..5178172 --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceLand.java @@ -0,0 +1,385 @@ +package com.ruoyi.resource.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 地块属性对象 t_resource_land + * + * @author rongxin + * @date 2025-09-05 + */ +public class TResourceLand extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** fid */ + private Long fid; + + /** 部门级联代码 */ + @Excel(name = "部门级联代码") + private String importCode; + + /** 区域位置名称 */ + @Excel(name = "区域位置名称") + private String deptName; + + /** 标识码 */ + @Excel(name = "标识码 */") + private Integer bsm; + + /** 要素代码 */ + @Excel(name = "要素代码") + private String ysdm; + + /** 地块代码 */ + @Excel(name = "地块代码") + private String dkbm; + + /** 地块名称 */ + @Excel(name = "地块名称") + private String dkmc; + + /** 所有权性质 */ + @Excel(name = "所有权性质", dictType = "ownership_type") + private String syqxz; + + /** 地块类别 */ + @Excel(name = "地块类别", dictType = "land_type") + private String dklb; + + /** 土地利用类型 */ + @Excel(name = "土地利用类型", dictType = "land_use") + private String tdlylx; + + /** 地力等级 */ + @Excel(name = "地力等级", dictType = "land_grade_type") + private String dldj; + + /** 土地用途 */ + @Excel(name = "土地用途", dictType = "land_use_type") + private String tdyt; + + /** 是否基本农田 */ + @Excel(name = "是否基本农田", dictType = "is_common") + private String sfjbnt; + + /** 地块东至 */ + @Excel(name = "地块东至") + private String dkdz; + + /** 地块西至 */ + @Excel(name = "地块西至") + private String dkxz; + + /** 地块南至 */ + @Excel(name = "地块南至") + private String dknz; + + /** 地块北至 */ + @Excel(name = "地块北至") + private String dkbz; + + /** 备注信息 */ + @Excel(name = "备注信息") + private String dkbzxx; + + /** 指界人姓名 */ + @Excel(name = "指界人姓名") + private String zjrxm; + + /** 实测面积( ㎡) */ + @Excel(name = "实测面积(㎡)") + private BigDecimal scmj; + + /** 实测面积（亩） */ + @Excel(name = "实测面积(亩)") + private BigDecimal scmjm; + + /** 地块矢量 */ + private String theGeom; + + /** 调查状态 */ + @Excel(name = "调查状态", dictType = "survey_status") + private String surveyStatus; + + + + /** 行政区划id */ + private Long deptId; + + public void setFid(Long fid) + { + this.fid = fid; + } + + public Long getFid() + { + return fid; + } + + public void setBsm(Integer bsm) + { + this.bsm = bsm; + } + + public Integer getBsm() + { + return bsm; + } + + public void setYsdm(String ysdm) + { + this.ysdm = ysdm; + } + + public String getYsdm() + { + return ysdm; + } + + public void setDkbm(String dkbm) + { + this.dkbm = dkbm; + } + + public String getDkbm() + { + return dkbm; + } + + public void setDkmc(String dkmc) + { + this.dkmc = dkmc; + } + + public String getDkmc() + { + return dkmc; + } + + public void setSyqxz(String syqxz) + { + this.syqxz = syqxz; + } + + public String getSyqxz() + { + return syqxz; + } + + public void setDklb(String dklb) + { + this.dklb = dklb; + } + + public String getDklb() + { + return dklb; + } + + public void setTdlylx(String tdlylx) + { + this.tdlylx = tdlylx; + } + + public String getTdlylx() + { + return tdlylx; + } + + public void setDldj(String dldj) + { + this.dldj = dldj; + } + + public String getDldj() + { + return dldj; + } + + public void setTdyt(String tdyt) + { + this.tdyt = tdyt; + } + + public String getTdyt() + { + return tdyt; + } + + public void setSfjbnt(String sfjbnt) + { + this.sfjbnt = sfjbnt; + } + + public String getSfjbnt() + { + return sfjbnt; + } + + public void setDkdz(String dkdz) + { + this.dkdz = dkdz; + } + + public String getDkdz() + { + return dkdz; + } + + public void setDkxz(String dkxz) + { + this.dkxz = dkxz; + } + + public String getDkxz() + { + return dkxz; + } + + public void setDknz(String dknz) + { + this.dknz = dknz; + } + + public String getDknz() + { + return dknz; + } + + public void setDkbz(String dkbz) + { + this.dkbz = dkbz; + } + + public String getDkbz() + { + return dkbz; + } + + public void setDkbzxx(String dkbzxx) + { + this.dkbzxx = dkbzxx; + } + + public String getDkbzxx() + { + return dkbzxx; + } + + public void setZjrxm(String zjrxm) + { + this.zjrxm = zjrxm; + } + + public String getZjrxm() + { + return zjrxm; + } + + public void setScmj(BigDecimal scmj) + { + this.scmj = scmj; + } + + public BigDecimal getScmj() + { + return scmj; + } + + public void setScmjm(BigDecimal scmjm) + { + this.scmjm = scmjm; + } + + public BigDecimal getScmjm() + { + return scmjm; + } + + public void setTheGeom(String theGeom) + { + this.theGeom = theGeom; + } + + public String getTheGeom() + { + return theGeom; + } + + public void setSurveyStatus(String surveyStatus) + { + this.surveyStatus = surveyStatus; + } + + public String getSurveyStatus() + { + return surveyStatus; + } + + public void setImportCode(String importCode) + { + this.importCode = importCode; + } + + public String getImportCode() + { + return importCode; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("fid", getFid()) + .append("bsm", getBsm()) + .append("ysdm", getYsdm()) + .append("dkbm", getDkbm()) + .append("dkmc", getDkmc()) + .append("syqxz", getSyqxz()) + .append("dklb", getDklb()) + .append("tdlylx", getTdlylx()) + .append("dldj", getDldj()) + .append("tdyt", getTdyt()) + .append("sfjbnt", getSfjbnt()) + .append("dkdz", getDkdz()) + .append("dkxz", getDkxz()) + .append("dknz", getDknz()) + .append("dkbz", getDkbz()) + .append("dkbzxx", getDkbzxx()) + .append("zjrxm", getZjrxm()) + .append("scmj", getScmj()) + .append("scmjm", getScmjm()) + .append("theGeom", getTheGeom()) + .append("surveyStatus", getSurveyStatus()) + .append("importCode", getImportCode()) + .append("deptName", getDeptName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceOperation.java b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceOperation.java new file mode 100644 index 0000000..074ac7f --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceOperation.java @@ -0,0 +1,310 @@ +package com.ruoyi.resource.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 地块经营对象 t_resource_operation + * + * @author rongxin + * @date 2025-09-05 + */ +public class TResourceOperation extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 部门级联代码 */ + @Excel(name = "部门级联代码") + private String importCode; + + /** 区域位置名称 */ + @Excel(name = "区域位置名称") + private String deptName; + + /** 地块代码 */ + @Excel(name = "地块代码") + private String dkbm; + + /** 地块名称 */ + @Excel(name = "地块名称") + private String dkmc; + + /** 地块东至 */ + @Excel(name = "地块东至") + private String dkdz; + + /** 地块西至 */ + @Excel(name = "地块西至") + private String dkxz; + + /** 地块南至 */ + @Excel(name = "地块南至") + private String dknz; + + /** 地块北至 */ + @Excel(name = "地块北至") + private String dkbz; + + /** 经营面积(亩) */ + @Excel(name = "经营面积(亩)") + private BigDecimal jymj; + + /** 经营方式 */ + @Excel(name = "经营方式") + private String jyfs; + + /** 经营对象名称 */ + @Excel(name = "经营对象名称") + private String jydxmc; + + /** 经营开始时间 */ + @Excel(name = "经营开始时间") + private String jykssj; + + /** 经营结束时间 */ + @Excel(name = "经营结束时间") + private String jyjssj; + + /** 承包金额(元) */ + @Excel(name = "承包金额(元)") + private BigDecimal cbje; + + /** 备注 */ + @Excel(name = "备注") + private String bz; + + /** 实物图 */ + private String dkImg; + + /** 调查状态 */ + @Excel(name = "调查状态", dictType = "survey_status") + private String surveyStatus; + + + + /** 行政区划id */ + private Long deptId; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setDkbm(String dkbm) + { + this.dkbm = dkbm; + } + + public String getDkbm() + { + return dkbm; + } + + public void setDkmc(String dkmc) + { + this.dkmc = dkmc; + } + + public String getDkmc() + { + return dkmc; + } + + public void setDkdz(String dkdz) + { + this.dkdz = dkdz; + } + + public String getDkdz() + { + return dkdz; + } + + public void setDkxz(String dkxz) + { + this.dkxz = dkxz; + } + + public String getDkxz() + { + return dkxz; + } + + public void setDknz(String dknz) + { + this.dknz = dknz; + } + + public String getDknz() + { + return dknz; + } + + public void setDkbz(String dkbz) + { + this.dkbz = dkbz; + } + + public String getDkbz() + { + return dkbz; + } + + public void setJymj(BigDecimal jymj) + { + this.jymj = jymj; + } + + public BigDecimal getJymj() + { + return jymj; + } + + public void setJyfs(String jyfs) + { + this.jyfs = jyfs; + } + + public String getJyfs() + { + return jyfs; + } + + public void setJydxmc(String jydxmc) + { + this.jydxmc = jydxmc; + } + + public String getJydxmc() + { + return jydxmc; + } + + public void setJykssj(String jykssj) + { + this.jykssj = jykssj; + } + + public String getJykssj() + { + return jykssj; + } + + public void setJyjssj(String jyjssj) + { + this.jyjssj = jyjssj; + } + + public String getJyjssj() + { + return jyjssj; + } + + public void setCbje(BigDecimal cbje) + { + this.cbje = cbje; + } + + public BigDecimal getCbje() + { + return cbje; + } + + public void setBz(String bz) + { + this.bz = bz; + } + + public String getBz() + { + return bz; + } + + public void setDkImg(String dkImg) + { + this.dkImg = dkImg; + } + + public String getDkImg() + { + return dkImg; + } + + public void setSurveyStatus(String surveyStatus) + { + this.surveyStatus = surveyStatus; + } + + public String getSurveyStatus() + { + return surveyStatus; + } + + public void setImportCode(String importCode) + { + this.importCode = importCode; + } + + public String getImportCode() + { + return importCode; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("dkbm", getDkbm()) + .append("dkmc", getDkmc()) + .append("dkdz", getDkdz()) + .append("dkxz", getDkxz()) + .append("dknz", getDknz()) + .append("dkbz", getDkbz()) + .append("jymj", getJymj()) + .append("jyfs", getJyfs()) + .append("jydxmc", getJydxmc()) + .append("jykssj", getJykssj()) + .append("jyjssj", getJyjssj()) + .append("cbje", getCbje()) + .append("bz", getBz()) + .append("dkImg", getDkImg()) + .append("surveyStatus", getSurveyStatus()) + .append("importCode", getImportCode()) + .append("deptName", getDeptName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java new file mode 100644 index 0000000..4154e1e --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java @@ -0,0 +1,138 @@ +package com.ruoyi.resource.domain; + +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 地块属性对象 t_resource_land + * + * @author rongxin + * @date 2025-09-05 + */ +@Data +public class TResourceVo { + private static final long serialVersionUID = 1L; + + + + /** 区域位置名称 */ + @Excel(name = "区域位置名称") + private String deptName; + + /** 标识码 */ + @Excel(name = "标识码 */") + private Integer bsm; + + /** 要素代码 */ + @Excel(name = "要素代码") + private String ysdm; + + /** 地块代码 */ + @Excel(name = "地块代码") + private String dkbm; + + /** 地块名称 */ + @Excel(name = "地块名称") + private String dkmc; + + /** 所有权性质 */ + @Excel(name = "所有权性质", dictType = "ownership_type") + private String syqxz; + + /** 地块类别 */ + @Excel(name = "地块类别", dictType = "land_type") + private String dklb; + + /** 土地利用类型 */ + @Excel(name = "土地利用类型", dictType = "land_use") + private String tdlylx; + + /** 地力等级 */ + @Excel(name = "地力等级", dictType = "land_grade_type") + private String dldj; + + /** 土地用途 */ + @Excel(name = "土地用途", dictType = "land_use_type") + private String tdyt; + + /** 是否基本农田 */ + @Excel(name = "是否基本农田", dictType = "is_common") + private String sfjbnt; + + /** 地块东至 */ + @Excel(name = "地块东至") + private String dkdz; + + /** 地块西至 */ + @Excel(name = "地块西至") + private String dkxz; + + /** 地块南至 */ + @Excel(name = "地块南至") + private String dknz; + + /** 地块北至 */ + @Excel(name = "地块北至") + private String dkbz; + + /** 备注信息 */ + @Excel(name = "备注信息") + private String dkbzxx; + + /** 指界人姓名 */ + @Excel(name = "指界人姓名") + private String zjrxm; + + /** 实测面积( ㎡) */ + @Excel(name = "实测面积( ㎡)") + private BigDecimal scmj; + + /** 实测面积（亩） */ + @Excel(name = "实测面积（亩）") + private BigDecimal scmjm; + + + // ------------------------------ + + + /** 经营面积(亩) */ + @Excel(name = "经营面积(亩)") + private BigDecimal jymj; + + /** 经营方式 */ + @Excel(name = "经营方式") + private String jyfs; + + /** 经营对象名称 */ + @Excel(name = "经营对象名称") + private String jydxmc; + + /** 经营开始时间 */ + @Excel(name = "经营开始时间") + private String jykssj; + + /** 经营结束时间 */ + @Excel(name = "经营结束时间") + private String jyjssj; + + /** 承包金额(元) */ + @Excel(name = "承包金额(元)") + private BigDecimal cbje; + + /** 备注 */ + @Excel(name = "备注") + private String bz; + + /** 实物图 */ + private String dkImg; + + /** 调查状态 */ + @Excel(name = "调查状态", dictType = "survey_status") + private String surveyStatus; + + + + +} diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TResourceLandMapper.java b/ruoyi-business/src/main/java/com/ruoyi/resource/mapper/TResourceLandMapper.java similarity index 68% rename from ruoyi-business/src/main/java/com/ruoyi/business/mapper/TResourceLandMapper.java rename to ruoyi-business/src/main/java/com/ruoyi/resource/mapper/TResourceLandMapper.java index 7e607cf..6862d50 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TResourceLandMapper.java +++ b/ruoyi-business/src/main/java/com/ruoyi/resource/mapper/TResourceLandMapper.java @@ -1,12 +1,13 @@ -package com.ruoyi.business.mapper; +package com.ruoyi.resource.mapper; + +import com.ruoyi.resource.domain.TResourceLand; import java.util.List; -import com.ruoyi.business.domain.TResourceLand; /** * 地块属性Mapper接口 * - * @author yfd + * @author rongxin * @date 2025-09-05 */ public interface TResourceLandMapper @@ -14,10 +15,14 @@ public interface TResourceLandMapper /** * 查询地块属性 * - * @param DKBM 地块属性主键 + * @param fid 地块属性主键 * @return 地块属性 */ - public TResourceLand selectTResourceLandByDKBM(String DKBM); + public TResourceLand selectTResourceLandByFid(Long fid); + + public TResourceLand selectTResourceLandByDkbm(String dkbm); + + public String selectTResourceLandAutoGenCode(String orgCode); /** * 查询地块属性列表 @@ -62,24 +67,16 @@ public interface TResourceLandMapper /** * 删除地块属性 * - * @param DKBM 地块属性主键 + * @param fid 地块属性主键 * @return 结果 */ - public int deleteTResourceLandByDKBM(String DKBM); + public int deleteTResourceLandByFid(Long fid); /** * 批量删除地块属性 * - * @param DKBMs 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteTResourceLandByDKBMs(String[] DKBMs); - - /** - * 删除地块属性 - * - * @param DKBM 地块属性主键 + * @param fids 需要删除的数据主键集合 * @return 结果 */ - public String selectTResourceLandMaxDKBM(String orgCode); + public int deleteTResourceLandByFids(Long[] fids); } diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TResourceOperationMapper.java b/ruoyi-business/src/main/java/com/ruoyi/resource/mapper/TResourceOperationMapper.java similarity index 90% rename from ruoyi-business/src/main/java/com/ruoyi/business/mapper/TResourceOperationMapper.java rename to ruoyi-business/src/main/java/com/ruoyi/resource/mapper/TResourceOperationMapper.java index 63ed637..199c596 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TResourceOperationMapper.java +++ b/ruoyi-business/src/main/java/com/ruoyi/resource/mapper/TResourceOperationMapper.java @@ -1,12 +1,13 @@ -package com.ruoyi.business.mapper; +package com.ruoyi.resource.mapper; + +import com.ruoyi.resource.domain.TResourceOperation; import java.util.List; -import com.ruoyi.business.domain.TResourceOperation; /** * 地块经营Mapper接口 * - * @author yfd + * @author rongxin * @date 2025-09-05 */ public interface TResourceOperationMapper @@ -19,6 +20,8 @@ public interface TResourceOperationMapper */ public TResourceOperation selectTResourceOperationById(Long id); + public TResourceOperation selectTResourceOperationByDkbm(String dkbm); + /** * 查询地块经营列表 * diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/ITResourceLandService.java b/ruoyi-business/src/main/java/com/ruoyi/resource/service/ITResourceLandService.java similarity index 75% rename from ruoyi-business/src/main/java/com/ruoyi/business/service/ITResourceLandService.java rename to ruoyi-business/src/main/java/com/ruoyi/resource/service/ITResourceLandService.java index cd5d8ea..2fceec3 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/ITResourceLandService.java +++ b/ruoyi-business/src/main/java/com/ruoyi/resource/service/ITResourceLandService.java @@ -1,12 +1,13 @@ -package com.ruoyi.business.service; +package com.ruoyi.resource.service; + +import com.ruoyi.resource.domain.TResourceLand; import java.util.List; -import com.ruoyi.business.domain.TResourceLand; /** * 地块属性Service接口 * - * @author yfd + * @author rongxin * @date 2025-09-05 */ public interface ITResourceLandService @@ -14,10 +15,14 @@ public interface ITResourceLandService /** * 查询地块属性 * - * @param DKBM 地块属性主键 + * @param fid 地块属性主键 * @return 地块属性 */ - public TResourceLand selectTResourceLandByDKBM(String DKBM); + public TResourceLand selectTResourceLandByFid(Long fid); + + public TResourceLand selectTResourceLandByDkbm(String dkbm); + + public String selectTResourceLandAutoGenCode(String orgCode); /** * 查询地块属性列表 @@ -72,16 +77,16 @@ public interface ITResourceLandService /** * 批量删除地块属性 * - * @param DKBMs 需要删除的地块属性主键集合 + * @param fids 需要删除的地块属性主键集合 * @return 结果 */ - public int deleteTResourceLandByDKBMs(String[] DKBMs); + public int deleteTResourceLandByFids(Long[] fids); /** * 删除地块属性信息 * - * @param DKBM 地块属性主键 + * @param fid 地块属性主键 * @return 结果 */ - public int deleteTResourceLandByDKBM(String DKBM); + public int deleteTResourceLandByFid(Long fid); } diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/ITResourceOperationService.java b/ruoyi-business/src/main/java/com/ruoyi/resource/service/ITResourceOperationService.java similarity index 91% rename from ruoyi-business/src/main/java/com/ruoyi/business/service/ITResourceOperationService.java rename to ruoyi-business/src/main/java/com/ruoyi/resource/service/ITResourceOperationService.java index 4ada1d9..ef0be07 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/ITResourceOperationService.java +++ b/ruoyi-business/src/main/java/com/ruoyi/resource/service/ITResourceOperationService.java @@ -1,12 +1,13 @@ -package com.ruoyi.business.service; +package com.ruoyi.resource.service; + +import com.ruoyi.resource.domain.TResourceOperation; import java.util.List; -import com.ruoyi.business.domain.TResourceOperation; /** * 地块经营Service接口 * - * @author yfd + * @author rongxin * @date 2025-09-05 */ public interface ITResourceOperationService @@ -19,6 +20,8 @@ public interface ITResourceOperationService */ public TResourceOperation selectTResourceOperationById(Long id); + public TResourceOperation selectTResourceOperationByDkbm(String dkbm); + /** * 查询地块经营列表 * diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TResourceLandServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/resource/service/impl/TResourceLandServiceImpl.java similarity index 76% rename from ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TResourceLandServiceImpl.java rename to ruoyi-business/src/main/java/com/ruoyi/resource/service/impl/TResourceLandServiceImpl.java index 38a24cb..294a38e 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TResourceLandServiceImpl.java +++ b/ruoyi-business/src/main/java/com/ruoyi/resource/service/impl/TResourceLandServiceImpl.java @@ -1,25 +1,26 @@ -package com.ruoyi.business.service.impl; - -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +package com.ruoyi.resource.service.impl; +import cn.hutool.core.util.StrUtil; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.resource.domain.TResourceLand; +import com.ruoyi.resource.mapper.TResourceLandMapper; +import com.ruoyi.resource.service.ITResourceLandService; import org.apache.commons.collections4.ListUtils; import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.business.mapper.TResourceLandMapper; -import com.ruoyi.business.domain.TResourceLand; -import com.ruoyi.business.service.ITResourceLandService; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * 地块属性Service业务层处理 * - * @author yfd + * @author rongxin * @date 2025-09-05 */ @Service @@ -31,13 +32,30 @@ public class TResourceLandServiceImpl implements ITResourceLandService /** * 查询地块属性 * - * @param DKBM 地块属性主键 + * @param fid 地块属性主键 * @return 地块属性 */ @Override - public TResourceLand selectTResourceLandByDKBM(String DKBM) + public TResourceLand selectTResourceLandByFid(Long fid) { - return tResourceLandMapper.selectTResourceLandByDKBM(DKBM); + return tResourceLandMapper.selectTResourceLandByFid(fid); + } + + @Override + public TResourceLand selectTResourceLandByDkbm(String dkbm) + { + return tResourceLandMapper.selectTResourceLandByDkbm(dkbm); + } + + @Override + public String selectTResourceLandAutoGenCode(String orgCode) { + final int MAX_CODE_LENGTH = 19; + String code = tResourceLandMapper.selectTResourceLandAutoGenCode(orgCode); + // 第一个时，取第一个编号 + if (StringUtils.isEmpty(code)){ + code = orgCode + StrUtil.padPre("1", MAX_CODE_LENGTH - orgCode.length(), "0"); + } + return code; } /** @@ -75,7 +93,7 @@ public class TResourceLandServiceImpl implements ITResourceLandService List updateList = Lists.newArrayList(); // 检验excel表中 【xxx】 是否存在重复，有重复的终止导入 - List repeatList = list.stream().collect(Collectors.groupingBy(TResourceLand::getDKBM, Collectors.counting())) + List repeatList = list.stream().collect(Collectors.groupingBy(TResourceLand::getDkbm, Collectors.counting())) .entrySet().stream().filter(e -> e.getValue() > 1).map(Map.Entry::getKey).collect(Collectors.toList()); if (StringUtils.isNotEmpty(repeatList)) { failureMsg.insert(0, "很抱歉，存在重复项，导入失败！共 " + repeatList.size() + " 个重复错错误如下："); @@ -92,13 +110,10 @@ public class TResourceLandServiceImpl implements ITResourceLandService List tResourceLandList = tResourceLandMapper.selectTResourceLandList(tResourceLand); for (TResourceLand item : list) { - // 一定层次上校验并跳过空白行，最好是不空的唯一字段 - if(StringUtils.isEmpty(item.getDKBM())){ - continue; - } + // 验证是否存在这个地块属性信息 - String id = item.getDKBM(); - List filters = tResourceLandList.stream().filter(a -> a.getDKBM().equals(id)).collect(Collectors.toList()); + String dkbm = item.getDkbm(); + List filters = tResourceLandList.stream().filter(a -> a.getDkbm().equals(dkbm)).collect(Collectors.toList()); if (StringUtils.isEmpty(filters)) { //不存在时，直接插入 item.setCreateBy(operName); item.setCreateTime(DateUtils.getNowDate()); @@ -108,7 +123,7 @@ public class TResourceLandServiceImpl implements ITResourceLandService if(isUpdateSupport){ //勾选则更新 item.setUpdateBy(operName); item.setUpdateTime(DateUtils.getNowDate()); - item.setDKBM(filters.get(0).getDKBM()); + item.setFid(filters.get(0).getFid()); updateList.add(item); successNum++; } @@ -129,26 +144,6 @@ public class TResourceLandServiceImpl implements ITResourceLandService return successMsg.toString(); } - /** - * 计算地块属性地块代码 - * - * @param tResourceLand 地块属性 - * @return 结果 - */ - public String calculatorDKBM(String orgCode) - { - String DKBM = orgCode; - if(StringUtils.isNotEmpty(DKBM) && DKBM.length() == 12){ - DKBM = DKBM + "00"; - } - String DKBMMax = tResourceLandMapper.selectTResourceLandMaxDKBM(DKBM); - if(StringUtils.isNotEmpty(DKBMMax)){ - DKBM = DKBM + (Integer.parseInt(DKBMMax.substring(DKBMMax.length() - 5)) + 1); - }else { - DKBM = DKBM + "00001"; - } - return DKBM; - } /** * 新增地块属性 @@ -159,7 +154,6 @@ public class TResourceLandServiceImpl implements ITResourceLandService @Override public int insertTResourceLand(TResourceLand tResourceLand) { - tResourceLand.setDKBM(calculatorDKBM(tResourceLand.getOrgCode())); tResourceLand.setCreateTime(DateUtils.getNowDate()); return tResourceLandMapper.insertTResourceLand(tResourceLand); } @@ -212,24 +206,24 @@ public class TResourceLandServiceImpl implements ITResourceLandService /** * 批量删除地块属性 * - * @param DKBMs 需要删除的地块属性主键 + * @param fids 需要删除的地块属性主键 * @return 结果 */ @Override - public int deleteTResourceLandByDKBMs(String[] DKBMs) + public int deleteTResourceLandByFids(Long[] fids) { - return tResourceLandMapper.deleteTResourceLandByDKBMs(DKBMs); + return tResourceLandMapper.deleteTResourceLandByFids(fids); } /** * 删除地块属性信息 * - * @param DKBM 地块属性主键 + * @param fid 地块属性主键 * @return 结果 */ @Override - public int deleteTResourceLandByDKBM(String DKBM) + public int deleteTResourceLandByFid(Long fid) { - return tResourceLandMapper.deleteTResourceLandByDKBM(DKBM); + return tResourceLandMapper.deleteTResourceLandByFid(fid); } } diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TResourceOperationServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/resource/service/impl/TResourceOperationServiceImpl.java similarity index 92% rename from ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TResourceOperationServiceImpl.java rename to ruoyi-business/src/main/java/com/ruoyi/resource/service/impl/TResourceOperationServiceImpl.java index 6ba43f9..840d45d 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TResourceOperationServiceImpl.java +++ b/ruoyi-business/src/main/java/com/ruoyi/resource/service/impl/TResourceOperationServiceImpl.java @@ -1,25 +1,25 @@ -package com.ruoyi.business.service.impl; - -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +package com.ruoyi.resource.service.impl; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.resource.domain.TResourceOperation; +import com.ruoyi.resource.mapper.TResourceOperationMapper; +import com.ruoyi.resource.service.ITResourceOperationService; import org.apache.commons.collections4.ListUtils; import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.business.mapper.TResourceOperationMapper; -import com.ruoyi.business.domain.TResourceOperation; -import com.ruoyi.business.service.ITResourceOperationService; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * 地块经营Service业务层处理 * - * @author yfd + * @author rongxin * @date 2025-09-05 */ @Service @@ -40,6 +40,11 @@ public class TResourceOperationServiceImpl implements ITResourceOperationService return tResourceOperationMapper.selectTResourceOperationById(id); } + @Override + public TResourceOperation selectTResourceOperationByDkbm(String dkbm) { + return tResourceOperationMapper.selectTResourceOperationByDkbm(dkbm); + } + /** * 查询地块经营列表 * @@ -92,13 +97,10 @@ public class TResourceOperationServiceImpl implements ITResourceOperationService List tResourceOperationList = tResourceOperationMapper.selectTResourceOperationList(tResourceOperation); for (TResourceOperation item : list) { - // 一定层次上校验并跳过空白行，最好是不空的唯一字段 - if(StringUtils.isEmpty(item.getDkbm())){ - continue; - } + // 验证是否存在这个地块经营信息 - Long id = item.getId(); - List filters = tResourceOperationList.stream().filter(a -> a.getId().equals(id)).collect(Collectors.toList()); + String dkbm = item.getDkbm(); + List filters = tResourceOperationList.stream().filter(a -> a.getDkbm().equals(dkbm)).collect(Collectors.toList()); if (StringUtils.isEmpty(filters)) { //不存在时，直接插入 item.setCreateBy(operName); item.setCreateTime(DateUtils.getNowDate()); diff --git a/ruoyi-business/src/main/resources/mapper/business/TResourceLandMapper.xml b/ruoyi-business/src/main/resources/mapper/business/TResourceLandMapper.xml deleted file mode 100644 index eebe62a..0000000 --- a/ruoyi-business/src/main/resources/mapper/business/TResourceLandMapper.xml +++ /dev/null @@ -1,293 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select fid, BSM, YSDM, DKBM, DKMC, SYQXZ, DKLB, TDLYLX, DLDJ, TDYT, SFJBNT, DKDZ, DKXZ, DKNZ, DKBZ, DKBZXX, ZJRXM, KJZB, SCMJ, SCMJM, the_geom, survey_status, import_code, dept_name, create_by, create_time, update_by, update_time from t_resource_land - - - - - - - - insert into t_resource_land - - fid, - BSM, - YSDM, - DKBM, - DKMC, - SYQXZ, - DKLB, - TDLYLX, - DLDJ, - TDYT, - SFJBNT, - DKDZ, - DKXZ, - DKNZ, - DKBZ, - DKBZXX, - ZJRXM, - KJZB, - SCMJ, - SCMJM, - the_geom, - survey_status, - import_code, - dept_name, - create_by, - create_time, - update_by, - update_time, - - - #{fid}, - #{BSM}, - #{YSDM}, - #{DKBM}, - #{DKMC}, - #{SYQXZ}, - #{DKLB}, - #{TDLYLX}, - #{DLDJ}, - #{TDYT}, - #{SFJBNT}, - #{DKDZ}, - #{DKXZ}, - #{DKNZ}, - #{DKBZ}, - #{DKBZXX}, - #{ZJRXM}, - #{KJZB}, - #{SCMJ}, - #{SCMJM}, - #{theGeom}, - #{surveyStatus}, - #{importCode}, - #{deptName}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - insert into t_resource_land - - fid, - BSM, - YSDM, - DKBM, - DKMC, - SYQXZ, - DKLB, - TDLYLX, - DLDJ, - TDYT, - SFJBNT, - DKDZ, - DKXZ, - DKNZ, - DKBZ, - DKBZXX, - ZJRXM, - KJZB, - SCMJ, - SCMJM, - the_geom, - survey_status, - import_code, - dept_name, - create_by, - create_time, - update_by, - update_time, - - values - - - #{item.fid}, - #{item.BSM}, - #{item.YSDM}, - #{item.DKBM}, - #{item.DKMC}, - #{item.SYQXZ}, - #{item.DKLB}, - #{item.TDLYLX}, - #{item.DLDJ}, - #{item.TDYT}, - #{item.SFJBNT}, - #{item.DKDZ}, - #{item.DKXZ}, - #{item.DKNZ}, - #{item.DKBZ}, - #{item.DKBZXX}, - #{item.ZJRXM}, - #{item.KJZB}, - #{item.SCMJ}, - #{item.SCMJM}, - #{item.theGeom}, - #{item.surveyStatus}, - #{item.importCode}, - #{item.deptName}, - #{item.createBy}, - #{item.createTime}, - #{item.updateBy}, - #{item.updateTime}, - - - - - - update t_resource_land - - fid = #{fid}, - BSM = #{BSM}, - YSDM = #{YSDM}, - DKMC = #{DKMC}, - SYQXZ = #{SYQXZ}, - DKLB = #{DKLB}, - TDLYLX = #{TDLYLX}, - DLDJ = #{DLDJ}, - TDYT = #{TDYT}, - SFJBNT = #{SFJBNT}, - DKDZ = #{DKDZ}, - DKXZ = #{DKXZ}, - DKNZ = #{DKNZ}, - DKBZ = #{DKBZ}, - DKBZXX = #{DKBZXX}, - ZJRXM = #{ZJRXM}, - KJZB = #{KJZB}, - SCMJ = #{SCMJ}, - SCMJM = #{SCMJM}, - the_geom = #{theGeom}, - survey_status = #{surveyStatus}, - import_code = #{importCode}, - dept_name = #{deptName}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where DKBM = #{DKBM} - - - - - - update t_resource_land - - fid = #{item.fid}, - BSM = #{item.BSM}, - YSDM = #{item.YSDM}, - DKMC = #{item.DKMC}, - SYQXZ = #{item.SYQXZ}, - DKLB = #{item.DKLB}, - TDLYLX = #{item.TDLYLX}, - DLDJ = #{item.DLDJ}, - TDYT = #{item.TDYT}, - SFJBNT = #{item.SFJBNT}, - DKDZ = #{item.DKDZ}, - DKXZ = #{item.DKXZ}, - DKNZ = #{item.DKNZ}, - DKBZ = #{item.DKBZ}, - DKBZXX = #{item.DKBZXX}, - ZJRXM = #{item.ZJRXM}, - KJZB = #{item.KJZB}, - SCMJ = #{item.SCMJ}, - SCMJM = #{item.SCMJM}, - the_geom = #{item.theGeom}, - survey_status = #{item.surveyStatus}, - import_code = #{item.importCode}, - dept_name = #{item.deptName}, - create_by = #{item.createBy}, - create_time = #{item.createTime}, - update_by = #{item.updateBy}, - update_time = #{item.updateTime}, - - where DKBM = #{item.DKBM} - - - - - delete from t_resource_land where DKBM = #{DKBM} - - - - delete from t_resource_land where DKBM in - - #{DKBM} - - - - - diff --git a/ruoyi-business/src/main/resources/mapper/resource/TResourceLandMapper.xml b/ruoyi-business/src/main/resources/mapper/resource/TResourceLandMapper.xml new file mode 100644 index 0000000..92d9f3c --- /dev/null +++ b/ruoyi-business/src/main/resources/mapper/resource/TResourceLandMapper.xml @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select fid, BSM, YSDM, DKBM, DKMC, SYQXZ, DKLB, TDLYLX, DLDJ, TDYT, SFJBNT, DKDZ, DKXZ, DKNZ, DKBZ, DKBZXX, ZJRXM, SCMJ, SCMJM, the_geom, survey_status, import_code, dept_name, create_by, create_time, update_by, update_time from t_resource_land + + + + + + + + + + + + insert into t_resource_land + + BSM, + YSDM, + DKBM, + DKMC, + SYQXZ, + DKLB, + TDLYLX, + DLDJ, + TDYT, + SFJBNT, + DKDZ, + DKXZ, + DKNZ, + DKBZ, + DKBZXX, + ZJRXM, + SCMJ, + SCMJM, + the_geom, + survey_status, + import_code, + dept_name, + create_by, + create_time, + update_by, + update_time, + + + #{bsm}, + #{ysdm}, + #{dkbm}, + #{dkmc}, + #{syqxz}, + #{dklb}, + #{tdlylx}, + #{dldj}, + #{tdyt}, + #{sfjbnt}, + #{dkdz}, + #{dkxz}, + #{dknz}, + #{dkbz}, + #{dkbzxx}, + #{zjrxm}, + #{scmj}, + #{scmjm}, + #{theGeom}, + #{surveyStatus}, + #{importCode}, + #{deptName}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + insert into t_resource_land + + BSM, + YSDM, + DKBM, + DKMC, + SYQXZ, + DKLB, + TDLYLX, + DLDJ, + TDYT, + SFJBNT, + DKDZ, + DKXZ, + DKNZ, + DKBZ, + DKBZXX, + ZJRXM, + SCMJ, + SCMJM, + the_geom, + survey_status, + import_code, + dept_name, + create_by, + create_time, + update_by, + update_time, + + values + + + #{item.bsm}, + #{item.ysdm}, + #{item.dkbm}, + #{item.dkmc}, + #{item.syqxz}, + #{item.dklb}, + #{item.tdlylx}, + #{item.dldj}, + #{item.tdyt}, + #{item.sfjbnt}, + #{item.dkdz}, + #{item.dkxz}, + #{item.dknz}, + #{item.dkbz}, + #{item.dkbzxx}, + #{item.zjrxm}, + #{item.scmj}, + #{item.scmjm}, + #{item.theGeom}, + #{item.surveyStatus}, + #{item.importCode}, + #{item.deptName}, + #{item.createBy}, + #{item.createTime}, + #{item.updateBy}, + #{item.updateTime}, + + + + + + update t_resource_land + + BSM = #{bsm}, + YSDM = #{ysdm}, + DKBM = #{dkbm}, + DKMC = #{dkmc}, + SYQXZ = #{syqxz}, + DKLB = #{dklb}, + TDLYLX = #{tdlylx}, + DLDJ = #{dldj}, + TDYT = #{tdyt}, + SFJBNT = #{sfjbnt}, + DKDZ = #{dkdz}, + DKXZ = #{dkxz}, + DKNZ = #{dknz}, + DKBZ = #{dkbz}, + DKBZXX = #{dkbzxx}, + ZJRXM = #{zjrxm}, + SCMJ = #{scmj}, + SCMJM = #{scmjm}, + the_geom = #{theGeom}, + survey_status = #{surveyStatus}, + import_code = #{importCode}, + dept_name = #{deptName}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where fid = #{fid} + + + + + + update t_resource_land + + BSM = #{item.bsm}, + YSDM = #{item.ysdm}, + DKBM = #{item.dkbm}, + DKMC = #{item.dkmc}, + SYQXZ = #{item.syqxz}, + DKLB = #{item.dklb}, + TDLYLX = #{item.tdlylx}, + DLDJ = #{item.dldj}, + TDYT = #{item.tdyt}, + SFJBNT = #{item.sfjbnt}, + DKDZ = #{item.dkdz}, + DKXZ = #{item.dkxz}, + DKNZ = #{item.dknz}, + DKBZ = #{item.dkbz}, + DKBZXX = #{item.dkbzxx}, + ZJRXM = #{item.zjrxm}, + SCMJ = #{item.scmj}, + SCMJM = #{item.scmjm}, + the_geom = #{item.theGeom}, + survey_status = #{item.surveyStatus}, + import_code = #{item.importCode}, + dept_name = #{item.deptName}, + create_by = #{item.createBy}, + create_time = #{item.createTime}, + update_by = #{item.updateBy}, + update_time = #{item.updateTime}, + + where fid = #{item.fid} + + + + + delete from t_resource_land where fid = #{fid} + + + + delete from t_resource_land where fid in + + #{fid} + + + diff --git a/ruoyi-business/src/main/resources/mapper/business/TResourceOperationMapper.xml b/ruoyi-business/src/main/resources/mapper/resource/TResourceOperationMapper.xml similarity index 81% rename from ruoyi-business/src/main/resources/mapper/business/TResourceOperationMapper.xml rename to ruoyi-business/src/main/resources/mapper/resource/TResourceOperationMapper.xml index 5e2d2ff..5287814 100644 --- a/ruoyi-business/src/main/resources/mapper/business/TResourceOperationMapper.xml +++ b/ruoyi-business/src/main/resources/mapper/resource/TResourceOperationMapper.xml @@ -2,7 +2,7 @@ - + @@ -38,21 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and dkbm = #{dkbm} and dkmc = #{dkmc} - and dkdz = #{dkdz} - and dkxz = #{dkxz} - and dknz = #{dknz} - and dkbz = #{dkbz} - and jymj = #{jymj} - and jyfs = #{jyfs} - and jydxmc = #{jydxmc} - and jykssj = #{jykssj} - and jyjssj = #{jyjssj} - and cbje = #{cbje} - and bz = #{bz} - and dk_img = #{dkImg} and survey_status = #{surveyStatus} - and import_code = #{importCode} - and dept_name like concat('%', #{deptName}, '%') + and import_code like concat('%', #{importCode}, '%') @@ -61,20 +48,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + insert into t_resource_operation - dkbm, + dkbm, dkmc, dkdz, dkxz, dknz, dkbz, jymj, - jyfs, - jydxmc, - jykssj, - jyjssj, + jyfs, + jydxmc, + jykssj, + jyjssj, cbje, bz, dk_img, @@ -87,17 +79,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, - #{dkbm}, + #{dkbm}, #{dkmc}, #{dkdz}, #{dkxz}, #{dknz}, #{dkbz}, #{jymj}, - #{jyfs}, - #{jydxmc}, - #{jykssj}, - #{jyjssj}, + #{jyfs}, + #{jydxmc}, + #{jykssj}, + #{jyjssj}, #{cbje}, #{bz}, #{dkImg}, @@ -167,17 +159,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update t_resource_operation - dkbm = #{dkbm}, + dkbm = #{dkbm}, dkmc = #{dkmc}, dkdz = #{dkdz}, dkxz = #{dkxz}, dknz = #{dknz}, dkbz = #{dkbz}, jymj = #{jymj}, - jyfs = #{jyfs}, - jydxmc = #{jydxmc}, - jykssj = #{jykssj}, - jyjssj = #{jyjssj}, + jyfs = #{jyfs}, + jydxmc = #{jydxmc}, + jykssj = #{jykssj}, + jyjssj = #{jyjssj}, cbje = #{cbje}, bz = #{bz}, dk_img = #{dkImg}, @@ -197,17 +189,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update t_resource_operation - dkbm = #{item.dkbm}, + dkbm = #{item.dkbm}, dkmc = #{item.dkmc}, dkdz = #{item.dkdz}, dkxz = #{item.dkxz}, dknz = #{item.dknz}, dkbz = #{item.dkbz}, jymj = #{item.jymj}, - jyfs = #{item.jyfs}, - jydxmc = #{item.jydxmc}, - jykssj = #{item.jykssj}, - jyjssj = #{item.jyjssj}, + jyfs = #{item.jyfs}, + jydxmc = #{item.jydxmc}, + jykssj = #{item.jykssj}, + jyjssj = #{item.jyjssj}, cbje = #{item.cbje}, bz = #{item.bz}, dk_img = #{item.dkImg}, diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 983a397..2ddc2ae 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -92,7 +92,6 @@ 删除 --> - 导入 @@ -119,7 +118,7 @@ #if($column.pk) #elseif($column.list && $column.htmlType == "datetime") - + #elseif($column.list && $column.htmlType == "imageUpload") #elseif($column.list && $column.htmlType == "fileUpload") - + - + #elseif($column.list && "" != $column.dictType)