|
@@ -385,7 +385,6 @@ public class ContractLogController extends BladeController {
|
|
|
|
|
|
this.operationLogClient.saveUserOperationLog(9, "台账日志", "日志填报", json);
|
|
|
|
|
|
-
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -418,7 +417,7 @@ public class ContractLogController extends BladeController {
|
|
|
if (messageList.size() > 0) {
|
|
|
this.messageWarningClient.savePushUserMessageWarning(messageList);
|
|
|
|
|
|
- //通过WebSocket推送数量条数
|
|
|
+ //通过WebSocket推送数量条数 给上报任务人
|
|
|
for (MessageWarning messageWarning : messageList) {
|
|
|
if (ObjectUtil.isNotEmpty(messageWarning.getProjectId()) && ObjectUtil.isNotEmpty(messageWarning.getContractId()) && ObjectUtil.isNotEmpty(messageWarning.getPushUser())) {
|
|
|
Map<String, String> stringMap = iTaskService.getTaskCount(messageWarning.getProjectId().toString(), messageWarning.getContractId().toString(), messageWarning.getPushUser().toString());
|
|
@@ -430,6 +429,19 @@ public class ContractLogController extends BladeController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ //通过WebSocket推送数量条数 给日志记录人
|
|
|
+ List<ContractLog> logs = contractLogService.getBaseMapper().selectList(Wrappers.<ContractLog>lambdaQuery().in(ContractLog::getId, ids));
|
|
|
+ for (ContractLog log : logs) {
|
|
|
+ if (ObjectUtil.isNotEmpty(log.getProjectId()) && ObjectUtil.isNotEmpty(log.getContractId()) && ObjectUtil.isNotEmpty(log.getCreateUser())) {
|
|
|
+ Map<String, String> stringMap = iTaskService.getTaskCount(log.getProjectId().toString(), log.getContractId().toString(), log.getCreateUser().toString());
|
|
|
+ try {
|
|
|
+ webSocket.sendMessageByUserId(log.getCreateUser().toString(), JSON.toJSONString(stringMap));
|
|
|
+ } catch (IOException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|