|
@@ -9,9 +9,13 @@ import com.ruoyi.common.core.redis.RedisCache;
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
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.projectV2.*;
|
|
|
import com.ruoyi.system.domain.projectV2.Vo.ZpVo;
|
|
|
+import com.ruoyi.system.domain.projectV2.common.SendSmsConfig;
|
|
|
import com.ruoyi.system.mapper.projectV2.*;
|
|
|
+import com.ruoyi.system.service.ISysUserService;
|
|
|
import com.ruoyi.system.service.projectV2.IZsyzProjectDeptService;
|
|
|
import com.ruoyi.system.service.projectV2.IZsyzSbbzbService;
|
|
|
import com.ruoyi.system.service.projectV2.IZsyzShyjService;
|
|
@@ -58,6 +62,8 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
|
|
|
@Autowired
|
|
|
private ZsyzLcjlMapper zsyzLcjlMapper;
|
|
|
+ @Autowired
|
|
|
+ private ISysUserService sysUserService;
|
|
|
|
|
|
|
|
|
|
|
@@ -181,9 +187,11 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
|
|
|
zsyzSbbzb.setProgress(ONE);
|
|
|
zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
|
|
|
+
|
|
|
+ projectDeptService.deleteZsyzProjectDeptByXmId(zsyzShyj.getXmId());
|
|
|
}
|
|
|
}
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
|
|
|
zsyzSbbzb.setXmStatus(TWO);
|
|
|
}
|
|
@@ -202,6 +210,8 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
zsyzSbbzb.setProgress(ONE);
|
|
|
zsyzSbbzb.setXmStatus(TWO);
|
|
|
zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
|
|
|
+
|
|
|
+ projectDeptService.deleteZsyzProjectDeptByXmId(zsyzShyj.getXmId());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -293,8 +303,18 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
|
|
|
if (TWO.equals(zsyzProjectDeptsCjd.get(0).getShjg())) {
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+ zsyzSbbzb.setProgress(TWO);
|
|
|
zsyzSbbzb.setXmStatus(TWO);
|
|
|
+ zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
|
|
|
+ } else if (THR.equals(zsyzProjectDeptsCjd.get(0).getShjg())) {
|
|
|
+
|
|
|
+
|
|
|
+ zsyzSbbzb.setProgress(ONE);
|
|
|
+ zsyzSbbzb.setXmStatus(TWO);
|
|
|
+ zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
|
|
|
+
|
|
|
+ projectDeptService.deleteZsyzProjectDeptByXmId(zsyzShyj.getXmId());
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
@@ -303,15 +323,23 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
|
|
|
Map<String, List<ZsyzProjectDept>> collect = zsyzProjectDeptsYsbm.stream().collect(Collectors.groupingBy(ZsyzProjectDept::getIsHf));
|
|
|
List<ZsyzProjectDept> yList = collect.get("Y");
|
|
|
- if (yList != null && (zsyzProjectDeptsYsbm.size()-1) == yList.size()) {
|
|
|
+ if (yList != null && (zsyzProjectDeptsYsbm.size() - 1) == yList.size()) {
|
|
|
Map<String, List<ZsyzProjectDept>> shjpMap = yList.stream().collect(Collectors.groupingBy(ZsyzProjectDept::getShjg));
|
|
|
|
|
|
if (shjpMap != null && shjpMap.size() == 1 && shjpMap.get(TWO) != null) {
|
|
|
|
|
|
if (TWO.equals(zsyzProjectDeptsCjd.get(0).getShjg())) {
|
|
|
-
|
|
|
+
|
|
|
zsyzSbbzb.setProgress(TWO);
|
|
|
zsyzSbbzb.setXmStatus(TWO);
|
|
|
+ } else if (THR.equals(zsyzProjectDeptsCjd.get(0).getShjg())) {
|
|
|
+
|
|
|
+
|
|
|
+ zsyzSbbzb.setProgress(ONE);
|
|
|
+ zsyzSbbzb.setXmStatus(TWO);
|
|
|
+ zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
|
|
|
+
|
|
|
+ projectDeptService.deleteZsyzProjectDeptByXmId(zsyzShyj.getXmId());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -333,19 +361,24 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
|
|
|
zsyzSbbzb.setProgress(ONE);
|
|
|
zsyzSbbzb.setXmStatus(TWO);
|
|
|
+
|
|
|
+ projectDeptService.deleteZsyzProjectDeptByXmId(zsyzShyj.getXmId());
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- Map<String, List<ZsyzProjectDept>> collect = zsyzProjectDeptsYsbm.stream().collect(Collectors.groupingBy(ZsyzProjectDept::getIsHf));
|
|
|
- List<ZsyzProjectDept> yList = collect.get("Y");
|
|
|
- if (yList != null && (zsyzProjectDeptsYsbm.size() -1 )== yList.size()) {
|
|
|
-
|
|
|
-
|
|
|
- if (THR.equals(zsyzProjectDeptsCjd.get(0).getShjg())) {
|
|
|
-
|
|
|
-
|
|
|
- zsyzSbbzb.setProgress(ONE);
|
|
|
- zsyzSbbzb.setXmStatus(TWO);
|
|
|
+ } else {
|
|
|
+
|
|
|
+ Map<String, List<ZsyzProjectDept>> collect = zsyzProjectDeptsYsbm.stream().collect(Collectors.groupingBy(ZsyzProjectDept::getIsHf));
|
|
|
+ List<ZsyzProjectDept> yList = collect.get("Y");
|
|
|
+ if (yList != null && (zsyzProjectDeptsYsbm.size() - 1) == yList.size()) {
|
|
|
+
|
|
|
+
|
|
|
+ if ("Y".equals(zsyzProjectDeptsCjd.get(0).getIsHf())) {
|
|
|
+
|
|
|
+ zsyzSbbzb.setProgress(ONE);
|
|
|
+ zsyzSbbzb.setXmStatus(TWO);
|
|
|
+
|
|
|
+ projectDeptService.deleteZsyzProjectDeptByXmId(zsyzShyj.getXmId());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -585,6 +618,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
}
|
|
|
|
|
|
projectDeptService.deleteZsyzProjectDeptByXmId(cjdList.get(0).getXmId());
|
|
|
+ List<SendSmsConfig> sendSmsConfigs = new ArrayList<>();
|
|
|
for (ZsyzProjectDept zsyzProjectDept : cjdList) {
|
|
|
zsyzProjectDept.setDeptType(ONE);
|
|
|
|
|
@@ -596,20 +630,50 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
zsyzSbbzbCjd.setCjdName(zsyzProjectDept.getDeptName());
|
|
|
zsyzSbbzbCjd.setProgress(TWO);
|
|
|
zsyzSbbzbCjd.setXmStatus(ONE);
|
|
|
+
|
|
|
+ List<SysUser> sysUsers = sysUserService.selectUserByDeptId(zsyzProjectDept.getDeptId());
|
|
|
+ if (sysUsers != null) {
|
|
|
+ for (SysUser sysUser : sysUsers) {
|
|
|
+ if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
|
|
|
+ SendSmsConfig sendSmsConfig = new SendSmsConfig();
|
|
|
+ sendSmsConfig.setPhone(sysUser.getPhonenumber());
|
|
|
+ sendSmsConfigs.add(sendSmsConfig);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (sendSmsConfigs.size() > 0) {
|
|
|
+ AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs, "SMS_271465081"));
|
|
|
+ }
|
|
|
+ }
|
|
|
zsyzSbbzbMapper.updateZsyzSbbzbCjd(zsyzSbbzbCjd);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
List<ZsyzProjectDept> ysbmList = zpVo.getYsbmList();
|
|
|
if (ysbmList != null) {
|
|
|
+ List<SendSmsConfig> sendSmsConfigs = new ArrayList<>();
|
|
|
for (ZsyzProjectDept zsyzProjectDept : ysbmList) {
|
|
|
zsyzProjectDept.setDeptType(TWO);
|
|
|
projectDeptService.insertZsyzProjectDept(zsyzProjectDept);
|
|
|
+
|
|
|
+ List<SysUser> sysUsers = sysUserService.selectUserByDeptId(zsyzProjectDept.getDeptId());
|
|
|
+ if (sysUsers != null) {
|
|
|
+ for (SysUser sysUser : sysUsers) {
|
|
|
+ if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
|
|
|
+ SendSmsConfig sendSmsConfig = new SendSmsConfig();
|
|
|
+ sendSmsConfig.setPhone(sysUser.getPhonenumber());
|
|
|
+ sendSmsConfigs.add(sendSmsConfig);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (sendSmsConfigs.size() > 0) {
|
|
|
+ AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs, "SMS_271465081"));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
List<ZsyzProjectDept> yqdwList = zpVo.getYjdwList();
|
|
|
if (yqdwList != null) {
|
|
|
+ List<SendSmsConfig> sendSmsConfigs = new ArrayList<>();
|
|
|
for (ZsyzProjectDept zsyzProjectDept : yqdwList) {
|
|
|
zsyzProjectDept.setDeptType(THR);
|
|
|
projectDeptService.insertZsyzProjectDept(zsyzProjectDept);
|