|
|
@@ -71,6 +71,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (in.getPublicAgain()==null)in.setPublicAgain(0);
|
|
|
in.setCreateTime(date);
|
|
|
in.setPublicType(0);
|
|
|
+ in.setTechStartProcess(0);
|
|
|
in.setStatus(1);
|
|
|
in.setAid(TokenManager.getAdminId());
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
@@ -238,6 +239,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
|
|
|
String salesmanId = tOrderNew.getSalesmanId();
|
|
|
Admin a = adminMapper.selectByPrimaryKey(salesmanId);
|
|
|
+ addPublicExamine(in.getId(),a);
|
|
|
CheckOrderNoOut data = (CheckOrderNoOut) checkOrderNo.get("data");
|
|
|
String format = getString(my, data);
|
|
|
pushNoticeAndSoucketAndEmail(my, in, date, a, format, map);
|
|
|
@@ -1104,17 +1106,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
|
|
|
flag=true;
|
|
|
}
|
|
|
- TOrderNew tOrderNew=null;
|
|
|
- if(flag){
|
|
|
- //技术发起审核可以看
|
|
|
- if (out.getTechStartProcess()!=0){
|
|
|
- tOrderNew = tOrderNewMapper.selectByPrimaryKey(out.getOrderNo());
|
|
|
- if (tOrderNew.getSalesmanId().equals(aid)){
|
|
|
- flag=false;
|
|
|
- out.setMyExamine(0);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
if(flag){
|
|
|
//是否可以查看
|
|
|
if (!ps.isEmpty()){
|