1.解决提出的bug

dev
862857010@qq.com 2 years ago
parent 95eaa20f43
commit 29f0a0eb4d
  1. 20
      cjy-project/src/main/java/com/cjy/governmentdata/domain/dto/GovernmentDataDTO.java
  2. 2
      cjy-project/src/main/resources/mapper/governmentdata/GovernmentDataMapper.xml
  3. 2
      ruoyi-ui/src/views/system/management/operational-data/governmentData/governmentData/index.vue
  4. 2
      ruoyi-ui/src/views/system/management/operational-data/toiletData/toiletdata/index.vue

@ -12,9 +12,9 @@ import com.cjy.linedata.domain.LineData;
public class GovernmentDataDTO extends GovernmentData {
//开始日期
private String startData;
private String startDate;
//结束日期
private String endData;
private String endDate;
//查询资源名称
private String searchName;
private Long mediaId;
@ -27,20 +27,20 @@ public class GovernmentDataDTO extends GovernmentData {
this.mediaId = mediaId;
}
public String getStartData() {
return startData;
public String getStartDate() {
return startDate;
}
public void setStartData(String startData) {
this.startData = startData;
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndData() {
return endData;
public String getEndDate() {
return endDate;
}
public void setEndData(String endData) {
this.endData = endData;
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getSearchName() {

@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="coverImage != null and coverImage != ''"> and t1.cover_image = #{coverImage}</if>
<if test="introduction != null and introduction != ''"> and t1.introduction = #{introduction}</if>
<if test="detail != null and detail != ''"> and t1.detail = #{detail}</if>
<if test="startData != null and endData != null"> and (t1.create_time BETWEEN #{startData} and #{endData})</if>
<if test="startDate != null and endDate != null"> and (t1.release_time BETWEEN #{startDate} and #{endDate})</if>
<if test="dataSource != null and dataSource != ''"> and t1.data_source = #{dataSource}</if>
and t1.organ_code = #{organCode}
and t1.del_flag != '2'

@ -228,7 +228,7 @@ import operational from "@/views/system/management/operational-data/utils/operat
export default {
mixins: [operational,tickt],
dicts: ['government_information_type'],
dicts: ['government_information_type','data_sources'],
name: "GovernmentData",
data() {
return {

@ -306,7 +306,7 @@
<el-form-item label="空气质量" prop="airQuality">
<el-select v-model="form.airQuality" clearable placeholder="空气质量">
<el-option
v-for="dict in dict.type.weather_comfort"
v-for="dict in dict.type.weather_air_quality"
:key="dict.value"
:label="dict.label"
:value="dict.value"

Loading…
Cancel
Save