From 0271719bce3d6be197eab2e143e478dbf010b8a8 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 04 Sep 2024 10:53:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
index 617011c..67d1f95 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
@@ -3,12 +3,14 @@
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
+import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.constant.BaseConsts;
import cn.huge.module.ctuser.dao.mapper.CtUnitMapper;
import cn.huge.module.ctuser.domain.po.CtDept;
import cn.huge.module.ctuser.domain.po.CtUnit;
import cn.huge.module.ctuser.domain.po.CtUser;
+import cn.huge.module.ctuser.dto.CtUnitWeChatCountDTO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections.CollectionUtils;
@@ -21,10 +23,7 @@
import org.springframework.data.domain.PageRequest;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -133,6 +132,9 @@
if (IdUtils.checkNewId(ctUnit.getId())){
ctUnit.setId(utilsClient.getNewTimeId());
ctUnit.setCreateTime(nowDate);
+ }else {
+ // 1、更新单位信息时，更新调度规则指标目标组织名称
+ mapper.updateDispNormCauseTargetUnitName(ctUnit.getUnitName(), ctUnit.getId());
}
ctUnit.setUpdateTime(nowDate);
this.saveOrUpdate(ctUnit);
@@ -271,4 +273,27 @@
public void updateTerms(CtUnit ctUnit) {
mapper.updateTerms(ctUnit);
}
+
+ /**
+ * 小程序统计机构数量
+ * */
+ public CtUnitWeChatCountDTO wechatCountUnit(){
+ CtUnitWeChatCountDTO ctUnitWeChatCountDTO = new CtUnitWeChatCountDTO();
+ QueryWrapper<CtUnit> unitQueryWrapper = new QueryWrapper<>();
+ unitQueryWrapper.eq("unit_type", 1);
+ Integer zzUnitNum = mapper.selectCount(unitQueryWrapper);
+ if(ObjectUtils.isEmpty(zzUnitNum)){
+ zzUnitNum = 0;
+ }
+ ctUnitWeChatCountDTO.setZzUnitNum(zzUnitNum);
+ List<Integer> unitTypeList = Arrays.asList(2,3,4,5);
+ QueryWrapper<CtUnit> unitQueryWrapper1 = new QueryWrapper<>();
+ unitQueryWrapper1.in("unit_type", unitTypeList);
+ Integer tzUnitNum = mapper.selectCount(unitQueryWrapper1);
+ if(ObjectUtils.isEmpty(tzUnitNum)){
+ tzUnitNum = 0;
+ }
+ ctUnitWeChatCountDTO.setTzUnitNum(tzUnitNum);
+ return ctUnitWeChatCountDTO;
+ }
}
--
Gitblit v1.8.0