admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
Administrator 2023-02-27 17:11:23 +08:00
parent 7ade5466b2
commit 9772d9dcfa
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml
View File

@ -376,7 +376,7 @@
IFNULL(SUM((IF(status = 1 or status = 4, 1, 0))), 0) allRectificationNum, 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))), IFNULL(SUM((IF(!(status = 1 or status = 4) or status is null, 1, 0))),
0) allNoRectificationNum, 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 0) weekTotalNum
from hidden_danger_inspection_record from hidden_danger_inspection_record
WHERE project_sn = #{projectSn} WHERE project_sn = #{projectSn}

27
src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java
View File

@ -1,17 +1,16 @@
package com.zhgd.xmgl.modules.quality.entity; 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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; 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: 质量—检查部位 * @Description: 质量—检查部位
* @author： pds * @author： pds
@ -41,15 +40,21 @@ public class QualityRegion implements Serializable {
@ApiModelProperty(value="整改人ID") @ApiModelProperty(value="整改人ID")
private java.lang.Long dutyId ; private java.lang.Long dutyId ;
/**通知人*/ /**
* 通知人
*/
@Excel(name = "通知人", width = 15) @Excel(name = "通知人", width = 15)
@ApiModelProperty(value = "通知人ID") @ApiModelProperty(value = "通知人ID")
private java.lang.String intendanceIds; private java.lang.String intendanceIds;
/**父级区域ID*/ /**
* 父级区域ID
*/
@Excel(name = "父级区域ID", width = 15) @Excel(name = "父级区域ID", width = 15)
@ApiModelProperty(value = "父级区域ID") @ApiModelProperty(value = "父级区域ID")
private java.lang.Integer parentRegion ; private java.lang.Long parentRegion;
/**说明*/ /**
* 说明
*/
@Excel(name = "说明", width = 15) @Excel(name = "说明", width = 15)
@ApiModelProperty(value = "说明") @ApiModelProperty(value = "说明")
private java.lang.String remark; private java.lang.String remark;

2
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
View File

@ -65,7 +65,7 @@ public class QualityRegionServiceImpl extends ServiceImpl<QualityRegionMapper, Q
@Override @Override
public void addQualityRegion(QualityRegion qualityRegion) { public void addQualityRegion(QualityRegion qualityRegion) {
if(qualityRegion.getParentRegion()==null){ if(qualityRegion.getParentRegion()==null){
qualityRegion.setParentRegion(0); qualityRegion.setParentRegion(0L);
} }
Map<String, Object> param=new HashMap<>(); Map<String, Object> param=new HashMap<>();
param.put("projectSn",qualityRegion.getProjectSn()); param.put("projectSn",qualityRegion.getProjectSn());