|
|
@@ -1548,23 +1548,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setMainId(null);
|
|
|
np.setType(null);
|
|
|
np.setAssist(2);
|
|
|
- //协单审核,判定是否跳过的逻辑
|
|
|
- int x=pushAssist(out.getAid(), np,use);
|
|
|
- np.setAid(null);
|
|
|
- publicReleaseMapper.update(np);
|
|
|
- updatePublicReleaseDtails(use,np);
|
|
|
- if (x==2||x==3){
|
|
|
- String remarks="";
|
|
|
- if (x==2){
|
|
|
- remarks="协单未设置审核人,自动通过";
|
|
|
- }else if (x==3){
|
|
|
- remarks="协单审核人重复,自动通过";
|
|
|
- }
|
|
|
- PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), remarks, new Date());
|
|
|
- publicReleaseLogMapper.insertSelective(log2);
|
|
|
- PublicReleaseLog log3 = new PublicReleaseLog(use.getId(), "1", PublicReleaseLog.states.ty.getCode(), remarks, new Date());
|
|
|
- publicReleaseLogMapper.insertSelective(log3);
|
|
|
- }
|
|
|
+ pushAssist(use, date, a, out, np);
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(use.getUserNames()).append("]。");
|
|
|
PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(),str.toString(), date);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
@@ -1588,22 +1572,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setType(3);
|
|
|
np.setMainId(use.getId());
|
|
|
np.setId(null);
|
|
|
- int x=pushAssist(s, np,use);
|
|
|
- publicReleaseMapper.insertSelective(np);
|
|
|
- //补充客户表
|
|
|
- addpublicReleaseDtails(use,np);
|
|
|
- if (x==2||x==3){
|
|
|
- String remarks="";
|
|
|
- if (x==2){
|
|
|
- remarks="协单未设置审核人,自动通过";
|
|
|
- }else if (x==3){
|
|
|
- remarks="协单审核人重复,自动通过";
|
|
|
- }
|
|
|
- PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), remarks, new Date());
|
|
|
- publicReleaseLogMapper.insertSelective(log2);
|
|
|
- PublicReleaseLog log3 = new PublicReleaseLog(use.getId(), "1", PublicReleaseLog.states.ty.getCode(), remarks, new Date());
|
|
|
- publicReleaseLogMapper.insertSelective(log3);
|
|
|
- }
|
|
|
+ pushAssist(use, date, a, np, np);
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]邀请你技术协单").append("[").append(use.getUserNames()).append("]。");
|
|
|
PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.fq.getCode(), str.toString(), date);
|
|
|
sendNoticeAndSoucket(np.getAid(),np.getStatus(),str.toString());
|
|
|
@@ -1628,6 +1597,41 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private void pushAssist(PublicRelease use, Date date, Admin a, PublicRelease out, PublicRelease np) {
|
|
|
+ //协单审核,判定是否跳过的逻辑
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
+ adminPublicReviewerBos = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
+ //协单人
|
|
|
+ Admin admin = adminMapper.queryById(out.getAid());
|
|
|
+ int x=pushAssist(np, use,adminPublicReviewerBos);
|
|
|
+ np.setAid(null);
|
|
|
+ publicReleaseMapper.update(np);
|
|
|
+ updatePublicReleaseDtails(use, np);
|
|
|
+ if (x==2||x==3){
|
|
|
+ String remarks="";
|
|
|
+ if (x==2){
|
|
|
+ remarks="协单未设置审核人,自动通过";
|
|
|
+ }else if (x==3){
|
|
|
+ remarks="协单审核人重复,自动通过";
|
|
|
+ }
|
|
|
+ PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), remarks, new Date());
|
|
|
+ publicReleaseLogMapper.insertSelective(log2);
|
|
|
+ PublicReleaseLog log3 = new PublicReleaseLog(use.getId(), "1", PublicReleaseLog.states.ty.getCode(), remarks, new Date());
|
|
|
+ publicReleaseLogMapper.insertSelective(log3);
|
|
|
+ }
|
|
|
+ //通知协单上级审核
|
|
|
+// if(x==1){
|
|
|
+// for (AdminPublicReviewerBo e : adminPublicReviewerBos) {
|
|
|
+// StringBuffer str = new StringBuffer("[").append(a.getName()).append("]发起了协单审核,协单人:").append(admin.getName()).append("。");
|
|
|
+// sendNoticeAndSoucket(e.getAid(), np.getStatus(),str.toString());
|
|
|
+// //协单通知人
|
|
|
+// Admin ad = adminMapper.queryById(e.getAid());
|
|
|
+// weChatUtils.addNotice(ad.getOpenId(),1, use.getId(), date, a.getName(),str.toString());
|
|
|
+// }
|
|
|
+//
|
|
|
+// }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 协单审核判定是否跳过的逻辑
|
|
|
* 如果未设置跳过审核,如果已审核跳过
|
|
|
@@ -1636,12 +1640,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
* @param np 新协单公出信息
|
|
|
* @param use 原公出信息
|
|
|
*/
|
|
|
- private int pushAssist(String s, PublicRelease np, PublicRelease use) {
|
|
|
- List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(s);
|
|
|
+ private int pushAssist( PublicRelease np, PublicRelease use,List<AdminPublicReviewerBo> collect) {
|
|
|
int res=0;
|
|
|
- //协单人
|
|
|
- Admin admin = adminMapper.queryById(s);
|
|
|
- List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
if (!collect.isEmpty()){
|
|
|
//公出发起人
|
|
|
List<outPublicReleaseLog> outPublicReleaseLogs = publicReleaseLogMapper.listPublicReleaseLog(use.getId(), null);
|