|
|
@@ -84,14 +84,30 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (u.getAid().equals(TokenManager.getAdminId())){
|
|
|
in.setMainStatus(1);
|
|
|
}
|
|
|
- if (in.getAssist()==1)in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
- publicReleaseMapper.insertSelective(in);
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
+ if (in.getAssist()==1){
|
|
|
+ in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
+ in.setMainName(my.getName());
|
|
|
+ }
|
|
|
+ publicReleaseMapper.insertSelective(in);
|
|
|
+ Map<String, Object> map=addPublicReleaseLog(my, in,PublicReleaseLog.states.fq.getCode(),u.getNickname(),date);
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param my 我的相关人员
|
|
|
+ * @param in 公出信息
|
|
|
+ * @param logStatus 公出状态
|
|
|
+ * @param nickname 客户名称
|
|
|
+ * @param date 时间
|
|
|
+ */
|
|
|
+ private Map<String, Object> addPublicReleaseLog(AdminListBo my,InputPublicRelease in,Integer logStatus,String nickname,Date date ) {
|
|
|
Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
|
|
|
- PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),PublicReleaseLog.states.fq.getCode(),"发起外出申请",new Date());
|
|
|
+ PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),logStatus,"发起外出申请",new Date());
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
String openid=a.getOpenId();
|
|
|
- String str="["+my.getName()+"]发起["+u.getNickname()+"]的外出申请,请及时审核。";
|
|
|
+ String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
|
sendNoticeAndSoucket(a.getId(),NoticeStatus.PUBLIC_RELEASE_START.getCode(),str);
|
|
|
Map<String, Object>map=new HashMap<String, Object>();
|
|
|
map.put("data", publicReleaseMapper.selectDtails(in.getId(),null));
|
|
|
@@ -145,6 +161,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
@Override
|
|
|
public int updatePublicRelease(InputPublicRelease in) {
|
|
|
+ Date date = new Date();
|
|
|
try {
|
|
|
if(in.getReleaseStarts()!=null)in.setReleaseStart(DateUtils.parseDate(in.getReleaseStarts(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
if(in.getReleaseEnds()!=null)in.setReleaseEnd(DateUtils.parseDate(in.getReleaseEnds(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
@@ -160,16 +177,22 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (u!=null&&u.getAid().equals(TokenManager.getAdminId())){
|
|
|
in.setMainStatus(1);
|
|
|
}
|
|
|
- PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),null,in.getReason(),new Date());
|
|
|
+ PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),null,in.getReason(),date);
|
|
|
if(in.getStatus()==null||in.getStatus()!=3) {
|
|
|
in.setStatus(1);
|
|
|
log.setStatus(PublicReleaseLog.states.xg.getCode());
|
|
|
in.setUpdateStatus(1);
|
|
|
- if(in.getAssist()==1)in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
+ if(in.getAssist()==1){
|
|
|
+ in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
+ publicReleaseMapper.updateStatusByMainId(1,in.getId());
|
|
|
+ }
|
|
|
+ AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
+ addPublicReleaseLog(my,in,PublicReleaseLog.states.xg.getCode(),u.getNickname(),date);
|
|
|
+
|
|
|
}else {
|
|
|
log.setStatus(PublicReleaseLog.states.cx.getCode());
|
|
|
- List<OutPublicRelease> list = publicReleaseMapper.selectByMainId(in.getId());
|
|
|
- for (OutPublicRelease out : list) {
|
|
|
+ List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId());
|
|
|
+ for (PublicRelease out : list) {
|
|
|
PublicReleaseLog log2 = new PublicReleaseLog(out.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单", new Date());
|
|
|
publicReleaseLogMapper.insertSelective(log2);
|
|
|
}
|
|
|
@@ -259,10 +282,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
private void pushPublicReleaseAssist(PublicRelease use) {
|
|
|
Integer useId=use.getId();
|
|
|
if (use.getAssistAid()!=null){
|
|
|
- List<OutPublicRelease> list = publicReleaseMapper.selectByMainId(use.getId());
|
|
|
+ List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId());
|
|
|
String []ss=use.getAssistAid().split(",");
|
|
|
//数据库与传入比对,如果不存在就标记撤销 ,如果存在就修改成
|
|
|
- for (OutPublicRelease out : list) {
|
|
|
+ for (PublicRelease out : list) {
|
|
|
boolean flag=false;
|
|
|
for (String s : ss) {
|
|
|
if (out.getAid().equals(s)){
|
|
|
@@ -278,21 +301,22 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
}else {
|
|
|
use.setId(out.getId());
|
|
|
- use.setClockIn(null);
|
|
|
+ use.setAid(out.getAid());
|
|
|
+ use.setStatus(1);
|
|
|
+ use.setClockIn(0);
|
|
|
use.setClockInTime(null);
|
|
|
publicReleaseMapper.updateByPrimaryKey(use);
|
|
|
}
|
|
|
}
|
|
|
for (String s : ss) {
|
|
|
boolean flag2 = false;
|
|
|
- for (OutPublicRelease o : list) {
|
|
|
+ for (PublicRelease o : list) {
|
|
|
if (s.equals(o.getAid())) {
|
|
|
flag2 = true;
|
|
|
}
|
|
|
}
|
|
|
if (!flag2) {
|
|
|
use.setAssist(2);
|
|
|
- use.setAssistAid(null);
|
|
|
use.setAid(s);
|
|
|
use.setStatus(2);
|
|
|
use.setType(3);
|