From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 970e102..d822729 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -24,7 +24,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
-import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
@@ -46,9 +45,9 @@
import org.springblade.modules.task.mapper.TaskMapper;
import org.springblade.modules.task.service.*;
import org.springblade.modules.task.vo.TaskVO;
-import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
-import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
-import org.springblade.modules.taskPlaceSelfCheck.service.ITaskPlaceSelfCheckService;
+import org.springblade.modules.task.service.ITaskPlaceRectificationService;
+import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
+import org.springblade.modules.task.service.ITaskPlaceSelfCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -246,6 +245,8 @@
Integer xfzc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, 1);
// 消防隐患整改
Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, 1);
+ // 居住证申请
+ Integer jzzsq = SpringUtils.getBean(ITaskResidencePermitApplyService.class).getCount(neiCode, 1);
// 设置
objectObjectHashMap.put("qbhs", qbhs);// 取保候审
objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
@@ -256,6 +257,7 @@
objectObjectHashMap.put("zfrw", zfrw);// 走访日志
objectObjectHashMap.put("xfzc", xfzc);// 消防自查
objectObjectHashMap.put("xfyhzg", xfyhzg);// 消防隐患整改
+ objectObjectHashMap.put("jzzsq", jzzsq);// 居住证申请
return objectObjectHashMap;
}
--
Gitblit v1.9.3