|
|
@@ -556,7 +556,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
Map<String,Object> map =new HashMap<String, Object>();
|
|
|
map.put("type", in.getType()==null?0:in.getType());
|
|
|
//先修改他人公出做测试
|
|
|
- if(in.getType()==4)map.put("type", 5);
|
|
|
+// if(in.getType()==4)map.put("type", 5);
|
|
|
if (in.getType()==3) {
|
|
|
in.setAssist(2);
|
|
|
if (!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR))map.put("aid",TokenManager.getAdminId());
|
|
|
@@ -586,6 +586,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
list.forEach(e ->{ ids.add(e.getId()); });
|
|
|
List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
|
|
|
for (OutPublicReleaseList e : list) {
|
|
|
+ if (e.getStatus()==1&&
|
|
|
+ ((e.getPublicType()==0||e.getPublicType()==2)||(e.getTechStartProcess()==0||e.getTechStartProcess()==2))
|
|
|
+ ){
|
|
|
+ e.setAdminExamine(e.getReviewerName()+" 未审核");
|
|
|
+ }
|
|
|
if (!publicExamines.isEmpty()){
|
|
|
StringBuffer str =new StringBuffer();
|
|
|
for (PublicExamine pe : publicExamines) {
|
|
|
@@ -725,7 +730,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
if (x==publicExamines.size()){
|
|
|
- p.setPublicType(2);
|
|
|
+ p.setTechStartProcess(2);
|
|
|
flag=true;
|
|
|
}
|
|
|
addpublicLog(id, status, str.toString());
|
|
|
@@ -735,7 +740,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
a=publicAdmin;
|
|
|
str=str.append("不同意公出我的企业,").append(remarks);;
|
|
|
content=content.append("未通过审核,请修改后重新发起。");
|
|
|
- p.setPublicType(3);
|
|
|
+ p.setTechStartProcess(3);
|
|
|
p.setStatus(0);
|
|
|
p.setAuditInfo(str.toString());
|
|
|
p.setRejectName(ad.getName());
|
|
|
@@ -746,7 +751,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (flag){
|
|
|
sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
}
|
|
|
- if (p.getStatus()!=null||p.getPublicType()!=null){
|
|
|
+ if (p.getStatus()!=null||p.getPublicType()!=null||p.getTechStartProcess()!=null){
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(p);
|
|
|
updateAdminUserCountPublicRelease(use.getAid(),use.getReleaseStart());
|
|
|
}
|