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

指挥部大屏评分修改

Browse Source
This commit is contained in:
pengjie 2025-02-21 13:56:17 +08:00
parent ae2ab1023c
commit ce9676eb2b
6 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -995,7 +995,8 @@
<libjars>wflow-server-1.0-SNAPSHOT.jar</libjars>
<code>
<!--鞍钢-->
A31D41A090AA235D29A0DB728D50AEDFD41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E
C4DCB483BDB1243684F938A813AD4761D41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E
<!--A31D41A090AA235D29A0DB728D50AEDFD41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E&lt;!&ndash;-->
<!--中科安信-->
<!--A6F449ECD7E1024F703F37F2294AC8F2D41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E-->
</code>

3
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java
View File

@ -77,7 +77,8 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl<WorkerInfoAudi
public void saveWorkerInfoAuditRecord(WorkerInfoAuditRecord workerInfoAuditRecord) {
QueryWrapper<WorkerInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(WorkerInfo::getProjectSn, workerInfoAuditRecord.getProjectSn())
.eq(WorkerInfo::getIdCard, workerInfoAuditRecord.getIdCard());
.eq(WorkerInfo::getIdCard, workerInfoAuditRecord.getIdCard())
.last(Cts.IGNORE_DATA_SCOPE_CONDITION);
int count = workerInfoService.count(queryWrapper);
if (count > 0) {
throw new OpenAlertException(MessageUtil.get("existsIDCardErr"));

6
src/main/java/com/zhgd/xmgl/modules/xz/controller/SafetyInspectionStandardBigScreenController.java
View File

@ -115,7 +115,7 @@ public class SafetyInspectionStandardBigScreenController {
List<XzSecurityDangerTypeRecord> allTypeRecords = xzSecurityDangerTypeRecordService.list();
List<XzSecurityDangerItemRecord> allItemRecords = xzSecurityDangerItemRecordService.list();
List<XzSecurityQualityInspectionRecordVo> inspectionRecords = xzSecurityQualityInspectionRecordService.selectQualityInspectionRecordPage(new MapBuilder<String, Object>().put("endMonth", month).put("projectSn", projectSn).put("pageSize", -1).build()).getPage().getRecords();
inspectionRecords = inspectionRecords.stream().filter(i -> i.getRecordType() == null || i.getRecordType() != 3 || (i.getRecordType() == 3 && !DateUtil.format(i.getRectifyTime(), "yyyy-MM").equals(month))).collect(Collectors.toList());
inspectionRecords = inspectionRecords.stream().filter(i -> i.getRectifyType() == null || i.getRectifyType() != 3 || (i.getRectifyType() == 3 && !DateUtil.format(i.getRectifyTime(), "yyyy-MM").equals(month))).collect(Collectors.toList());
Map<Integer, List<XzSecurityDangerTypeRecord>> tenTopTypes = allTopTypes.stream().collect(Collectors.groupingBy(XzSecurityDangerTypeRecord::getTenType));
for (Map.Entry<Integer, List<XzSecurityDangerTypeRecord>> tenEntry : tenTopTypes.entrySet()) {
Integer tenType = tenEntry.getKey();
@ -212,7 +212,9 @@ public class SafetyInspectionStandardBigScreenController {
List<XzSecurityDangerTypeRecord> typeRecords = xzSecurityDangerTypeRecordService.list(new LambdaQueryWrapper<XzSecurityDangerTypeRecord>().eq(XzSecurityDangerTypeRecord::getParentId, topType.getId()));
List<Long> typeIds = typeRecords.stream().map(XzSecurityDangerTypeRecord::getId).collect(Collectors.toList());
List<XzSecurityDangerItemRecord> itemRecords = xzSecurityDangerItemRecordService.list(new LambdaQueryWrapper<XzSecurityDangerItemRecord>().in(XzSecurityDangerItemRecord::getDangerTypeId, typeIds));
List<XzSecurityQualityInspectionRecordVo> inspectionRecords = xzSecurityQualityInspectionRecordService.selectQualityInspectionRecordPage(new MapBuilder<String, Object>().put("endMonth", month).put("status", 60).put("projectSn", projectSn).put("pageSize", -1).build()).getPage().getRecords();
// List<XzSecurityQualityInspectionRecordVo> inspectionRecords = xzSecurityQualityInspectionRecordService.selectQualityInspectionRecordPage(new MapBuilder<String, Object>().put("endMonth", month).put("status", 60).put("projectSn", projectSn).put("pageSize", -1).build()).getPage().getRecords();
List<XzSecurityQualityInspectionRecordVo> inspectionRecords = xzSecurityQualityInspectionRecordService.selectQualityInspectionRecordPage(new MapBuilder<String, Object>().put("endMonth", month).put("projectSn", projectSn).put("pageSize", -1).build()).getPage().getRecords();
inspectionRecords = inspectionRecords.stream().filter(i -> i.getRectifyType() == null || i.getRectifyType() != 3 || (i.getRectifyType() == 3 && !DateUtil.format(i.getRectifyTime(), "yyyy-MM").equals(month))).collect(Collectors.toList());
List<SafetyScoreDetail> safetyScoreDetails = new ArrayList<>();
for (XzSecurityDangerTypeRecord typeRecord : typeRecords) {
Long typeId = typeRecord.getId();

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

@ -290,7 +290,7 @@
LEFT join subdivision_project subsection on subsection.id = t.subsection_id
LEFT join subdivision_project subentry on subentry.id = t.subentry_id
LEFT join dangerous_engineering_record der on der.id = t.engineering_id
LEFT JOIN (SELECT quality_id,MAX(rectify_time) as rectifyTime,MAX(rectify_time) as rectifyType FROM xz_security_quality_rectify_record GROUP BY
LEFT JOIN (SELECT quality_id,MAX(rectify_time) as rectifyTime,MAX(type) as rectifyType FROM xz_security_quality_rectify_record GROUP BY
quality_id) r ON r.quality_id = t.id
WHERE t.project_sn = #{param.projectSn}
<if test="param.dangerInfoLevel == '1'.toString() and param.dangerInfoId != null and param.dangerInfoId != ''">
@ -303,7 +303,7 @@
and t.danger_item_id = #{param.dangerInfoId}
</if>
<if test="param.endMonth != null and param.endMonth != '' ">
and DATE_FORMAT(t.inspect_time, '%Y-%m') = #{param.endMonth}
and DATE_FORMAT(t.inspect_time, '%Y-%m') &lt;= concat(#{param.endMonth},'-31 23:59:59')
</if>
<if test="param.recordStatus == '8'.toString() ">
and t.status != 6

5
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyNewController.java
View File

@ -165,6 +165,11 @@ public class XzSpecialOperationFireSafetyNewController {
List<String> homeworkerName = JSONObject.parseObject(JSON.toJSONString(homeworkerArray), List.class);
paramMap.put("homeworkerName", homeworkerName == null ? "" : homeworkerName.stream().collect(Collectors.joining(Cts.COMMA)));
}
JSONArray certificateNoArray = paramMap.getJSONArray("certificateNo");
if (certificateNoArray != null) {
List<String> certificateNo = JSONObject.parseObject(JSON.toJSONString(certificateNoArray), List.class);
paramMap.put("certificateNo", certificateNo == null ? "" : certificateNo.stream().collect(Collectors.joining(Cts.COMMA)));
}
String[] param1 = {"name", "flag"};
JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure");
JSONArray safeMeasure = new JSONArray();

8
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafetyNew.java
View File

@ -57,6 +57,14 @@ public class XzSpecialOperationFireSafetyNew implements Serializable {
@Excel(name = "动火作业人", width = 15)
@ApiModelProperty(value = "动火作业人")
private String homeworkerName;
/**
* 动火作业人证书编号
*/
@Excel(name = "动火作业人证书编号", width = 15)
@ApiModelProperty(value = "动火作业人证书编号")
private String certificateNo;
/**
* 动火监护人
*/