From d5e3cdd20b05c8a1856eafb1e1d022ed9e04200b Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 20 九月 2023 16:05:41 +0800
Subject: [PATCH] 删除整改状态，允许自选验收时间
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java | 1 +
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 3 ++-
src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java | 5 +++--
src/main/java/com/ruoyi/doublePrevention/scheduls/DateSchedule.java | 21 ++++++++++++---------
src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java | 2 +-
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java | 4 ++--
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 1 +
src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html | 6 +-----
8 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/DateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/DateSchedule.java
index e56da89..742423a 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/DateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/DateSchedule.java
@@ -159,7 +159,7 @@
-
+//
// logger.info("任务数据重置");
//
// /**
@@ -210,11 +210,11 @@
// //封装上报昌吉州任务配置数据
// CJTaskFromWork.setId(work.getJobUuid());
// CJTaskFromWork.setCompanyCode(companyCode);
-// if (work.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
-// CJTaskFromWork.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
-// }else {
-// CJTaskFromWork.setDeleted("0");
-// }
+//// if (work.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+//// CJTaskFromWork.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+//// }else {
+//// CJTaskFromWork.setDeleted("0");
+//// }
// CJTaskFromWork.setCreateBy(createUser.getUserName());
// CJTaskFromWork.setCreateDate(jobById.getCreateTime());
// if (ObjectUtils.isEmpty(updateUser)){
@@ -224,7 +224,10 @@
// CJTaskFromWork.setUpdateBy(updateUser.getUserName());
// CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
// }
-// CJTaskFromWork.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+//
+// CJTaskFromWork.setReportStatus((byte) 77);
+// CJTaskFromWork.setDeleted("2");//
+//
// CJTaskFromWork.setReportTime(null);
// CJTaskFromWork.setDataSource((byte) 1);
// CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());
@@ -264,7 +267,7 @@
// }else {
// logger.info("任务配置数据上报已关闭");
// }
-
-
+//
+//
}
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
index 78eee97..427c11e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
@@ -96,7 +96,7 @@
// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
- @Scheduled(cron = "0 0/20 * * * ? ") // 分钟
+// @Scheduled(cron = "0 0/20 * * * ? ") // 分钟
// @Scheduled(cron = "0/30 * * * * ?")
public void execReportDateSchedule() throws UnsupportedEncodingException {
logger.info("【####】上报数据开始...");
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index af3543b..ccf55db 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -109,7 +109,7 @@
@Transactional
// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
// @Scheduled(cron = "0/30 * * * * ?") // 30秒
- @Scheduled(cron = "0 0/30 * * * ? ") // 分钟
+// @Scheduled(cron = "0 0/30 * * * ? ") // 分钟
public void searchReportDate(){
logger.info("【双重预防】定时检索需要上报数据...");
@@ -305,6 +305,7 @@
CJReportMeasure.setRiskMeasureId(measure.getId());
CJReportMeasure.setTroubleshootContent(measure.getCheckContent());
+
//封装数据
CJMeasureLists.add(CJReportMeasure);
//设置原始数据上报状态
diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
index 24c379c..3a5a5c3 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
@@ -285,18 +285,19 @@
return ApiResult.errorToken("验证userId,loginName,token,deviceType,deviceId,appType 不一致");
}
try {
+ new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
hdcp.setUpdateBy(header.loginName);
hdcp.setUpdateTime(DateUtils.getNowDate());
if (!StringUtils.isEmpty(hdcp.getAcceptResult())) {
//验收结果 (0不通过 打回上一级整改阶段 1通过)
if ("0".equals(hdcp.getAcceptResult())) {
- hdcp.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
+ hdcp.setAcceptCreateTime(hdcp.getAcceptCreateTime());//设置验收时间
hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_RECTIFY);//隐患整改阶段(数据进入到隐患整改阶段)
hdcp.setRectifyStatus(TrHiddenDangerCheckConstants.RECTIFY_STATUS_NOT_RECTIFY);//整改状态(未整改)
hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_NOT_PASS);//验收状态(验收未通过)
} else if ("1".equals(hdcp.getAcceptResult())) {
- hdcp.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
+ hdcp.setAcceptCreateTime(hdcp.getAcceptCreateTime());//设置验收时间
hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_PASS);//验收状态(验收通过)
}
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java
index 4edeb2d..730d33a 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java
@@ -84,12 +84,12 @@
if (!StringUtils.isEmpty(hiddenDangerCheckPoint.getAcceptResult())) {
//验收结果 (0不通过 打回上一级整改阶段 1通过)
if ("0".equals(hiddenDangerCheckPoint.getAcceptResult())) {
- hiddenDangerCheckPoint.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
+ hiddenDangerCheckPoint.setAcceptCreateTime(hiddenDangerCheckPoint.getAcceptCreateTime());//设置验收时间 todo 改为使用前端传输的时间
hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_RECTIFY);//隐患整改阶段(数据进入到隐患整改阶段)
hiddenDangerCheckPoint.setRectifyStatus(TrHiddenDangerCheckConstants.RECTIFY_STATUS_NOT_RECTIFY);//整改状态(未整改)
hiddenDangerCheckPoint.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_NOT_PASS);//验收状态(验收未通过)
} else if ("1".equals(hiddenDangerCheckPoint.getAcceptResult())) {
- hiddenDangerCheckPoint.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
+ hiddenDangerCheckPoint.setAcceptCreateTime(hiddenDangerCheckPoint.getAcceptCreateTime());
hiddenDangerCheckPoint.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_PASS);//验收状态(验收通过)
}
}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
index 1411f34..9b7cab3 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
@@ -361,6 +361,7 @@
} else if (("超期改").equals(rectifyStatusLedger)) {
hiddenDangerCheckPoint.setStage("5");
hiddenDangerCheckPoint.setOverdueRectify("1");
+// hiddenDangerCheckPoint.setAcceptStatus("1");
}
}
//整改部门
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
index bdfd3fd..0839131 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
@@ -347,6 +347,7 @@
/** 验收创建时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "验收创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date acceptCreateTime;
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
index 806f425..152d57c 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerLedger/dangerLedger.html
@@ -268,11 +268,7 @@
label = "验收未通过";
}
}
- if (compareDate(item.rectifyDeadlineTime, item.rectifyCompleteTime)) {
- label += "（按期改）";
- } else {
- label += "（超期改）";
- }
+
}
}
return label;
--
Gitblit v1.9.2