luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取水口，村管员添加机构id字段

Browse Source
This commit is contained in:
蒾酒 2025-01-02 00:31:08 +08:00
parent a26f00914d
commit 61c7ea0cf5
4 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgInformationVillageKeeper.java
View File

@ -70,8 +70,8 @@ private static final long serialVersionUID = 1L;
private String contactInformation;
/** 任职日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "任职日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "任职日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("任职日期")
private Date appointmentDate;
@ -84,5 +84,10 @@ private static final long serialVersionUID = 1L;
@Excel(name = "工作经历")
@ApiModelProperty("工作经历")
private String workExperience;
/** 所属机构 */
@Excel(name = "所属机构")
@ApiModelProperty("所属机构")
private Long deptId;
}
}

16
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgInformationWaterIntake.java
View File

@ -44,8 +44,8 @@ private static final long serialVersionUID = 1L;
private String location;
/** 建造日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "建造日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "建造日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("建造日期")
private Date constructionDate;
@ -55,8 +55,8 @@ private static final long serialVersionUID = 1L;
private Long maintenanceStatus;
/** 上次维护日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "上次维护日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "上次维护日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("上次维护日期")
private Date lastMaintenanceDate;
@ -90,4 +90,10 @@ private static final long serialVersionUID = 1L;
@ApiModelProperty("取水口参数")
private String parameter;
}
/** 所属机构 */
@Excel(name = "所属机构")
@ApiModelProperty("所属机构")
private Long deptId;
}

7
fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgInformationVillageKeeperMapper.xml
View File

@ -22,10 +22,11 @@
<result property="updateTime" column="update_time" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
<result property="deptId" column="dept_id" />
</resultMap>
<sql id="selectNgInformationVillageKeeperVo">
select village_keeper_id, official_id, name, position, belonging_region, gender, age, party_membership, contact_information, appointment_date, education_background, work_experience, remark, create_time, update_time, create_by, update_by from ng_Information_village_keeper
select village_keeper_id, official_id, name, position, belonging_region, gender, age, party_membership, contact_information, appointment_date, education_background, work_experience, remark, create_time, update_time, create_by, update_by, dept_id from ng_Information_village_keeper
</sql>
<select id="selectNgInformationVillageKeeperList" parameterType="NgInformationVillageKeeper" resultMap="NgInformationVillageKeeperResult">
@ -43,6 +44,7 @@
<if test="appointmentDate != null "> and appointment_date = #{appointmentDate}</if>
<if test="educationBackground != null and educationBackground != ''"> and education_background = #{educationBackground}</if>
<if test="workExperience != null and workExperience != ''"> and work_experience = #{workExperience}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
</where>
</select>
@ -71,6 +73,7 @@
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if>
<if test="deptId != null">dept_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="villageKeeperId != null">#{villageKeeperId},</if>
@ -90,6 +93,7 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="deptId != null">#{deptId},</if>
</trim>
</insert>
@ -112,6 +116,7 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
</trim>
where village_keeper_id = #{villageKeeperId}
</update>

9
fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgInformationWaterIntakeMapper.xml
View File

@ -23,10 +23,11 @@
<result property="updateTime" column="update_time" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
<result property="deptId" column="dept_id" />
</resultMap>
<sql id="selectNgInformationWaterIntakeVo">
select intake_id, well_id, device_code, location, construction_date, maintenance_status, last_maintenance_date, water_quality, water_extraction_volume, type, responsible_person, contact_information, parameter, remark, create_time, update_time, create_by, update_by from ng_information_water_intake
select intake_id, well_id, device_code, location, construction_date, maintenance_status, last_maintenance_date, water_quality, water_extraction_volume, type, responsible_person, contact_information, parameter, remark, create_time, update_time, create_by, update_by, dept_id from ng_information_water_intake
</sql>
<select id="selectNgInformationWaterIntakeList" parameterType="NgInformationWaterIntake" resultMap="NgInformationWaterIntakeResult">
@ -40,10 +41,11 @@
<if test="lastMaintenanceDate != null "> and last_maintenance_date = #{lastMaintenanceDate}</if>
<if test="waterQuality != null and waterQuality != ''"> and water_quality = #{waterQuality}</if>
<if test="waterExtractionVolume != null "> and water_extraction_volume = #{waterExtractionVolume}</if>
<if test="type != null "> and type = #{type}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="responsiblePerson != null and responsiblePerson != ''"> and responsible_person = #{responsiblePerson}</if>
<if test="contactInformation != null and contactInformation != ''"> and contact_information = #{contactInformation}</if>
<if test="parameter != null and parameter != ''"> and parameter = #{parameter}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
</where>
</select>
@ -72,6 +74,7 @@
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if>
<if test="deptId != null">dept_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="wellId != null">#{wellId},</if>
@ -91,6 +94,7 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="deptId != null">#{deptId},</if>
</trim>
</insert>
@ -114,6 +118,7 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
</trim>
where intake_id = #{intakeId}
</update>