质量bug修复

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();

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<String, Object> qualityCount = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map);
+        QualityInspectionRecordTotalVo qualityCount = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map);
         data.put("qualityCount", qualityCount);
         Integer totalPerson = workerInfoMapper.selectWorkerTotalCount(map);
         Map<String, Object> attendancePerson = workerInfoMapper.selectAttendanceWorkerPersonTypeTotal(map);

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<IPage<LocationTagLowVoltageAlarm>> result = new Result<IPage<LocationTagLowVoltageAlarm>>();
         QueryWrapper<LocationTagLowVoltageAlarm> queryWrapper = QueryGenerator.initQueryWrapper(locationTagLowVoltageAlarm, req.getParameterMap());
+        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(LocationTagLowVoltageAlarm::getCreateTime));
         Page<LocationTagLowVoltageAlarm> page = new Page<LocationTagLowVoltageAlarm>(pageNo, pageSize);
         IPage<LocationTagLowVoltageAlarm> pageList = locationTagLowVoltageAlarmService.page(page, queryWrapper);
         result.setSuccess(true);

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<LocationTunnel> 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<LocationTunnel> edit(@RequestBody LocationTunnel locationTunnel) {
-		locationTunnelService.updateById(locationTunnel);
+        locationTunnelService.edit(locationTunnel);
 		return Result.ok();
 	}
 

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<LocationTunnel> {
 
+    void add(LocationTunnel locationTunnel);
+
+    void edit(LocationTunnel locationTunnel);
 }

src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java

@@ -59,8 +59,10 @@ public class LocationDataServiceImpl extends ServiceImpl<LocationDataMapper, Loc
 
     @Override
     public IPage<LocationData> queryPageList(LocationData locationData, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+        String defaultAlias = "d.";
         QueryWrapper<LocationData> 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<LocationData> page = new Page<LocationData>(pageNo, pageSize);
         IPage<LocationData> pageList = baseMapper.queryPageList(page, queryWrapper);
         return pageList;

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<LocationTunnelMapper, LocationTunnel> implements ILocationTunnelService {
 
+    @Override
+    public void add(LocationTunnel locationTunnel) {
+        String tunnelId = locationTunnel.getTunnelId();
+        Integer cardCount = baseMapper.selectCount(new LambdaQueryWrapper<LocationTunnel>().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<LocationTunnel>().eq(LocationTunnel::getTunnelId, tunnelId)
+                .ne(LocationTunnel::getId, locationTunnel.getId()));
+        if (cardCount > 0) {
+            throw new OpenAlertException("隧道ID已存在");
+        }
+        updateById(locationTunnel);
+    }
 }

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.*;
-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.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<Map<String, Object>> queryPageList(@RequestBody Map<String, Object> map) {
+    public Result<RecordVo> queryPageList(@RequestBody Map<String, Object> map) {
         return Result.success(qualityInspectionRecordService.selectQualityInspectionRecordPage(map));
     }
 

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;
+
+
 }

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;
+
+}

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;
+
+}

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<QualityInspectionRecordVo> page;
+    private QualityInspectionRecordTotalVo total;
+}

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.*;
-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 org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,9 +23,9 @@ public interface QualityInspectionRecordMapper extends BaseMapper<QualityInspect
 
     EntityMap selectQualityInspectionRecordById(Map<String, Object> map);
 
-    List<EntityMap> selectQualityInspectionRecordPage(Page<EntityMap> page, @Param("param") Map<String, Object> map);
+    List<QualityInspectionRecordVo> selectQualityInspectionRecordPage(Page<QualityInspectionRecordVo> page, @Param("param") Map<String, Object> map);
 
-    Map<String, Object> selectQualityInspectionRecordPageTotal(Map<String, Object> map);
+    QualityInspectionRecordTotalVo selectQualityInspectionRecordPageTotal(Map<String, Object> map);
 
     List<Map<String, Object>> selectQualityInspectionRecordCountByDay(Map<String, Object> map);
 

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 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 c ON a.danger_type_id = c.id
-                 LEFT JOIN danger_type_record r ON a.danger_item_id = r.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 d ON a.change_id = d.user_id
-                 LEFT JOIN system_user e ON a.review_id = e.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 f ON a.verify_man_id = f.user_id
-                 LEFT JOIN system_user g ON a.inspect_man_id = g.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 routine_inspect h ON a.routine_id = h.id
         WHERE a.id = #{id}
     </select>
-    <select id="selectQualityInspectionRecordPage" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
+    <select id="selectQualityInspectionRecordPage"
+            resultType="com.zhgd.xmgl.modules.quality.entity.vo.QualityInspectionRecordVo">
         SELECT a.*,
-               b.enterprise_name,
+        b.enterprise_name,
-               c.full_name,
+        c.full_name,
-               d.real_name                                               change_name,
+        d.real_name change_name,
-               e.real_name                                               review_name,
+        e.real_name review_name,
-               en.enterprise_name                                        create_enterprise_name,
+        en.enterprise_name create_enterprise_name,
-               f.real_name                                               verify_man_name,
+        f.real_name verify_man_name,
-               g.real_name                                               inspect_man_name,
+        g.real_name inspect_man_name,
-               h.check_name                                              routine_check_name,
+        h.check_name routine_check_name,
-               (SELECT GROUP_CONCAT(real_name)
+        (SELECT GROUP_CONCAT(real_name)
-                FROM system_user
+        FROM system_user
-                WHERE FIND_IN_SET(system_user.user_id, a.notify_person)) notify_person_name,
+        WHERE FIND_IN_SET(system_user.user_id, a.notify_person)) notify_person_name,
-               subsection.subdivision_project_name                       subsectionName,
+        subsection.subdivision_project_name subsectionName,
-               subentry.subdivision_project_name                         subentryName
+        subentry.subdivision_project_name subentryName,
+        if(a.change_limit_time <![CDATA[<]]> current_date, 1, 0) overTime
         from quality_inspection_record a
-                 LEFT JOIN enterprise_info b ON a.enterprise_sn = b.enterprise_sn
+        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 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 @@
         </if>
         order by a.create_time desc
     </select>
-    <select id="selectQualityInspectionRecordPageTotal" resultType="java.util.Map">
+    <select id="selectQualityInspectionRecordPageTotal"
+            resultType="com.zhgd.xmgl.modules.quality.entity.vo.QualityInspectionRecordTotalVo">
         select tp.*,
-        round(IFNULL(TRUNCATE(IFNULL(closeNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) completeRatio,<!--闭合率-->
+        round(IFNULL(TRUNCATE(IFNULL(closeNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100,
-        round(IFNULL(TRUNCATE(IFNULL(totalNum-rectificationNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2)
+        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,
+        ELSE 0 END)), 0) overdueNotCloseNum,
-               IFNULL(SUM((CASE
+        IFNULL(SUM((CASE
-                               WHEN a.status = 2 AND DATE_FORMAT(now(), "%Y-%m-%d") > a.change_limit_time THEN 1
+        WHEN a.status = 2 AND DATE_FORMAT(now(), "%Y-%m-%d") > a.change_limit_time THEN 1
-                               ELSE 0 END)), 0)                                 overdueRectificationNum,
+        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 = 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 = 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.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 = 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 = 2 THEN 1 ELSE 0 END)), 0) yzUrgentLevelNum,
-               IFNULL(SUM((CASE WHEN a.urgent_level = 3 THEN 1 ELSE 0 END)), 0) jyUrgentLevelNum
+        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}
         <if test="regionId != null and regionId != ''">
@@ -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}
     </select>
@@ -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}
     </select>

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.*;
-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 javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -24,7 +21,7 @@ public interface IQualityInspectionRecordService extends IService<QualityInspect
 
     EntityMap selectQualityInspectionRecordById(Map<String, Object> map);
 
-    Map<String, Object> selectQualityInspectionRecordPage(Map<String, Object> map);
+    RecordVo selectQualityInspectionRecordPage(Map<String, Object> map);
 
     Map<String, Object> selectQualityStatistics(Map<String, Object> map);
 

src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java

@@ -61,8 +61,8 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
     }
 
     @Override
-    public Map<String, Object> selectQualityInspectionRecordPage(Map<String, Object> map) {
+    public RecordVo selectQualityInspectionRecordPage(Map<String, Object> map) {
-        Map<String, Object> data = new HashMap<>();
+        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<QualityInspe
                 map.put("regionId", idList);
             }
         }
-        Page<EntityMap> page = new Page<>(pageNo, pageSize);
+        Page<QualityInspectionRecordVo> page = new Page<>(pageNo, pageSize);
-        List<EntityMap> list = qualityInspectionRecordMapper.selectQualityInspectionRecordPage(page, map);
+        List<QualityInspectionRecordVo> list = qualityInspectionRecordMapper.selectQualityInspectionRecordPage(page, map);
         page.setRecords(list);
-        Map<String, Object> total = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map);
+        QualityInspectionRecordTotalVo total = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map);
-        data.put("page", page);
+        data.setPage(page);
-        data.put("total", total);
+        data.setTotal(total);
         return data;
     }
 
@@ -107,7 +107,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
          */
         Map<String, Object> data = new HashMap<>();
         map.put("recordType", "1");
-        Map<String, Object> total = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map);
+        QualityInspectionRecordTotalVo total = qualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map);
         List<Map<String, Object>> monthList = qualityInspectionRecordMapper.selectQualityInspectionRecordCountByDay(map);
         List<String> dayList = getDayList();
         List<Map<String, Object>> list = new ArrayList<>();
@@ -159,6 +159,9 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
     public void saveQualityInspectionRecord(QualityInspectionRecord qualityInspectionRecord) {
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         qualityInspectionRecord.setCreateTime(df.format(new Date()));
+        if (Objects.equals(qualityInspectionRecord.getRecordType(), 2)) {
+            qualityInspectionRecord.setStatus(5);
+        }
         qualityInspectionRecordMapper.insert(qualityInspectionRecord);
         if (qualityInspectionRecord.getRecordType() == 1 && qualityInspectionRecord.getStatus() == 2) {
             noticeService.addUserNotice(qualityInspectionRecord.getChangeId(), "您有一条质量检查待整改，问题：" + qualityInspectionRecord.getDangerItemContent(), "质量管理待整改", "11");

src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRectifyRecordServiceImpl.java

@@ -16,6 +16,7 @@ import com.zhgd.xmgl.call.SanjiangDataCall;
 import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
 import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
 import com.zhgd.xmgl.modules.quality.entity.QualityRectifyRecord;
+import com.zhgd.xmgl.modules.quality.entity.vo.RecordVo;
 import com.zhgd.xmgl.modules.quality.mapper.QualityInspectionRecordMapper;
 import com.zhgd.xmgl.modules.quality.mapper.QualityRectifyRecordMapper;
 import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService;
@@ -142,8 +143,8 @@ public class QualityRectifyRecordServiceImpl extends ServiceImpl<QualityRectifyR
 
     private List<Map<String, Object>> getRecordMapList(Map<String, Object> map) {
         map.put("pageSize", Integer.MAX_VALUE);
-        Map<String, Object> recordPage = qualityInspectionRecordService.selectQualityInspectionRecordPage(map);
+        RecordVo recordPage = qualityInspectionRecordService.selectQualityInspectionRecordPage(map);
-        Page page = (Page) recordPage.get("page");
+        Page page = recordPage.getPage();
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {

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)

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<WorkerInfoMapper, WorkerI
         if (count > 0) {
             throw new OpenAlertException(MessageUtil.get("existsIDCardErr"));
         }
+        String locationCardno = workerInfo.getLocationCardno();
+        if (StringUtils.isNotBlank(locationCardno)) {
+            Integer cardCount = workerInfoMapper.selectCount(new LambdaQueryWrapper<WorkerInfo>().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<WorkerInfoMapper, WorkerI
         if (count > 0) {
             throw new OpenAlertException(MessageUtil.get("existsIDCardErr"));
         }
+        String locationCardno = workerInfo.getLocationCardno();
+        if (StringUtils.isNotBlank(locationCardno)) {
+            Integer cardCount = workerInfoMapper.selectCount(new LambdaQueryWrapper<WorkerInfo>().eq(WorkerInfo::getLocationCardno, locationCardno).ne(WorkerInfo::getId, workerInfo.getId()));
+            if (cardCount > 0) {
+                throw new OpenAlertException("定位标签号已存在");
+            }
+        }
         if (StringUtils.isEmpty(workerInfo.getAttendanceNumber())) {
             workerInfo.setAttendanceNumber(workerInfo.getIdCard());
         }