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

质量自检

Browse Source
This commit is contained in:
pengjie 2024-04-25 22:07:04 +08:00
parent 13be0e7452
commit 75635fab69
11 changed files with 146 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/inspection/entity/InspectTaskRecord.java
View File

@ -80,4 +80,8 @@ public class InspectTaskRecord implements Serializable {
@ApiModelProperty(value="检查人员userId")
private java.lang.String inspectUser ;
/**1：安全；2：质量*/
@Excel(name = "1：安全；2：质量", width = 15)
@ApiModelProperty(value="1：安全；2：质量")
private java.lang.Integer type ;
}

2
src/main/java/com/zhgd/xmgl/modules/inspection/mapper/xml/InspectTaskItemRecordMapper.xml
View File

@ -4,7 +4,7 @@
<select id="selectInspectTaskItemRecordPage" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT a.*,b.task_name,b.sn,b.start_time,b.end_time,b.frequency_num,b.frequency_type,b.report_type,
b.inspect_remark,b.inspect_user
b.inspect_remark,b.inspect_user,b.id as record_id
from inspect_task_item_record a INNER JOIN inspect_task_record b ON a.task_id=b.id
<where>
<if test="param.taskId!=null and param.taskId!=''">

3
src/main/java/com/zhgd/xmgl/modules/inspection/mapper/xml/InspectTaskRecordMapper.xml
View File

@ -20,6 +20,9 @@
<if test="param.taskName != null and param.taskName != ''">
and a.task_name like concat('%',#{param.taskName},'%')
</if>
<if test="param.type != null and param.type != ''">
and a.type=#{type}
</if>
</select>
<select id="getTodayInfo" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
select count(itr.id) total_num,

44
src/main/java/com/zhgd/xmgl/modules/inspection/service/impl/InspectTaskItemRecordServiceImpl.java
View File

@ -6,10 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord;
import com.zhgd.xmgl.modules.inspection.entity.InspectTaskItemRecord;
import com.zhgd.xmgl.modules.inspection.entity.InspectTaskRecord;
import com.zhgd.xmgl.modules.inspection.mapper.InspectTaskItemRecordMapper;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService;
import com.zhgd.xmgl.modules.inspection.mapper.InspectTaskRecordMapper;
import com.zhgd.xmgl.modules.inspection.service.IInspectTaskItemRecordService;
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -17,6 +21,7 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -29,6 +34,8 @@ import java.util.Map;
@Service
@Transactional(rollbackFor =Exception.class )
public class InspectTaskItemRecordServiceImpl extends ServiceImpl<InspectTaskItemRecordMapper, InspectTaskItemRecord> implements IInspectTaskItemRecordService {
@Autowired
private InspectTaskRecordMapper inspectTaskRecordMapper;
@Autowired
private InspectTaskItemRecordMapper inspectTaskItemRecordMapper;
@Autowired
@ -36,6 +43,9 @@ public class InspectTaskItemRecordServiceImpl extends ServiceImpl<InspectTaskIte
@Autowired
private SystemUserMapper systemUserMapper;
@Autowired
private IQualityInspectionRecordService qualityInspectionRecordService;
@Override
public IPage<EntityMap> selectInspectTaskItemRecordPage(Map<String, Object> map) {
@ -45,9 +55,15 @@ public class InspectTaskItemRecordServiceImpl extends ServiceImpl<InspectTaskIte
List<EntityMap> list=inspectTaskItemRecordMapper.selectInspectTaskItemRecordPage(page, map);
if(list!=null&&list.size()>0){
for (EntityMap data:list){
InspectTaskRecord record = inspectTaskRecordMapper.selectById(data.get("recordId"));
List<String> userList=systemUserMapper.selectUserNameList(MapUtils.getString(data,"inspectUser")) ;
data.put("userList",userList);
Map<String, Object> count = hiddenDangerInspectRecordService.selectDangerInspectCountByItemTask(MapUtils.getLong(data,"id"));
Map<String, Object> count = new HashMap<>();
if (record.getType() == 1) {
count = hiddenDangerInspectRecordService.selectDangerInspectCountByItemTask(MapUtils.getLong(data,"id"));
} else {
count = qualityInspectionRecordService.selectDangerInspectCountByItemTask(MapUtils.getLong(data,"id"));
}
data.put("count",count);
}
}
@ -56,15 +72,27 @@ public class InspectTaskItemRecordServiceImpl extends ServiceImpl<InspectTaskIte
@Override
public void deleteInspectTaskItemRecord(String id) {
InspectTaskItemRecord inspectTaskItemRecord = inspectTaskItemRecordMapper.selectById(id);
InspectTaskRecord inspectTaskRecord = inspectTaskRecordMapper.selectById(inspectTaskItemRecord.getTaskId());
inspectTaskItemRecordMapper.deleteById(id);
QueryWrapper<HiddenDangerInspectRecord> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(HiddenDangerInspectRecord::getItemId,id);
List<HiddenDangerInspectRecord> list=hiddenDangerInspectRecordService.list(queryWrapper);
if(list!=null&& list.size()>0){
for (HiddenDangerInspectRecord record:list){
hiddenDangerInspectRecordService.deleteHiddenDangerInspectRecord(record.getId());
if (inspectTaskRecord.getType() == 1) {
QueryWrapper<HiddenDangerInspectRecord> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(HiddenDangerInspectRecord::getItemId,id);
List<HiddenDangerInspectRecord> list=hiddenDangerInspectRecordService.list(queryWrapper);
if(list!=null&& list.size()>0){
for (HiddenDangerInspectRecord record:list){
hiddenDangerInspectRecordService.deleteHiddenDangerInspectRecord(record.getId());
}
}
} else {
QueryWrapper<QualityInspectionRecord> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(QualityInspectionRecord::getItemId,id);
List<QualityInspectionRecord> list=qualityInspectionRecordService.list(queryWrapper);
if(list!=null&& list.size()>0){
for (QualityInspectionRecord record:list){
qualityInspectionRecordService.deleteQualityInspectionRecord(record.getId().toString());
}
}
}
}
}

38
src/main/java/com/zhgd/xmgl/modules/inspection/service/impl/InspectTaskRecordServiceImpl.java
View File

@ -14,6 +14,8 @@ import com.zhgd.xmgl.modules.inspection.entity.InspectTaskRecord;
import com.zhgd.xmgl.modules.inspection.mapper.InspectTaskItemRecordMapper;
import com.zhgd.xmgl.modules.inspection.mapper.InspectTaskRecordMapper;
import com.zhgd.xmgl.modules.inspection.service.IInspectTaskRecordService;
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService;
import com.zhgd.xmgl.util.DateUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
@ -22,6 +24,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -41,6 +44,9 @@ public class InspectTaskRecordServiceImpl extends ServiceImpl<InspectTaskRecordM
@Autowired
private IHiddenDangerInspectRecordService hiddenDangerInspectRecordService;
@Autowired
private IQualityInspectionRecordService qualityInspectionRecordService;
@Override
public void saveInspectTaskRecord(InspectTaskRecord inspectTaskRecord) {
if (inspectTaskRecord.getFrequencyType() == null) {
@ -112,18 +118,31 @@ public class InspectTaskRecordServiceImpl extends ServiceImpl<InspectTaskRecordM
@Override
public void deleteInspectTaskRecord(String id) {
InspectTaskRecord inspectTaskRecord = inspectTaskRecordMapper.selectById(id);
inspectTaskRecordMapper.deleteById(id);
QueryWrapper<InspectTaskItemRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(InspectTaskItemRecord::getTaskId, id);
inspectTaskItemRecordMapper.delete(queryWrapper);
QueryWrapper<HiddenDangerInspectRecord> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(HiddenDangerInspectRecord::getTaskId, id);
List<HiddenDangerInspectRecord> list = hiddenDangerInspectRecordService.list(queryWrapper1);
if (list != null && list.size() > 0) {
for (HiddenDangerInspectRecord inspectRecord : list) {
hiddenDangerInspectRecordService.deleteHiddenDangerInspectRecord(inspectRecord.getId());
if (inspectTaskRecord.getType() == 1) {
QueryWrapper<HiddenDangerInspectRecord> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(HiddenDangerInspectRecord::getTaskId, id);
List<HiddenDangerInspectRecord> list = hiddenDangerInspectRecordService.list(queryWrapper1);
if (list != null && list.size() > 0) {
for (HiddenDangerInspectRecord inspectRecord : list) {
hiddenDangerInspectRecordService.deleteHiddenDangerInspectRecord(inspectRecord.getId());
}
}
} else {
QueryWrapper<QualityInspectionRecord> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(QualityInspectionRecord::getTaskId, id);
List<QualityInspectionRecord> list = qualityInspectionRecordService.list(queryWrapper1);
if (list != null && list.size() > 0) {
for (QualityInspectionRecord inspectRecord : list) {
qualityInspectionRecordService.deleteQualityInspectionRecord(inspectRecord.getId().toString());
}
}
}
}
@Override
@ -134,7 +153,12 @@ public class InspectTaskRecordServiceImpl extends ServiceImpl<InspectTaskRecordM
List<EntityMap> list = inspectTaskRecordMapper.selectInspectTaskRecordPage(page, map);
if (list != null && list.size() > 0) {
for (EntityMap data : list) {
Map<String, Object> count = hiddenDangerInspectRecordService.selectDangerInspectCountByTask(MapUtils.getLong(data, "id"));
Map<String, Object> count = new HashMap<>();
if (MapUtils.getInteger(map, "type") == 1) {
count = hiddenDangerInspectRecordService.selectDangerInspectCountByTask(MapUtils.getLong(data, "id"));
} else {
count = qualityInspectionRecordService.selectDangerInspectCountByTask(MapUtils.getLong(data, "id"));
}
data.put("count", count);
}
}

7
src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java
View File

@ -50,6 +50,7 @@ public class QualityInspectionRecordController {
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "regionId", value = "检查部位ID", paramType = "body", required = false, dataType = "String"),
@ApiImplicitParam(name = "itemId", value = "子任务ID", paramType = "body", required = false, dataType = "String"),
@ApiImplicitParam(name = "status", value = "状态，1无需整改，2待整改，3待复查，4待核验，5合格，6不合格，7超期未关闭", paramType = "body", required = false, dataType = "String"),
@ApiImplicitParam(name = "recordStatus", value = "查询类型，1排查记录，2已闭合，3未闭合，4超期未关闭，5待整改，6待复查，7待核验", paramType = "body", required = false, dataType = "String"),
@ApiImplicitParam(name = "urgentLevel", value = "紧急程度，1一般，2严重，3紧要", paramType = "body", required = false, dataType = "String"),
@ -86,6 +87,12 @@ public class QualityInspectionRecordController {
return Result.success(qualityInspectionRecordService.getRectificationAndNoNum(projectSn));
}
@ApiOperation(value = "项目自检检查任务统计", notes = "项目自检检查任务统计", httpMethod = "POST")
@ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "body", required = true, dataType = "Integer")
@PostMapping(value = "/selectInspectTaskCount")
public Result<Map<String, Object>> selectInspectTaskCount(@RequestBody Map<String, Object> map) {
return Result.success(qualityInspectionRecordService.selectInspectTaskCount(map));
}
/**
* 获取质量巡检今日和所有数据

12
src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java
View File

@ -204,6 +204,18 @@ public class QualityInspectionRecord implements Serializable {
@Excel(name = "项目sn", width = 15)
@ApiModelProperty(value = "项目sn")
private java.lang.String projectSn;
/**
* 任务ID
*/
@Excel(name = "任务ID", width = 15)
@ApiModelProperty(value = "任务ID")
private java.lang.Long taskId;
/**
* 子任务ID
*/
@Excel(name = "子任务ID", width = 15)
@ApiModelProperty(value = "子任务ID")
private java.lang.Long itemId;
/**
* 分部工程id
*/

6
src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java
View File

@ -34,8 +34,14 @@ public interface QualityInspectionRecordMapper extends BaseMapper<QualityInspect
List<Map<String, Object>> selectDangerTypeQualityCount(Map<String, Object> map);
Map<String, Object> selectInspectTaskCount(Map<String, Object> map);
Map<String, Object> selectDangerInspectCountByTask(@Param("taskId") Long taskId);
List<EntityMap> selectPersonChargeQualityInspectionCountList(Map<String, Object> map);
Map<String, Object> selectDangerInspectCountByItemTask(@Param("itemId") Long itemId);
List<EntityMap> selectExportExcelQualityInspectionRecordList(Map<String, Object> map);
EntityMap getRectificationAndNoNum(@Param("projectSn") String projectSn);

25
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
View File

@ -144,6 +144,9 @@
or a.remark like concat('%', #{param.search}, '%')
)
</if>
<if test="param.itemId != null and param.itemId != ''">
and a.item_id = #{param.itemId}
</if>
order by a.inspect_time desc, a.id desc
</select>
<select id="selectQualityInspectionRecordPageTotal"
@ -231,6 +234,9 @@
or a.remark like concat('%', #{search}, '%')
)
</if>
<if test="itemId != null and itemId != ''">
and a.item_id = #{itemId}
</if>
) tp
</select>
<select id="selectQualityInspectionRecordCountByDay" resultType="java.util.Map" parameterType="java.util.Map">
@ -269,6 +275,25 @@
LIMIT 10
</if>
</select>
<select id="selectInspectTaskCount" resultType="java.util.Map">
SELECT IFNULL(SUM((CASE WHEN status = 1 or status = 4 THEN 1 ELSE 0 END)), 0) closeNum,
IFNULL(SUM((CASE WHEN status = 2 THEN 1 ELSE 0 END)), 0) rectifyNum,
IFNULL(SUM((CASE WHEN status = 3 THEN 1 ELSE 0 END)), 0) reviewNum
from quality_inspection_record
WHERE task_id = #{taskId}
</select>
<select id="selectDangerInspectCountByTask" resultType="java.util.Map">
SELECT COUNT(1) inspectNum,
IFNULL(SUM((CASE WHEN status = 1 or status = 4 THEN 0 ELSE 1 END)), 0) notEndNum
from quality_inspection_record
where task_id = #{taskId}
</select>
<select id="selectDangerInspectCountByItemTask" resultType="java.util.Map">
SELECT COUNT(1) inspectNum,
IFNULL(SUM((CASE WHEN status = 1 or status = 4 THEN 0 ELSE 1 END)), 0) notEndNum
from quality_inspection_record
where item_id = #{itemId}
</select>
<select id="selectPersonChargeQualityInspectionCountList"
resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT a.inspect_man_id, d.real_name inspect_man_name, COUNT(1) num

6
src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java
View File

@ -32,6 +32,12 @@ public interface IQualityInspectionRecordService extends IService<QualityInspect
void deleteQualityInspectionRecord(String id);
Map<String, Object> selectInspectTaskCount(Map<String, Object> map);
Map<String, Object> selectDangerInspectCountByTask(Long taskId);
Map<String, Object> selectDangerInspectCountByItemTask(Long itemId);
List<EntityMap> selectPersonChargeQualityInspectionCountList(Map<String, Object> map);
void saveQualityInspectionRecord(QualityInspectionRecord qualityInspectionRecord);

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

@ -182,11 +182,26 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
qualityRectifyRecordMapper.delete(qu);
}
@Override
public Map<String, Object> selectInspectTaskCount(Map<String, Object> map) {
return qualityInspectionRecordMapper.selectInspectTaskCount(map);
}
@Override
public Map<String, Object> selectDangerInspectCountByTask(Long taskId) {
return qualityInspectionRecordMapper.selectDangerInspectCountByTask(taskId);
}
@Override
public List<EntityMap> selectPersonChargeQualityInspectionCountList(Map<String, Object> map) {
return qualityInspectionRecordMapper.selectPersonChargeQualityInspectionCountList(map);
}
@Override
public Map<String, Object> selectDangerInspectCountByItemTask(Long itemId) {
return qualityInspectionRecordMapper.selectDangerInspectCountByItemTask(itemId);
}
@Override
public void saveQualityInspectionRecord(QualityInspectionRecord qualityInspectionRecord) {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");