|
|
@@ -104,8 +104,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
*/
|
|
|
private Map<String, Object> addPublicReleaseLog(AdminListBo my,PublicRelease in,Integer logStatus,String nickname,Date date ) {
|
|
|
Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
|
|
|
- PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),logStatus,"发起外出申请",new Date());
|
|
|
- publicReleaseLogMapper.insertSelective(log);
|
|
|
+ addpublicLog(in.getId(), logStatus, "发起外出申请");
|
|
|
String openid=a.getOpenId();
|
|
|
String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
|
sendNoticeAndSoucket(a.getId(),NoticeStatus.PUBLIC_RELEASE_START.getCode(),str);
|
|
|
@@ -149,6 +148,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
asyncUtils.addNotice(n);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param my 发送人
|
|
|
+ * @param a 接受者
|
|
|
+ * @param type 类型
|
|
|
+ */
|
|
|
private void sendEmail(AdminListBo my, Admin a,Integer type) {
|
|
|
String title="外出申请提醒";
|
|
|
if (type==0) title="外出申请驳回提醒";
|
|
|
@@ -195,8 +200,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
log.setStatus(PublicReleaseLog.states.cx.getCode());
|
|
|
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);
|
|
|
+ addpublicLog(out.getId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单");
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -229,7 +233,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int pushExaminePublicRelease(Integer id, Integer status, String remarks,Double duration) {
|
|
|
+ public int pushExaminePublicRelease(Integer id, Integer status, String remarks) {
|
|
|
PublicRelease p=new PublicRelease();
|
|
|
Date date =new Date();
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
@@ -237,7 +241,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
p.setStatus(status);
|
|
|
PublicRelease use=publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
if (use.getStatus()!=1) {
|
|
|
- throw new BusinessException("只能修改已发起的状态");
|
|
|
+ throw new BusinessException("只能修改发起的状态公出");
|
|
|
}
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
Admin ad=adminMapper.selectByPrimaryKey(aid);
|
|
|
@@ -257,8 +261,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
str=str.append(remarks);
|
|
|
p.setAuditInfo(str.toString());
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(p);
|
|
|
- PublicReleaseLog log=new PublicReleaseLog(id,TokenManager.getAdminId(),status,remarks,new Date());
|
|
|
- publicReleaseLogMapper.insertSelective(log);
|
|
|
+ addpublicLog(id, status, remarks);
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
Admin a=adminMapper.selectByPrimaryKey(use.getAid());
|
|
|
Integer type=0;
|
|
|
@@ -266,7 +269,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
User u=userMapper.selectByPrimaryKey(use.getUid());
|
|
|
if (status==0) {
|
|
|
type=NoticeStatus.PUBLIC_RELEASE_NO.getCode();
|
|
|
- content="["+u.getNickname()+"]公司的外出申请,未通过审核!";
|
|
|
+
|
|
|
+ if (use.getAssist()==2){
|
|
|
+ content="["+u.getNickname()+"]公司的外出申请,技术协单被["+ad.getName()+"]拒绝!";
|
|
|
+ }else {
|
|
|
+ content="["+u.getNickname()+"]公司的外出申请,未通过公出审核!";
|
|
|
+ }
|
|
|
}else if(status==2) {
|
|
|
type=NoticeStatus.PUBLIC_RELEASE_YES.getCode();
|
|
|
content="["+u.getNickname()+"]公司的外出申请,已通过审核!";
|
|
|
@@ -286,6 +294,62 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ private void addpublicLog(Integer id, Integer status, String remarks) {
|
|
|
+ PublicReleaseLog log = new PublicReleaseLog(id, TokenManager.getAdminId(), status, remarks, new Date());
|
|
|
+ publicReleaseLogMapper.insertSelective(log);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int pushTechReject(Integer id, String remarks) {
|
|
|
+ PublicRelease use=publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
+ PublicRelease mainPublic= publicReleaseMapper.selectByPrimaryKey(use.getMainId());
|
|
|
+ Admin ad=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
+ str=str.append("(").append(ad.getName()).append(")");
|
|
|
+ if (use.getAssist()!=2){
|
|
|
+ throw new BusinessException("只有技术公出能发起技术驳回");
|
|
|
+ }
|
|
|
+ str=str.append("拒绝技术协单,").append(remarks);
|
|
|
+ PublicRelease newMain=new PublicRelease();
|
|
|
+ newMain.setId(mainPublic.getId());
|
|
|
+ newMain.setStatus(0);
|
|
|
+ newMain.setRejectName(ad.getName());
|
|
|
+ newMain.setAuditInfo(str.toString());
|
|
|
+ publicReleaseMapper.updateByPrimaryKeySelective(newMain);
|
|
|
+ PublicRelease up=new PublicRelease();
|
|
|
+ up.setId(id);
|
|
|
+ up.setAuditInfo(str.toString());
|
|
|
+ up.setStatus(3);
|
|
|
+ publicReleaseMapper.updateByPrimaryKeySelective(up);
|
|
|
+ return addPublicLogPlus(mainPublic.getId(), mainPublic.getAid(), str.toString(), 0);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 新增日志、站内信、微信提醒
|
|
|
+ * @param id 日志公出编号
|
|
|
+ * @param aid 接受者
|
|
|
+ * @param remarks 日志内容
|
|
|
+ * @param status 0驳回
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ private Integer addPublicLogPlus(Integer id,String aid, String remarks, Integer status) {
|
|
|
+ addpublicLog(id, status, remarks);
|
|
|
+ Integer noticeType=0;
|
|
|
+ if (status ==0)noticeType=NoticeStatus.PUBLIC_RELEASE_NO.getCode();
|
|
|
+ sendNoticeAndSoucket(aid,noticeType, remarks);
|
|
|
+ AdminListBo my = adminMapper.getDeptNameByAid(aid);
|
|
|
+ Admin a = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
+ if (my.getOpenId()!=null) {
|
|
|
+ if (remarks.length()>19) {
|
|
|
+ remarks=remarks.substring(0, 15)+"...";
|
|
|
+ }
|
|
|
+ return weChatUtils.addNotice(my.getOpenId(),status,id,new Date(),my.getName(), remarks);
|
|
|
+ }else {
|
|
|
+ sendEmail( my, a, status);
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void pushPublicReleaseAssist(PublicRelease use,Integer status,Date date) {
|
|
|
Integer useId=use.getId();
|
|
|
if (use.getAssistAid()!=null){
|
|
|
@@ -567,6 +631,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
*
|
|
|
* @param type 查看类型 0我的公出 1公出审核 2管理员 3协单(技术财税总监看全部)
|