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

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-06-03 18:29:53 +08:00
parent 79b56bff7d
commit 92bceccd91
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
View File

@ -8,6 +8,7 @@ import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.constant.Cts;
import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService; import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService;
import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService; import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService;
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
@ -485,7 +486,7 @@ public class XzSecurityQualityInspectionRecordController {
@ApiOperation(value = "风险走势图", notes = "风险走势图", httpMethod = "POST") @ApiOperation(value = "风险走势图", notes = "风险走势图", httpMethod = "POST")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "type", value = "1过去一年每月(默认）2过去一周每天", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = Cts.QUERY_TYPE, value = "1过去一年每月(默认）2过去一周每天", paramType = "body", required = true, dataType = "String"),
}) })
@PostMapping(value = "/riskChart") @PostMapping(value = "/riskChart")
public Result<List<XzSecurityQualityInspectionRecordTotalVo>> riskChart(@RequestBody Map<String, Object> map) { public Result<List<XzSecurityQualityInspectionRecordTotalVo>> riskChart(@RequestBody Map<String, Object> map) {

12
src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
View File

@ -177,12 +177,12 @@
IFNULL(SUM((CASE WHEN t.level = 2 THEN 1 ELSE 0 END)), 0) largerRiskNum, IFNULL(SUM((CASE WHEN t.level = 2 THEN 1 ELSE 0 END)), 0) largerRiskNum,
IFNULL(SUM((CASE WHEN t.level = 3 THEN 1 ELSE 0 END)), 0) generalRiskNum, IFNULL(SUM((CASE WHEN t.level = 3 THEN 1 ELSE 0 END)), 0) generalRiskNum,
IFNULL(SUM((CASE WHEN t.level = 4 THEN 1 ELSE 0 END)), 0) lowRiskNum, IFNULL(SUM((CASE WHEN t.level = 4 THEN 1 ELSE 0 END)), 0) lowRiskNum,
if(FLOOR((DAYOFMONTH(t.create_time) - 1) / 7) > 3, 3, if(FLOOR((DAYOFMONTH(t.inspect_time) - 1) / 7) > 3, 3,
FLOOR((DAYOFMONTH(t.create_time) - 1) / 7)) as whichWeekOfMonth, FLOOR((DAYOFMONTH(t.inspect_time) - 1) / 7)) as whichWeekOfMonth,
date_format(t.create_time, '%Y-%m') as yearMonth, date_format(t.inspect_time, '%Y-%m') as yearMonth,
date_format(t.create_time, '%Y-%m-%d') as lastWeekByDate, date_format(t.inspect_time, '%Y-%m-%d') as lastWeekByDate,
year(t.create_time) as year, year(t.inspect_time) as year,
month(t.create_time) as month month(t.inspect_time) as month
from xz_security_quality_inspection_record t from xz_security_quality_inspection_record t
WHERE t.project_sn = #{param.projectSn} WHERE t.project_sn = #{param.projectSn}
and t.status != 6 and t.status != 6

1
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzHikvisionCompareDataController.java
View File

@ -45,6 +45,7 @@ public class XzHikvisionCompareDataController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "type", value = "类型1组织2人员信息3人员照片4车辆信息", paramType = "query", required = true, dataType = "Integer"),
}) })
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<IPage<XzHikvisionCompareData>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) { public Result<IPage<XzHikvisionCompareData>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {