From 7913eefe6c8df6e68f6f1baa315c980ef1b433d5 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 20 五月 2024 17:30:14 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProjectOne.java | 74 ++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java | 15 ++
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitCtrl.java | 25 +++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java | 18 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml | 25 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml | 25 +++
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java | 5
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/QueryVoOne.java | 82 +++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java | 5
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateUnit.java | 81 +++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigateUnitMapper.java | 13 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProject.java | 7 +
12 files changed, 363 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigateUnitMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigateUnitMapper.java
new file mode 100644
index 0000000..7fc478a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigateUnitMapper.java
@@ -0,0 +1,13 @@
+package com.dy.pipIrrGlobal.daoIr;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/5/16 18:23
+ * @LastEditTime :2024/5/16 18:23
+ * @Description
+ */
+@Mapper
+public interface IrIrrigateUnitMapper {
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java
index f73a9f3..3d3e0a0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrProjectMapper.java
@@ -5,6 +5,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voIr.VoProject;
+import com.dy.pipIrrGlobal.voIr.VoProjectOne;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -20,23 +21,28 @@
*/
@Mapper
public interface IrProjectMapper extends BaseMapper<IrProject> {
-//澧�
+ //澧�
int insertSelective(IrProject record);
-//鍒�
+
+ //鍒�
int deleteLogicById(Long id);
-//鏀�
+
+ //鏀�
int updateByPrimaryKeySelective(IrProject record);
-//鏌ヤ竴涓�
- IrProject selectById(Long id);
+
+ //鏌ヤ竴涓�
+ VoProjectOne selectById(Long id);
/**
* 淇敼椤圭洰鐘舵��
+ *
* @return
*/
int updateProjectState(IrProject record);
/**
* 鏍规嵁涓嬬骇Id鑾峰彇涓婁竴绾у湴鍧�Id
+ *
* @param vaId 涓嬩竴绾d
* @return
*/
@@ -44,6 +50,7 @@
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍙栨按鍙ｈ褰曟暟
+ *
* @param params
* @return
*/
@@ -51,6 +58,7 @@
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍙栨按鍙ｈ褰�
+ *
* @param params
* @return
*/
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateUnit.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateUnit.java
new file mode 100644
index 0000000..0806184
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateUnit.java
@@ -0,0 +1,81 @@
+package com.dy.pipIrrGlobal.pojoIr;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/5/16 18:29
+ * @LastEditTime :2024/5/16 18:29
+ * @Description
+ */
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import org.hibernate.validator.constraints.Length;
+
+import java.util.Date;
+
+/**
+ * 鐏屾簤鍗曞厓琛�
+ */
+
+@TableName(value="ir_irrigate_unit", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "椤圭洰瀹炰綋")
+public class IrIrrigateUnit {
+ public static final long serialVersionUID = 202405161833001L;
+
+ /**
+ * 涓婚敭
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Long id;
+
+ /**
+ * 椤圭洰ID
+ */
+ @Schema(description = "椤圭洰ID", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "椤圭洰ID涓嶈兘涓虹┖")
+ private Long projectId;
+ /**
+ * 鐏屾簤闈㈢Н
+ */
+ @Schema(description = "鐏屾簤闈㈢Н", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Length(message = "椤圭洰鍚嶇О涓嶅ぇ浜巤max}瀛�",max = 12)
+ private float area;
+ /**
+ * 鎿嶄綔浜篒D
+ */
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鎿嶄綔浜篒D涓嶈兘涓虹┖")
+ private Long operator;
+
+ /**
+ * 鎿嶄綔鏃堕棿
+ */
+ @Schema(description = "鎿嶄綔鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Date operateDt;
+
+ /**
+ * 澶囨敞
+ */
+ @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.REQUIRED)
+ private String remarks;
+
+ /**
+ * 閫昏緫鍒犻櫎鏍囪瘑;0-鏈垹闄わ紝1-鍒犻櫎
+ */
+ @Schema(description = "鍒犻櫎鏍囪瘑", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Byte deleted;
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProject.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProject.java
index fad1580..169aca4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProject.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProject.java
@@ -6,6 +6,8 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.util.Date;
+
/**
* @author :WuZeYu
* @Date :2024/5/15 21:02
@@ -43,4 +45,9 @@
@ExcelProperty("椤圭洰澶囨敞")
@ColumnWidth(250)
private String remarks;
+
+ @Schema(title = "鎿嶄綔鏃堕棿")
+ @ExcelProperty("鎿嶄綔鏃堕棿")
+ @ColumnWidth(50)
+ private Date operateDt;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProjectOne.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProjectOne.java
new file mode 100644
index 0000000..c2e2f4b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoProjectOne.java
@@ -0,0 +1,74 @@
+package com.dy.pipIrrGlobal.voIr;
+
+import com.dy.common.po.BaseEntity;
+import com.dy.common.webUtil.QueryConditionVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/5/15 21:11
+ * @LastEditTime :2024/5/15 21:11
+ * @Description
+ */
+@Data
+@Schema(name = "椤圭洰瑙嗗浘(鏌ヤ竴涓�)")
+public class VoProjectOne implements BaseEntity {
+ @Schema(description = "椤圭洰鍚嶇О")
+ public String projectName;
+
+ @Schema(description = "椤圭洰Id")
+ private String id;
+ /**
+ * 鐪両D
+ */
+ @Schema(description = "鐪両D")
+ private String provinceId;
+ /**
+ * 甯侷D
+ */
+ @Schema(description = "甯侷D")
+ private String cityId;
+ /**
+ * 鍘縄D
+ */
+ @Schema(description = "鍘縄D")
+ private String countyId;
+ /**
+ * 闀嘔D
+ */
+ @Schema(description = "闀嘔D")
+ private String townId;
+ /**
+ * 鏉慖D
+ */
+ @Schema(description = "鏉慖D")
+ private String villageId;
+ /**
+ * 椤圭洰鐘舵��;1-鍚姩锛�2-鍋滄
+ */
+ @Schema(description = "椤圭洰鐘舵��")
+ private Byte projectState;
+
+ /**
+ * 鎿嶄綔浜哄悕瀛�
+ */
+ @Schema(description = "鎿嶄綔浜哄悕瀛�")
+ private String operatorName;
+
+ /**
+ * 鎿嶄綔鏃堕棿
+ */
+ @Schema(description = "鎿嶄綔鏃堕棿")
+ private Date operateDt;
+
+ /**
+ * 澶囨敞
+ */
+ @Schema(description = "澶囨敞")
+ private String remarks;
+
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
new file mode 100644
index 0000000..a23be44
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateUnitMapper.xml
@@ -0,0 +1,25 @@
+<?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.dy.pipIrrGlobal.daoIr.IrIrrigateUnitMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoIr.IrProject">
+ <!--@mbg.generated-->
+ <!--@Table ir_project-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="project_name" jdbcType="VARCHAR" property="projectName" />
+ <result column="province_id" jdbcType="BIGINT" property="provinceId" />
+ <result column="city_id" jdbcType="BIGINT" property="cityId" />
+ <result column="county_id" jdbcType="BIGINT" property="countyId" />
+ <result column="town_id" jdbcType="BIGINT" property="townId" />
+ <result column="village_id" jdbcType="BIGINT" property="villageId" />
+ <result column="project_state" jdbcType="TINYINT" property="projectState" />
+ <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+ <result column="operator" jdbcType="BIGINT" property="operator" />
+ <result column="operate_time" jdbcType="TIMESTAMP" property="operateDt" />
+ <result column="deleted" jdbcType="TINYINT" property="deleted" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, project_name, province_id, city_id, county_id, town_id, `village_id`, project_state, remarks, `operator`,
+ operate_time, deleted
+ </sql>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
index d451fd2..3fbb007 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrProjectMapper.xml
@@ -169,8 +169,22 @@
where id = #{id,jdbcType=BIGINT}
</update>
<!--鏌ヨ涓�涓俊鎭�-->
- <select id="selectById" resultMap="BaseResultMap">
- select <include refid="Base_Column_List" /> from ir_project where id = #{id,jdbcType=BIGINT} and deleted = 0
+ <select id="selectById" resultType="com.dy.pipIrrGlobal.voIr.VoProjectOne">
+ select
+ CAST(pro.id AS char)AS projectId,
+ CAST(pro.province_id AS char)AS provinceId,
+ CAST(pro.city_id AS char)AS cityId,
+ CAST(pro.county_id AS char)AS countyId,
+ CAST(pro.town_id AS char)AS townId,
+ CAST(pro.village_id AS char)AS villageId,
+ pro.project_name AS projectName,
+ pro.project_state AS projectState,
+ cli.name AS operatorName,
+ pro.remarks,
+ pro.operate_time AS operateDt
+ from ir_project pro
+ left join se_client cli on cli.id = pro.operator
+ where pro.id = #{id,jdbcType=BIGINT} and pro.deleted = 0
</select>
<!--鍒嗛〉鏌ヨ鏁伴噺-->
<select id="getRecordCount" resultType="java.lang.Long">
@@ -193,7 +207,8 @@
pro.project_name AS projectName,
pro.project_state AS projectState,
CONCAT(province.`name`,city.`name`,country.`name`, town.`name`, village.`name`) AS address,
- pro.remarks
+ pro.remarks,
+ pro.operate_time AS operateDt
FROM ir_project pro
LEFT JOIN ba_district province ON pro.province_id = province.id
LEFT JOIN ba_district city ON pro.city_id = city.id
@@ -209,5 +224,9 @@
AND pro.project_state = #{projectState}
</if>
</where>
+ ORDER BY pro.operate_time DESC
+ <if test="pageCurr != null and pageSize != null">
+ LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
+ </if>
</select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitCtrl.java
new file mode 100644
index 0000000..f2b0bf9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitCtrl.java
@@ -0,0 +1,25 @@
+package com.dy.pipIrrIrrigate.irrigateUnit;
+
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/5/16 18:07
+ * @LastEditTime :2024/5/16 18:07
+ * @Description
+ */
+@Slf4j
+@Tag(name = "鐏屾簤鍗曞厓", description = "鐏屾簤鍗曞厓")
+@RestController
+@RequestMapping(path = "irrigate/unit")
+@RequiredArgsConstructor
+public class IrrigateUnitCtrl {
+ @Autowired
+ private IrrigateUnitSv irrigateUnitSv;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java
new file mode 100644
index 0000000..3ce61e4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java
@@ -0,0 +1,15 @@
+package com.dy.pipIrrIrrigate.irrigateUnit;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/5/16 18:11
+ * @LastEditTime :2024/5/16 18:11
+ * @Description
+ */
+@Slf4j
+@Service
+public class IrrigateUnitSv {
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
index ee36545..9308c6e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
@@ -8,6 +8,7 @@
import com.dy.pipIrrGlobal.pojoIr.IrProject;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voIr.VoProject;
+import com.dy.pipIrrGlobal.voIr.VoProjectOne;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrIrrigate.result.IrrigateResultCode;
@@ -221,8 +222,8 @@
})
@GetMapping(path = "one")
@SsoAop()
- public BaseResponse<IrProject> one(@RequestParam Long id) {
- IrProject irProject = this.projectSv.selectById(id);
+ public BaseResponse<VoProjectOne> one(@RequestParam Long id) {
+ VoProjectOne irProject = this.projectSv.selectById(id);
if (irProject == null) {
return BaseResponseUtils.buildFail(IrrigateResultCode.NO_PROJECT.getMessage());
} else {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java
index 8b4d90a..4683b2d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java
@@ -5,6 +5,7 @@
import com.dy.pipIrrGlobal.daoIr.IrProjectMapper;
import com.dy.pipIrrGlobal.pojoIr.IrProject;
import com.dy.pipIrrGlobal.voIr.VoProject;
+import com.dy.pipIrrGlobal.voIr.VoProjectOne;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
@@ -125,8 +126,8 @@
* @param id
* @return
*/
- public IrProject selectById(Long id){
- IrProject irProject = irProjectMapper.selectById(id);
+ public VoProjectOne selectById(Long id){
+ VoProjectOne irProject = irProjectMapper.selectById(id);
return irProject;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/QueryVoOne.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/QueryVoOne.java
new file mode 100644
index 0000000..f177097
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/QueryVoOne.java
@@ -0,0 +1,82 @@
+package com.dy.pipIrrIrrigate.project;
+
+import com.dy.common.webUtil.QueryConditionVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/5/15 21:11
+ * @LastEditTime :2024/5/15 21:11
+ * @Description
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(name = "椤圭洰鏌ヨ鏉′欢(鏌ヤ竴涓�)")
+public class QueryVoOne extends QueryConditionVo {
+ @Schema(description = "椤圭洰鍚嶇О")
+ public String projectName;
+
+ @Schema(description = "椤圭洰Id")
+ private Long id;
+ /**
+ * 鐪両D
+ */
+ @Schema(description = "鐪両D")
+ private Long provinceId;
+ /**
+ * 甯侷D
+ */
+ @Schema(description = "甯侷D")
+ private Long cityId;
+ /**
+ * 鍘縄D
+ */
+ @Schema(description = "鍘縄D")
+ private Long countyId;
+ /**
+ * 闀嘔D
+ */
+ @Schema(description = "闀嘔D")
+ private Long townId;
+ /**
+ * 鏉慖D
+ */
+ @Schema(description = "鏉慖D")
+ private Long villageId;
+ /**
+ * 椤圭洰鐘舵��;1-鍚姩锛�2-鍋滄
+ */
+ @Schema(description = "椤圭洰鐘舵��")
+ private Byte projectState;
+
+ /**
+ * 鎿嶄綔浜篒D
+ */
+ @Schema(description = "鎿嶄綔浜篒D")
+ private Long operator;
+
+ /**
+ * 鎿嶄綔鏃堕棿
+ */
+ @Schema(description = "鎿嶄綔鏃堕棿")
+ private Date operateDt;
+
+ /**
+ * 澶囨敞
+ */
+ @Schema(description = "澶囨敞")
+ private String remarks;
+
+ /**
+ * 閫昏緫鍒犻櫎鏍囪瘑;0-鏈垹闄わ紝1-鍒犻櫎
+ */
+ @Schema(description = "鍒犻櫎鏍囪瘑")
+ private Byte deleted;
+}
--
Gitblit v1.8.0