zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java
@@ -36,7 +36,7 @@ /** * 查询enerclassname能源类型名称下拉框 */ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:getenerclassname')") @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:list')") @GetMapping("/getenerclassname") public AjaxResult list() { @@ -82,7 +82,7 @@ /** * 获取energy详细信息 */ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:query')") @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:list')") @GetMapping(value = "/{enerid}") public AjaxResult getInfo(@PathVariable("enerid") Integer enerid) { @@ -147,7 +147,7 @@ /** * 保存能源单价设置 */ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:updateEnergyPrice')") @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:edit')") @Log(title = "energy", businessType = BusinessType.UPDATE) @PutMapping("/updateEnergyPrice") public AjaxResult updateEnergyPrice(@RequestBody(required = false) SysEnergy sysEnergy) throws ParseException { @@ -173,7 +173,7 @@ /** * 保存能源折标系数设置 */ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:updateEnergyCoefficient')") @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:edit')") @Log(title = "energy", businessType = BusinessType.UPDATE) @PutMapping("/updateEnergyCoefficient") public AjaxResult updateEnergyCoefficient(@RequestBody(required = false) SysEnergy sysEnergy) throws ParseException { zhitan-admin/src/main/java/com/zhitan/web/controller/saving/EnergySavingProgramController.java
@@ -11,6 +11,7 @@ import com.zhitan.saving.service.IEnergySavingProgramService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -35,6 +36,7 @@ * 列表 */ @GetMapping("/page") @PreAuthorize("@ss.hasPermi('energySavingProject:list')") @ApiOperation(value = "分页列表") public TableDataInfo list(EnergySavingProgram energySavingProgram) { Page<EnergySavingProgramVO> list = energySavingProgramService.selectEnergySavingProgramList(energySavingProgram); @@ -48,6 +50,7 @@ * 详细信息 */ @ApiOperation(value = "查询详情") @PreAuthorize("@ss.hasPermi('energySavingProject')") @GetMapping(value = "getById") public AjaxResult getInfo(@RequestParam("id") Long id) { return success(energySavingProgramService.selectEnergySavingProgramById(id)); zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java
@@ -1,6 +1,7 @@ package com.zhitan.peakvalley.domain.dto; import com.zhitan.common.enums.TimeType; import com.zhitan.common.utils.StringUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -49,17 +50,19 @@ public String getTimeType() { String result = TimeType.DAY.name(); switch (TimeType.valueOf(this.timeType)) { case HOUR: case DAY: return TimeType.HOUR.name(); case MONTH: return TimeType.DAY.name(); result= TimeType.HOUR.name(); break; case YEAR: return TimeType.MONTH.name(); result= TimeType.MONTH.name(); break; case MONTH: default: return TimeType.DAY.name(); break; } return result; } } zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsDTO.java
@@ -30,7 +30,7 @@ * 政策类型 */ @NotNull(message = "请选择政策类型") private Integer type; private String type; /** * 印发部门 zhitan-system/src/main/java/com/zhitan/saving/domain/dto/PoliciesRegulationsManagementPageDTO.java
@@ -14,7 +14,7 @@ /** * 类型 */ private Integer type; private String type; /** * 标题 zhitan-system/src/main/java/com/zhitan/saving/domain/entity/PoliciesRegulationsManagement.java
@@ -36,7 +36,7 @@ * 政策类型 */ @Excel(name = "政策类型") private Integer type; private String type; /** * 印发部门 @@ -55,7 +55,7 @@ * 文件地址 */ @Excel(name = "文件地址") private String address; private String url; /** * 删除标志（0：正常；1：删除） zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementDetailVO.java
@@ -33,7 +33,7 @@ * 政策类型 */ @Excel(name = "政策类型") private Integer type; private String type; /** * 印发部门 zhitan-system/src/main/java/com/zhitan/saving/domain/vo/PoliciesRegulationsManagementPageVO.java
@@ -36,6 +36,12 @@ private String type; /** * 政策类型名称 */ private String typeName; /** * 印发部门 */ @Excel(name = "印发部门") zhitan-system/src/main/java/com/zhitan/saving/mapper/PoliciesRegulationsManagementMapper.java
@@ -17,7 +17,6 @@ * @date 2024-12-26 */ @Mapper @DataSource(value = DataSourceType.MASTER) public interface PoliciesRegulationsManagementMapper extends BaseMapper<PoliciesRegulationsManagement> {
@@ -49,7 +49,6 @@ * @return 参数配置信息 */ @Override @DataSource(DataSourceType.MASTER) public SysConfig selectConfigById(Long configId) { SysConfig config = new SysConfig(); zhitan-system/src/main/resources/mapper/saving/PoliciesRegulationsManagementMapper.xml
@@ -4,23 +4,26 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zhitan.saving.mapper.PoliciesRegulationsManagementMapper"> <select id="getPageList" resultType="com.zhitan.saving.domain.vo.PoliciesRegulationsManagementPageVO"> select id, title, type, dept, issuing_time, address from policies_regulations_management select prm.id, prm.title, prm.type, prm.dept, prm.issuing_time, prm.url, sdd.dict_label as typeName from policies_regulations_management AS prm left join sys_dict_data AS sdd on prm.type = sdd.dict_value <where> del_flag = 0 prm.del_flag = 0 <if test="dto.type != null"> and type = #{dto.type} and prm.type = #{dto.type} </if> <if test="dto.title != null and dto.title != ''"> and title like concat('%',#{dto.title},'%') and prm.title like concat('%',#{dto.title},'%') </if> </where> order by issuing_time desc order by prm.issuing_time desc </select> </mapper>
