|
|
@@ -90,7 +90,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setMainName(my.getName());
|
|
|
}
|
|
|
publicReleaseMapper.insertSelective(in);
|
|
|
- Map<String, Object> map=addPublicReleaseLog(my, in,PublicReleaseLog.states.fq.getCode(),u.getNickname(),date);
|
|
|
+ addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
|
|
|
+ Map<String, Object> map=addPublicReleaseLog(my, in,u.getNickname(),date);
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
@@ -98,13 +99,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
*
|
|
|
* @param my 我的相关人员
|
|
|
* @param in 公出信息
|
|
|
- * @param logStatus 公出状态
|
|
|
* @param nickname 客户名称
|
|
|
* @param date 时间
|
|
|
*/
|
|
|
- private Map<String, Object> addPublicReleaseLog(AdminListBo my,PublicRelease in,Integer logStatus,String nickname,Date date ) {
|
|
|
+ private Map<String, Object> addPublicReleaseLog(AdminListBo my,PublicRelease in,String nickname,Date date ) {
|
|
|
Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
|
|
|
- addpublicLog(in.getId(), logStatus, "发起外出申请");
|
|
|
String openid=a.getOpenId();
|
|
|
String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
|
sendNoticeAndSoucket(a.getId(),NoticeStatus.PUBLIC_RELEASE_START.getCode(),str);
|
|
|
@@ -194,7 +193,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
}
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
- addPublicReleaseLog(my,in,PublicReleaseLog.states.xg.getCode(),u.getNickname(),date);
|
|
|
+ //新增修改日志
|
|
|
+ publicReleaseLogMapper.insertSelective(log);
|
|
|
+ //重新发起
|
|
|
+ addPublicReleaseLog(my,in,u.getNickname(),date);
|
|
|
|
|
|
}else {
|
|
|
log.setStatus(PublicReleaseLog.states.cx.getCode());
|
|
|
@@ -204,9 +206,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- publicReleaseMapper.updateStatusByMainId(in.getStatus(),in.getId());
|
|
|
-
|
|
|
- publicReleaseLogMapper.insertSelective(log);
|
|
|
return publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
}
|
|
|
|
|
|
@@ -248,7 +247,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
str=str.append("(").append(ad.getName()).append(")");
|
|
|
if (status==0){
|
|
|
str=str.append("驳回,");
|
|
|
- publicReleaseMapper.updateStatusByMainId(status,use.getId());
|
|
|
}else if(status==2){
|
|
|
str=str.append("同意,");
|
|
|
//如果是协单公出主公出,在审核通过
|
|
|
@@ -364,6 +362,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (String s : ss) {
|
|
|
if (out.getAid().equals(s)){
|
|
|
flag=true;
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
if (!flag){
|
|
|
@@ -371,7 +370,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setId(out.getId());
|
|
|
in.setStatus(3);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
- PublicReleaseLog log = new PublicReleaseLog(in.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单", date);
|
|
|
+ PublicReleaseLog log = new PublicReleaseLog(in.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), "同意修改,撤销此协单", date);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
}else {
|
|
|
use.setId(out.getId());
|
|
|
@@ -383,7 +382,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
use.setAssist(2);
|
|
|
use.setStatus(status);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(use);
|
|
|
- PublicReleaseLog log = new PublicReleaseLog(out.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(), "修改协单信息", date);
|
|
|
+ PublicReleaseLog log = new PublicReleaseLog(out.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), "同意协单信息", date);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
}
|
|
|
}
|
|
|
@@ -402,7 +401,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
use.setMainId(useId);
|
|
|
use.setId(null);
|
|
|
publicReleaseMapper.insert(use);
|
|
|
- PublicReleaseLog log = new PublicReleaseLog(use.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(), "修改协单信息", date);
|
|
|
+ PublicReleaseLog log = new PublicReleaseLog(use.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), "同意协单信息", date);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
}
|
|
|
}
|