diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml index d8df61baf..1963973a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml @@ -376,7 +376,7 @@ IFNULL(SUM((IF(status = 1 or status = 4, 1, 0))), 0) allRectificationNum, IFNULL(SUM((IF(!(status = 1 or status = 4) or status is null, 1, 0))), 0) allNoRectificationNum, - IFNULL(SUM((IF(YEARWEEK(change_limit_time, 1) = YEARWEEK(now(), 7), 1, 0))), + IFNULL(SUM((IF(YEARWEEK(inspect_time, 1) = YEARWEEK(now(), 7), 1, 0))), 0) weekTotalNum from hidden_danger_inspection_record WHERE project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java index c01879e8f..72532d20d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java @@ -1,17 +1,16 @@ package com.zhgd.xmgl.modules.quality.entity; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** * @Description: 质量—检查部位 * @author: pds @@ -41,18 +40,24 @@ public class QualityRegion implements Serializable { @ApiModelProperty(value="整改人ID") private java.lang.Long dutyId ; - /**通知人*/ + /** + * 通知人 + */ @Excel(name = "通知人", width = 15) - @ApiModelProperty(value="通知人ID") - private java.lang.String intendanceIds ; - /**父级区域ID*/ + @ApiModelProperty(value = "通知人ID") + private java.lang.String intendanceIds; + /** + * 父级区域ID + */ @Excel(name = "父级区域ID", width = 15) - @ApiModelProperty(value="父级区域ID") - private java.lang.Integer parentRegion ; - /**说明*/ + @ApiModelProperty(value = "父级区域ID") + private java.lang.Long parentRegion; + /** + * 说明 + */ @Excel(name = "说明", width = 15) - @ApiModelProperty(value="说明") - private java.lang.String remark ; + @ApiModelProperty(value = "说明") + private java.lang.String remark; /**项目唯一标识*/ @Excel(name = "项目唯一标识", width = 15) @ApiModelProperty(value="项目唯一标识") diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java index 3e4f897e5..e15a01b90 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java @@ -65,7 +65,7 @@ public class QualityRegionServiceImpl extends ServiceImpl param=new HashMap<>(); param.put("projectSn",qualityRegion.getProjectSn());