|
|
@@ -1,8 +1,5 @@
|
|
|
package com.ruoyi.framework.web.service.projectV2;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
import com.ruoyi.common.core.domain.entity.SysRole;
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
@@ -10,20 +7,21 @@ import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.framework.manager.AsyncManager;
|
|
|
import com.ruoyi.framework.manager.factory.AsyncFactory;
|
|
|
-import com.ruoyi.system.domain.fgw.FgwLdps;
|
|
|
-import com.ruoyi.system.domain.fgw.FgwXmsb;
|
|
|
-import com.ruoyi.system.domain.projectV2.ZsyzDbd;
|
|
|
+import com.ruoyi.system.domain.projectV2.ZsyzLdps;
|
|
|
import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
|
|
|
import com.ruoyi.system.domain.projectV2.common.SendSmsConfig;
|
|
|
import com.ruoyi.system.mapper.SysUserMapper;
|
|
|
+import com.ruoyi.system.mapper.projectV2.ZsyzLdpsMapper;
|
|
|
import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
|
|
|
+import com.ruoyi.system.service.projectV2.IZsyzLdpsService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import com.ruoyi.system.mapper.projectV2.ZsyzLdpsMapper;
|
|
|
-import com.ruoyi.system.domain.projectV2.ZsyzLdps;
|
|
|
-import com.ruoyi.system.service.projectV2.IZsyzLdpsService;
|
|
|
|
|
|
-import static com.ruoyi.common.constant.CommonConstants.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
+
|
|
|
+import static com.ruoyi.common.constant.CommonConstants.LEADER;
|
|
|
+import static com.ruoyi.common.constant.CommonConstants.ONE;
|
|
|
|
|
|
/**
|
|
|
* 招商引资_领导批示Service业务层处理
|
|
|
@@ -94,7 +92,7 @@ public class ZsyzLdpsServiceImpl implements IZsyzLdpsService
|
|
|
zsyzLdps.setPsnrId(user.getUserId());
|
|
|
zsyzLdps.setXgsj(DateUtils.getNowDate());
|
|
|
zsyzLdps.setCjsj(DateUtils.getNowDate());
|
|
|
- if(!"1".equals(zsyzLdps.getType())){
|
|
|
+ if(!ONE.equals(zsyzLdps.getType())){
|
|
|
//修改主表中的领导批示内容
|
|
|
ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
|
|
|
zsyzSbbzb.setId(zsyzLdps.getXmId());
|
|
|
@@ -112,9 +110,19 @@ public class ZsyzLdpsServiceImpl implements IZsyzLdpsService
|
|
|
sysUsers.addAll(sysUserList);
|
|
|
}
|
|
|
//查询申请人部门所有人都发
|
|
|
- List<SysUser> sysUserSqr = sysUserMapper.selectUserByDeptId(zsyzSbbzbs.getDeptId());
|
|
|
- sysUsers.addAll(sysUserSqr);
|
|
|
- if(sysUsers!=null && sysUsers.size()>0){
|
|
|
+ Long deptId = zsyzSbbzbs.getDeptId();
|
|
|
+ if (100 != deptId){
|
|
|
+ List<SysUser> sysUserSqr = sysUserMapper.selectUserByDeptId(deptId);
|
|
|
+ sysUsers.addAll(sysUserSqr);
|
|
|
+ //给招商中心所有人发
|
|
|
+ List<SysUser> sysUserSqrZ = sysUserMapper.selectUserByDeptId(100L);
|
|
|
+ sysUsers.addAll(sysUserSqrZ);
|
|
|
+ }else {
|
|
|
+ //给招商中心所有人发
|
|
|
+ List<SysUser> sysUserSqr = sysUserMapper.selectUserByDeptId(deptId);
|
|
|
+ sysUsers.addAll(sysUserSqr);
|
|
|
+ }
|
|
|
+ if(sysUsers.size()>0){
|
|
|
for (SysUser sysUser : sysUsers) {
|
|
|
if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
|
|
|
SendSmsConfig sendSmsConfig = new SendSmsConfig();
|
tjf