|
|
@@ -52,7 +52,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
|
|
|
if (StringUtils.isNotBlank(TokenManager.getAdminId())) {
|
|
|
bp.setCreateId(TokenManager.getAdminId());
|
|
|
}
|
|
|
- //bp.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");
|
|
|
+ bp.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");
|
|
|
bp.setCreateTime(new Date());
|
|
|
bp.setStatus("0");
|
|
|
|
|
|
@@ -245,12 +245,10 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
|
|
|
if (StringUtils.isNotBlank(s.getClientSize())) {
|
|
|
bp.setClientSize(s.getClientSize());
|
|
|
}
|
|
|
- if (StringUtils.isNotBlank(s.getMinLogo())) {
|
|
|
- bp.setMinLogo(s.getMinLogo());
|
|
|
- }
|
|
|
- if (StringUtils.isNotBlank(s.getMaxLogo())) {
|
|
|
- bp.setMaxLogo(s.getMaxLogo());
|
|
|
- }
|
|
|
+
|
|
|
+ bp.setMinLogo(s.getMinLogo());
|
|
|
+ bp.setMaxLogo(s.getMaxLogo());
|
|
|
+
|
|
|
if (null!=(s.getStatus())) {
|
|
|
bp.setStatus(s.getStatus());
|
|
|
}
|
|
|
@@ -259,8 +257,10 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
|
|
|
@Override
|
|
|
public int addProjectSize(ProjectSize ps) {
|
|
|
ps.setId(UUID.randomUUID().toString());
|
|
|
- //bp.setCreateId(TokenManager.getAdminId());
|
|
|
- ps.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");
|
|
|
+ if (StringUtils.isNotBlank(TokenManager.getAdminId())) {
|
|
|
+ ps.setCreateId(TokenManager.getAdminId());
|
|
|
+ }
|
|
|
+ //ps.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");
|
|
|
ps.setCreateTime(new Date());
|
|
|
ps.setStatus(0);
|
|
|
return projectSizeMapper.insert(ps);
|
|
|
@@ -340,14 +340,36 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
|
|
|
@Override
|
|
|
public boolean WhetherRepeat(ProjectSize ps) {
|
|
|
List<ProjectSizeBo> list=projectSizeMapper.getgetPnamecount(ps.getPname());
|
|
|
- if (null!=list&&list.isEmpty()) {
|
|
|
- if (list.size()>1&&list.get(0).getPid().equals(ps.getPid())) {
|
|
|
+
|
|
|
+ if (list.size()>0&&!(list.get(0).getPid().equals(ps.getPid()))) {
|
|
|
System.out.println("true");
|
|
|
return true;
|
|
|
+
|
|
|
}
|
|
|
- }
|
|
|
+
|
|
|
return false;
|
|
|
}
|
|
|
+ @Override
|
|
|
+ public boolean judgeStatus(ProjectSize ps) {
|
|
|
+ BusinessProject bp=businessProjectMapper.selectByPrimaryKey(ps.getPid());
|
|
|
+ if (Integer.valueOf(bp.getStatus())==1) {
|
|
|
+ return true;
|
|
|
+ }else {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ @Override
|
|
|
+ public boolean judgeBeing(BusinessProject s) {
|
|
|
+ BusinessProject bp=businessProjectMapper.selectByPrimaryKey(s.getId());
|
|
|
+ BusinessProject bp1=businessProjectMapper.selectByPrimaryBname(s.getBname());
|
|
|
+ if (bp.getId().equals(bp1.getId())) {
|
|
|
+ return false;
|
|
|
+ }else {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
|
|
|
}
|