From 4a37df2b63ac5c080faece1eef07a14b9313c551 Mon Sep 17 00:00:00 2001 From: guo Date: Mon, 25 Sep 2023 09:44:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8Fbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/system/query/QueryGenerator.java | 1 - ...CompanyBigScreenStatisticsServiceImpl.java | 3 +- .../LocationTagLowVoltageAlarmController.java | 2 + .../controller/LocationTunnelController.java | 4 +- .../service/ILocationTunnelService.java | 3 + .../service/impl/LocationDataServiceImpl.java | 4 +- .../impl/LocationTunnelServiceImpl.java | 25 +++++- .../QualityInspectionRecordController.java | 7 +- .../entity/QualityInspectionRecord.java | 2 + .../vo/QualityInspectionRecordTotalVo.java | 23 +++++ .../entity/vo/QualityInspectionRecordVo.java | 23 +++++ .../modules/quality/entity/vo/RecordVo.java | 11 +++ .../mapper/QualityInspectionRecordMapper.java | 9 +- .../xml/QualityInspectionRecordMapper.xml | 88 ++++++++++--------- .../IQualityInspectionRecordService.java | 7 +- .../QualityInspectionRecordServiceImpl.java | 19 ++-- .../impl/QualityRectifyRecordServiceImpl.java | 5 +- .../modules/worker/entity/WorkerInfo.java | 2 +- .../service/impl/WorkerInfoServiceImpl.java | 15 ++++ 19 files changed, 177 insertions(+), 76 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordTotalVo.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordVo.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/RecordVo.java diff --git a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java index a84999f1e..19e831739 100644 --- a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java +++ b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java @@ -181,7 +181,6 @@ public class QueryGenerator { if (parameterMap != null && parameterMap.containsKey(name + BEGIN)) { beginValue = parameterMap.get(name + BEGIN)[0].trim(); addQueryByRule(queryWrapper, name, type, beginValue, QueryRuleEnum.GE, defaultAlias); - continue; } if (parameterMap != null && parameterMap.containsKey(name + END)) { endValue = parameterMap.get(name + END)[0].trim(); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyBigScreenStatisticsServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyBigScreenStatisticsServiceImpl.java index db27fee47..9f7289f72 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyBigScreenStatisticsServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyBigScreenStatisticsServiceImpl.java @@ -16,6 +16,7 @@ import com.zhgd.xmgl.modules.electrical.mapper.ElectricalDevMapper; import com.zhgd.xmgl.modules.environment.mapper.EnvironmentAlarmMapper; import com.zhgd.xmgl.modules.environment.mapper.EnvironmentDevMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; +import com.zhgd.xmgl.modules.quality.entity.vo.QualityInspectionRecordTotalVo; import com.zhgd.xmgl.modules.quality.mapper.QualityInspectionRecordMapper; import com.zhgd.xmgl.modules.security.mapper.SecurityManageMapper; import com.zhgd.xmgl.modules.standard.mapper.StandardDevMapper; @@ -217,7 +218,7 @@ public class CompanyBigScreenStatisticsServiceImpl implements ICompanyBigScreenS data.put("securityCount", securityCount); //查询质量检查 - Map qualityCount = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); + QualityInspectionRecordTotalVo qualityCount = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); data.put("qualityCount", qualityCount); Integer totalPerson = workerInfoMapper.selectWorkerTotalCount(map); Map attendancePerson = workerInfoMapper.selectAttendanceWorkerPersonTypeTotal(map); diff --git a/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTagLowVoltageAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTagLowVoltageAlarmController.java index 2a1a28906..da5d6fb12 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTagLowVoltageAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTagLowVoltageAlarmController.java @@ -8,6 +8,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.location.entity.LocationTagLowVoltageAlarm; import com.zhgd.xmgl.modules.location.service.ILocationTagLowVoltageAlarmService; +import com.zhgd.xmgl.util.RefUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -58,6 +59,7 @@ public class LocationTagLowVoltageAlarmController { HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(locationTagLowVoltageAlarm, req.getParameterMap()); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(LocationTagLowVoltageAlarm::getCreateTime)); Page page = new Page(pageNo, pageSize); IPage pageList = locationTagLowVoltageAlarmService.page(page, queryWrapper); result.setSuccess(true); diff --git a/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTunnelController.java b/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTunnelController.java index af54ccb59..e316361b3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTunnelController.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTunnelController.java @@ -97,7 +97,7 @@ public class LocationTunnelController { @ApiOperation(value = "添加定位隧道信息", notes = "添加定位隧道信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody LocationTunnel locationTunnel) { - locationTunnelService.save(locationTunnel); + locationTunnelService.add(locationTunnel); return Result.ok(); } @@ -110,7 +110,7 @@ public class LocationTunnelController { @ApiOperation(value = "编辑定位隧道信息", notes = "编辑定位隧道信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody LocationTunnel locationTunnel) { - locationTunnelService.updateById(locationTunnel); + locationTunnelService.edit(locationTunnel); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/location/service/ILocationTunnelService.java b/src/main/java/com/zhgd/xmgl/modules/location/service/ILocationTunnelService.java index 7262d9b94..e75e67558 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/service/ILocationTunnelService.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/service/ILocationTunnelService.java @@ -11,4 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ILocationTunnelService extends IService { + void add(LocationTunnel locationTunnel); + + void edit(LocationTunnel locationTunnel); } diff --git a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java index 6ed9cac77..cc708373c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java @@ -59,8 +59,10 @@ public class LocationDataServiceImpl extends ServiceImpl queryPageList(LocationData locationData, Integer pageNo, Integer pageSize, HttpServletRequest req) { + String defaultAlias = "d."; QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(locationData, req.getParameterMap(), - null, RefUtil.fieldNames(LocationData::getPersonName), "d."); + null, RefUtil.fieldNames(LocationData::getPersonName), defaultAlias); + queryWrapper.orderByDesc(defaultAlias + RefUtil.fieldNameUlc(LocationData::getCreateTime)); Page page = new Page(pageNo, pageSize); IPage pageList = baseMapper.queryPageList(page, queryWrapper); return pageList; diff --git a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTunnelServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTunnelServiceImpl.java index 426bb9270..6bd89700d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTunnelServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTunnelServiceImpl.java @@ -1,12 +1,13 @@ package com.zhgd.xmgl.modules.location.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.location.entity.LocationTunnel; import com.zhgd.xmgl.modules.location.mapper.LocationTunnelMapper; import com.zhgd.xmgl.modules.location.service.ILocationTunnelService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 定位隧道 * @author： pds @@ -16,4 +17,24 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class LocationTunnelServiceImpl extends ServiceImpl implements ILocationTunnelService { + @Override + public void add(LocationTunnel locationTunnel) { + String tunnelId = locationTunnel.getTunnelId(); + Integer cardCount = baseMapper.selectCount(new LambdaQueryWrapper().eq(LocationTunnel::getTunnelId, tunnelId)); + if (cardCount > 0) { + throw new OpenAlertException("隧道ID已存在"); + } + save(locationTunnel); + } + + @Override + public void edit(LocationTunnel locationTunnel) { + String tunnelId = locationTunnel.getTunnelId(); + Integer cardCount = baseMapper.selectCount(new LambdaQueryWrapper().eq(LocationTunnel::getTunnelId, tunnelId) + .ne(LocationTunnel::getId, locationTunnel.getId())); + if (cardCount > 0) { + throw new OpenAlertException("隧道ID已存在"); + } + updateById(locationTunnel); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java index 67eaec8c6..3965470f4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java @@ -10,10 +10,7 @@ import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialDevice; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; import com.zhgd.xmgl.modules.quality.entity.dto.DepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.quality.entity.vo.AllAndThisWeekDataVO; -import com.zhgd.xmgl.modules.quality.entity.vo.AllAndTodayDataVO; -import com.zhgd.xmgl.modules.quality.entity.vo.AllAndWeekDataVO; -import com.zhgd.xmgl.modules.quality.entity.vo.DepartmentRectifiedRankVo; +import com.zhgd.xmgl.modules.quality.entity.vo.*; import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; @@ -77,7 +74,7 @@ public class QualityInspectionRecordController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @PostMapping(value = "/list") - public Result> queryPageList(@RequestBody Map map) { + public Result queryPageList(@RequestBody Map map) { return Result.success(qualityInspectionRecordService.selectQualityInspectionRecordPage(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java index eb034cd95..505e216de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java @@ -243,4 +243,6 @@ public class QualityInspectionRecord implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "分项工程名称") private String subentryName; + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordTotalVo.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordTotalVo.java new file mode 100644 index 000000000..c0be4e0a0 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordTotalVo.java @@ -0,0 +1,23 @@ +package com.zhgd.xmgl.modules.quality.entity.vo; + +import lombok.Data; + +@Data +public class QualityInspectionRecordTotalVo { + + private Integer verificationNum; + private Double rectificationRatio; + private Integer closeNum; + private Integer reviewNum; + private Integer investigateNum; + private Integer overdueNotCloseNum; + private Integer rectificationNum; + private Integer ybUrgentLevelNum; + private Integer yzUrgentLevelNum; + private String totalNum; + private Double completeRatio; + private Integer jyUrgentLevelNum; + private Integer overdueRectificationNum; + private Integer notCloseNum; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordVo.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordVo.java new file mode 100644 index 000000000..0819775c7 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/QualityInspectionRecordVo.java @@ -0,0 +1,23 @@ +package com.zhgd.xmgl.modules.quality.entity.vo; + +import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class QualityInspectionRecordVo extends QualityInspectionRecord { + private String inspectManName; + private String createEnterpriseName; + private String verifyManName; + private String subentryname; + private String notifyPersonName; + private String enterpriseName; + private String subsectionname; + private String fullName; + private String routineCheckName; + private String changeName; + private String reviewName; + @ApiModelProperty("是否超时") + private Boolean overTime; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/RecordVo.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/RecordVo.java new file mode 100644 index 000000000..3bae867be --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/RecordVo.java @@ -0,0 +1,11 @@ +package com.zhgd.xmgl.modules.quality.entity.vo; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.mybatis.EntityMap; +import lombok.Data; + +@Data +public class RecordVo { + private Page page; + private QualityInspectionRecordTotalVo total; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java index 6d05fa33c..6849f0d40 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java @@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; import com.zhgd.xmgl.modules.quality.entity.dto.DepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.quality.entity.vo.AllAndThisWeekDataVO; -import com.zhgd.xmgl.modules.quality.entity.vo.AllAndTodayDataVO; -import com.zhgd.xmgl.modules.quality.entity.vo.AllAndWeekDataVO; -import com.zhgd.xmgl.modules.quality.entity.vo.DepartmentRectifiedRankVo; +import com.zhgd.xmgl.modules.quality.entity.vo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -26,9 +23,9 @@ public interface QualityInspectionRecordMapper extends BaseMapper map); - List selectQualityInspectionRecordPage(Page page, @Param("param") Map map); + List selectQualityInspectionRecordPage(Page page, @Param("param") Map map); - Map selectQualityInspectionRecordPageTotal(Map map); + QualityInspectionRecordTotalVo selectQualityInspectionRecordPageTotal(Map map); List> selectQualityInspectionRecordCountByDay(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml index 42cfba1aa..ae0de843a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml @@ -16,34 +16,36 @@ FROM system_user WHERE FIND_IN_SET(system_user.user_id, a.notify_person)) notify_person_name from quality_inspection_record a - LEFT JOIN enterprise_info b ON a.enterprise_sn = b.enterprise_sn - LEFT JOIN danger_type_record c ON a.danger_type_id = c.id - LEFT JOIN danger_type_record r ON a.danger_item_id = r.id - LEFT JOIN system_user d ON a.change_id = d.user_id - LEFT JOIN system_user e ON a.review_id = e.user_id - LEFT JOIN system_user f ON a.verify_man_id = f.user_id - LEFT JOIN system_user g ON a.inspect_man_id = g.user_id - LEFT JOIN routine_inspect h ON a.routine_id = h.id + LEFT JOIN enterprise_info b ON a.enterprise_sn = b.enterprise_sn + LEFT JOIN danger_type_record c ON a.danger_type_id = c.id + LEFT JOIN danger_type_record r ON a.danger_item_id = r.id + LEFT JOIN system_user d ON a.change_id = d.user_id + LEFT JOIN system_user e ON a.review_id = e.user_id + LEFT JOIN system_user f ON a.verify_man_id = f.user_id + LEFT JOIN system_user g ON a.inspect_man_id = g.user_id + LEFT JOIN routine_inspect h ON a.routine_id = h.id WHERE a.id = #{id} - SELECT a.*, - b.enterprise_name, - c.full_name, - d.real_name change_name, - e.real_name review_name, - en.enterprise_name create_enterprise_name, - f.real_name verify_man_name, - g.real_name inspect_man_name, - h.check_name routine_check_name, - (SELECT GROUP_CONCAT(real_name) - FROM system_user - WHERE FIND_IN_SET(system_user.user_id, a.notify_person)) notify_person_name, - subsection.subdivision_project_name subsectionName, - subentry.subdivision_project_name subentryName + b.enterprise_name, + c.full_name, + d.real_name change_name, + e.real_name review_name, + en.enterprise_name create_enterprise_name, + f.real_name verify_man_name, + g.real_name inspect_man_name, + h.check_name routine_check_name, + (SELECT GROUP_CONCAT(real_name) + FROM system_user + WHERE FIND_IN_SET(system_user.user_id, a.notify_person)) notify_person_name, + subsection.subdivision_project_name subsectionName, + subentry.subdivision_project_name subentryName, + if(a.change_limit_time current_date, 1, 0) overTime from quality_inspection_record a - LEFT JOIN enterprise_info b ON a.enterprise_sn = b.enterprise_sn - LEFT JOIN danger_type_record c ON a.danger_type_id = c.id + LEFT JOIN enterprise_info b ON a.enterprise_sn = b.enterprise_sn + LEFT JOIN danger_type_record c ON a.danger_type_id = c.id LEFT JOIN system_user d ON a.change_id = d.user_id LEFT JOIN system_user e ON a.review_id = e.user_id LEFT JOIN system_user f ON a.verify_man_id = f.user_id @@ -115,10 +117,12 @@ order by a.create_time desc - select tp.*, - round(IFNULL(TRUNCATE(IFNULL(closeNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) completeRatio, - round(IFNULL(TRUNCATE(IFNULL(totalNum-rectificationNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) + round(IFNULL(TRUNCATE(IFNULL(closeNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, + 2) completeRatio, + round(IFNULL(TRUNCATE(IFNULL(totalNum - rectificationNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) rectificationRatio from ( SELECT count(1) totalNum, @@ -130,16 +134,16 @@ IFNULL(SUM((CASE WHEN (a.status = 1 OR a.status = 2 OR a.status = 3 OR a.status = 4 OR a.status = 6) AND DATE_FORMAT(now(), "%Y-%m-%d") > a.change_limit_time THEN 1 - ELSE 0 END)), 0) overdueNotCloseNum, - IFNULL(SUM((CASE - WHEN a.status = 2 AND DATE_FORMAT(now(), "%Y-%m-%d") > a.change_limit_time THEN 1 - ELSE 0 END)), 0) overdueRectificationNum, - IFNULL(SUM((CASE WHEN a.status = 2 THEN 1 ELSE 0 END)), 0) rectificationNum, - IFNULL(SUM((CASE WHEN a.status = 3 THEN 1 ELSE 0 END)), 0) reviewNum, - IFNULL(SUM((CASE WHEN a.status = 4 THEN 1 ELSE 0 END)), 0) verificationNum, - IFNULL(SUM((CASE WHEN a.urgent_level = 1 THEN 1 ELSE 0 END)), 0) ybUrgentLevelNum, - IFNULL(SUM((CASE WHEN a.urgent_level = 2 THEN 1 ELSE 0 END)), 0) yzUrgentLevelNum, - IFNULL(SUM((CASE WHEN a.urgent_level = 3 THEN 1 ELSE 0 END)), 0) jyUrgentLevelNum + ELSE 0 END)), 0) overdueNotCloseNum, + IFNULL(SUM((CASE + WHEN a.status = 2 AND DATE_FORMAT(now(), "%Y-%m-%d") > a.change_limit_time THEN 1 + ELSE 0 END)), 0) overdueRectificationNum, + IFNULL(SUM((CASE WHEN a.status = 2 THEN 1 ELSE 0 END)), 0) rectificationNum, + IFNULL(SUM((CASE WHEN a.status = 3 THEN 1 ELSE 0 END)), 0) reviewNum, + IFNULL(SUM((CASE WHEN a.status = 4 THEN 1 ELSE 0 END)), 0) verificationNum, + IFNULL(SUM((CASE WHEN a.urgent_level = 1 THEN 1 ELSE 0 END)), 0) ybUrgentLevelNum, + IFNULL(SUM((CASE WHEN a.urgent_level = 2 THEN 1 ELSE 0 END)), 0) yzUrgentLevelNum, + IFNULL(SUM((CASE WHEN a.urgent_level = 3 THEN 1 ELSE 0 END)), 0) jyUrgentLevelNum from quality_inspection_record a WHERE a.project_sn = #{projectSn} @@ -349,9 +353,9 @@ IFNULL(SUM((IF(a.status = 5, 1, 0))), 0) allClose, - IFNULL(SUM((IF(YEARWEEK( a.inspect_time, 1 ) = YEARWEEK( now(), 1 ) and a.status != 5, 1, 0))), 0) weekNoClose, + IFNULL(SUM((IF(YEARWEEK(a.inspect_time, 1) = YEARWEEK(now(), 1) and a.status != 5, 1, 0))), 0) weekNoClose, - IFNULL(SUM((IF(YEARWEEK( a.inspect_time, 1 ) = YEARWEEK( now(), 1 ) and a.status = 5, 1, 0))), 0) weekClose + IFNULL(SUM((IF(YEARWEEK(a.inspect_time, 1) = YEARWEEK(now(), 1) and a.status = 5, 1, 0))), 0) weekClose from quality_inspection_record a WHERE a.project_sn = #{projectSn} @@ -365,11 +369,11 @@ IFNULL(SUM((IF(a.status = 5, 1, 0))), 0) allClose, - IFNULL( SUM(( IF ( YEARWEEK( a.inspect_time, 1 ) = YEARWEEK( now(), 1 ), 1, 0 ))), 0 ) weekTotal, + IFNULL(SUM((IF(YEARWEEK(a.inspect_time, 1) = YEARWEEK(now(), 1), 1, 0))), 0) weekTotal, - IFNULL(SUM((IF(YEARWEEK( a.inspect_time, 1 ) = YEARWEEK( now(), 1 ) and a.status != 5, 1, 0))), 0) weekNoClose, + IFNULL(SUM((IF(YEARWEEK(a.inspect_time, 1) = YEARWEEK(now(), 1) and a.status != 5, 1, 0))), 0) weekNoClose, - IFNULL(SUM((IF(YEARWEEK( a.inspect_time, 1 ) = YEARWEEK( now(), 1 ) and a.status = 5, 1, 0))), 0) weekClose + IFNULL(SUM((IF(YEARWEEK(a.inspect_time, 1) = YEARWEEK(now(), 1) and a.status = 5, 1, 0))), 0) weekClose from quality_inspection_record a WHERE a.project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java index 783f9511a..d9e8b9b38 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java @@ -5,10 +5,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; import com.zhgd.xmgl.modules.quality.entity.dto.DepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.quality.entity.vo.AllAndThisWeekDataVO; -import com.zhgd.xmgl.modules.quality.entity.vo.AllAndTodayDataVO; -import com.zhgd.xmgl.modules.quality.entity.vo.AllAndWeekDataVO; -import com.zhgd.xmgl.modules.quality.entity.vo.DepartmentRectifiedRankVo; +import com.zhgd.xmgl.modules.quality.entity.vo.*; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -24,7 +21,7 @@ public interface IQualityInspectionRecordService extends IService map); - Map selectQualityInspectionRecordPage(Map map); + RecordVo selectQualityInspectionRecordPage(Map map); Map selectQualityStatistics(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java index 3c83498a1..4d3568ba3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java @@ -61,8 +61,8 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl selectQualityInspectionRecordPage(Map map) { - Map data = new HashMap<>(); + public RecordVo selectQualityInspectionRecordPage(Map map) { + RecordVo data = new RecordVo(); int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); if (map.get("regionId") != null && StringUtils.isNotBlank(map.get("regionId").toString())) { @@ -76,12 +76,12 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); - List list = qualityInspectionRecordMapper.selectQualityInspectionRecordPage(page, map); + Page page = new Page<>(pageNo, pageSize); + List list = qualityInspectionRecordMapper.selectQualityInspectionRecordPage(page, map); page.setRecords(list); - Map total = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); - data.put("page", page); - data.put("total", total); + QualityInspectionRecordTotalVo total = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); + data.setPage(page); + data.setTotal(total); return data; } @@ -107,7 +107,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl data = new HashMap<>(); map.put("recordType", "1"); - Map total = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); + QualityInspectionRecordTotalVo total = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); List> monthList = qualityInspectionRecordMapper.selectQualityInspectionRecordCountByDay(map); List dayList = getDayList(); List> list = new ArrayList<>(); @@ -159,6 +159,9 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl> getRecordMapList(Map map) { map.put("pageSize", Integer.MAX_VALUE); - Map recordPage = qualityInspectionRecordService.selectQualityInspectionRecordPage(map); - Page page = (Page) recordPage.get("page"); + RecordVo recordPage = qualityInspectionRecordService.selectQualityInspectionRecordPage(map); + Page page = recordPage.getPage(); List> listMap = new ArrayList>(); List> records = page.getRecords(); if (CollectionUtils.isEmpty(records)) { diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java index a4706e275..0afe730eb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java @@ -320,7 +320,7 @@ public class WorkerInfo implements Serializable { @ApiModelProperty(value = "人员分类，1普通人员，2外来人员，3其他人员") private java.lang.Integer workerClassify; - @ApiModelProperty(value = "'定位标签号'") + @ApiModelProperty(value = "定位标签号") private java.lang.String locationCardno; @TableField(exist = false) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index ef3d2664a..26b649902 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -9,6 +9,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -256,6 +257,13 @@ public class WorkerInfoServiceImpl extends ServiceImpl 0) { throw new OpenAlertException(MessageUtil.get("existsIDCardErr")); } + String locationCardno = workerInfo.getLocationCardno(); + if (StringUtils.isNotBlank(locationCardno)) { + Integer cardCount = workerInfoMapper.selectCount(new LambdaQueryWrapper().eq(WorkerInfo::getLocationCardno, locationCardno)); + if (cardCount > 0) { + throw new OpenAlertException("定位标签号已存在"); + } + } if (StringUtils.isEmpty(workerInfo.getAttendanceNumber())) { workerInfo.setAttendanceNumber(workerInfo.getIdCard()); } @@ -302,6 +310,13 @@ public class WorkerInfoServiceImpl extends ServiceImpl 0) { throw new OpenAlertException(MessageUtil.get("existsIDCardErr")); } + String locationCardno = workerInfo.getLocationCardno(); + if (StringUtils.isNotBlank(locationCardno)) { + Integer cardCount = workerInfoMapper.selectCount(new LambdaQueryWrapper().eq(WorkerInfo::getLocationCardno, locationCardno).ne(WorkerInfo::getId, workerInfo.getId())); + if (cardCount > 0) { + throw new OpenAlertException("定位标签号已存在"); + } + } if (StringUtils.isEmpty(workerInfo.getAttendanceNumber())) { workerInfo.setAttendanceNumber(workerInfo.getIdCard()); }