anderx 1 год назад
Родитель
Сommit
34dff608df

Разница между файлами не показана из-за своего большого размера
+ 101 - 350
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml


+ 55 - 43
src/main/java/com/goafanti/common/model/PublicRelease.java

@@ -8,172 +8,176 @@ import java.util.Date;
  * 公出表(PublicRelease)实体类
  *
  * @author makejava
- * @since 2024-08-22 15:44:03
+ * @since 2024-08-26 14:10:20
  */
 public class PublicRelease implements Serializable {
-    private static final long serialVersionUID = 752677138514452213L;
+    private static final long serialVersionUID = 823562112761855755L;
 
     private Integer id;
-/**
+    /**
      * 公出人
      */
     private String aid;
-/**
+    /**
      * 公出开始时间
      */
     private Date releaseStart;
-/**
+    /**
      * 公出结束时间
      */
     private Date releaseEnd;
-/**
+    /**
      * 公出目标
      */
     private String remarks;
-/**
+    /**
      * 附件
      */
     private String annexUrl;
-/**
+    /**
      * 状态 0驳回 1发起 2同意 3 撤销 4技术驳回
      */
     private Integer status;
-/**
+    /**
      * 发起时间
      */
     private Date createTime;
-/**
+    /**
      * 项目编号
      */
     private String pid;
-/**
+    /**
      * 项目名称
      */
     private String pname;
-/**
+    /**
      * 时长
      */
     private Double duration;
-/**
+    /**
      * 有效日期
      */
     private String validDate;
-/**
+    /**
      * 本次总结
      */
     private String supplement;
-/**
+    /**
      * 审核信息
      */
     private String auditInfo;
-/**
+    /**
      * 公出计划
      */
     private String plan;
-/**
+    /**
      * 预计效果
      */
     private String expectedEffect;
-/**
+    /**
      * 下次计划
      */
     private String nextPlan;
-/**
+    /**
      * 分类 0业务 1技术 2行政 3 技术协单 4 技术助手
      */
     private Integer type;
-/**
+    /**
      * 订单编号
      */
     private String orderNo;
-/**
+    /**
      * 修改时间
      */
     private Date updateTime;
-/**
+    /**
      * 修改状态 0=否 1=是
      */
     private Integer updateStatus;
-/**
-     * 0否 1主公出 2协助公出 3技术助手 4单独协单
+    /**
+     * 0否 1主公出 2协助公出 3技术助手
      */
     private Integer assist;
-/**
+    /**
      * 协单人员
      */
     private String assistAid;
-/**
+    /**
      * 协单人员
      */
     private String assistAidName;
-/**
+    /**
      * 主要公出编号
      */
     private Integer mainId;
-/**
+    /**
      * 主要公出发起人
      */
     private String mainName;
-/**
+    /**
      * 驳回人员
      */
     private String rejectName;
-/**
+    /**
      * 协单助手
      */
     private String assistantAid;
-/**
+    /**
      * 协单助手名称
      */
     private String assistantName;
-/**
+    /**
      * 再次公出
      */
     private Integer publicAgain;
-/**
+    /**
      * 审核时间
      */
     private Date auditTime;
-/**
+    /**
      * 客户类型 0新客户 1老客户
      */
     private String newUser;
-/**
+    /**
      * 签单数
      */
     private String signSum;
-/**
+    /**
      * 公司名称
      */
     private String userNames;
-/**
+    /**
      * 公出对象 0企业 1园区
      */
     private Integer objectType;
-/**
+    /**
      * 公出分类 0不含他人客户 1待审核 2已审核
      */
     private Integer publicType;
-/**
+    /**
      * 公出企业地址
      */
     private String districtName;
-/**
+    /**
      * 打卡状态 0未打卡 1已打卡 2异常打卡(冗余)
      */
     private Integer clockIn;
-/**
+    /**
      * 0无需审核 1需要审核 2营销审核通过 3营销审核驳回
      */
     private Integer techStartProcess;
-/**
+    /**
      * 公出企业地址
      */
     private String addressName;
-/**
+    /**
      * 协单审核 0非协单 1协单未审核 2协单部分审核 3协单完全审核 4协单驳回
      */
     private Integer assistProcess;
+    /**
+     * 协单业务公出 0否 1是
+     */
+    private Integer alone;
 
 
     public Integer getId() {
@@ -504,5 +508,13 @@ public class PublicRelease implements Serializable {
         this.assistProcess = assistProcess;
     }
 
+    public Integer getAlone() {
+        return alone;
+    }
+
+    public void setAlone(Integer alone) {
+        this.alone = alone;
+    }
+
 }
 

+ 2 - 76
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -123,8 +123,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}else {
 				in.setTechStartProcess(1);
 			}
-		}else if (in.getType() == 2) {
-
 		}
 		publicReleaseMapper.insertSelective(in);
 		if (in.getType()==1&&in.getOrderNo()!=null){
@@ -484,7 +482,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 						throw new BusinessException("该公出已签到,无法取消");
 					}
 				}
-				pushUpdatePublic(in, uses, use, log, userNames, date, checkOrderNo);
 			}else if (in.getAssist()==0){
 				publicReleaseMapper.updateAssist(in);
 				in.setAssistProcess(0);
@@ -494,79 +491,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 						throw new BusinessException("该协单公出已打卡,无法取消");
 					}
 				}
-				pushUpdatePublic(in, uses, use, log, userNames, date, checkOrderNo);
-			}else if (in.getAssist()==4){
-				List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(in.getId(), null, null);
-				for (PublicRelease e : publicReleases) {
-					if (e.getClockIn()==1){
-						throw new BusinessException("该协单公出已打卡,无法取消");
-					}
-				}
-				AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-				publicReleaseMapper.deleteById(in.getId());
-				publicReleaseMapper.deleteByMainId(in.getId());
-				String[] split = in.getAssistAid().split(",");
-				List<sendListBo> aidList = new ArrayList<>();
-				List<PublicReleaseDetails> prdList=new ArrayList<>();
-				List<User> users=new ArrayList<>();
-				StringBuilder str =new StringBuilder();
-				//每一个协单都是单独的一份
-				for (String s : split) {
-					Admin publicAdmin = adminMapper.selectByPrimaryKey(s);
-					in.setAid(s);
-					in.setType(3);
-					in.setMainName(my.getName());
-					in.setAssistProcess(2);
-					publicReleaseMapper.insert(in);
-					addPRD(in, users, str, prdList);
-					addPublicReleaseDateClock(in);
-					userNames=str.substring(0,str.length()-1);
-					in.setUserNames(userNames);
-					PublicRelease updateName=new PublicRelease();
-					updateName.setId(in.getId());
-					updateName.setUserNames(userNames);
-					publicReleaseMapper.update(updateName);
-					addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起[仅技术协单公出]申请");
-					sendNoticeAndSoucket(in.getAid(),1, "["+my.getName()+"]发起["+userNames+"]的发起[仅技术协单公出]邀请。");
-					List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(in.getAid());
-					//通知技术协单人
-					//处理通知技术协单审核人
-					adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
-					//如果没有直接改变状态
-					if (adminPublicReviewerBos.size()==0){
-						addpublicLog(in.getId(), PublicReleaseLog.states.ty.getCode(), "未设置技术协单审核人,跳过审核");
-//					sendNoticeAndSoucket(my.getId(), 2, "你发起的["+userNames+"]仅技术协单公出申请,已通过。");
-						PublicRelease updateStatus=new PublicRelease();
-						updateStatus.setId(in.getId());
-						updateStatus.setAssistProcess(4);
-						updateStatus.setStatus(2);
-						publicReleaseMapper.update(updateStatus);
-					}else {
-						for (AdminPublicReviewerBo adminPublicReviewerBo : adminPublicReviewerBos) {
-							if (aidList.contains(adminPublicReviewerBo.getAid())==false){
-								sendListBo bo =new sendListBo(adminPublicReviewerBo.getAid(),
-										s,in.getId(),userNames);
-							}
-						}
-					}
-				}
-				if (!aidList.isEmpty()){
-					for (sendListBo e : aidList) {
-						Admin a = adminMapper.selectByPrimaryKey(e.getAid());
-						sendNoticeAndSoucket(e.getAid(),1, "["+my.getName()+"]发起["+e.getUserNames()+"]仅技术协单公出申请,请及时审核。");
-						if (a.getOpenId() !=null) {
-							Integer res= weChatUtils.addNotice(a.getOpenId(), in.getStatus(), e.getPrid(), date, my.getName(),"["+ my.getName()+"]发起仅协单申请");
-							if (res!=0) {
-								sendEmail(my, a,1);
-							}
-						}else {
-							//返回没有绑定微信
-							sendEmail(my, a,1);
-						}
-					}
-
-				}
 			}
+			//处理修改公出
+			pushUpdatePublic(in, uses, use, log, userNames, date, checkOrderNo);
 
 		}else {
 			List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
@@ -603,7 +530,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		in.setStatus(1);
 		log.setStatus(PublicReleaseLog.states.xg.getCode());
 		in.setUpdateStatus(1);
-
 		//如果是业务切公出则撤销营销审核与审核人
 		pushUpdateType(in, use);
 		//如果是业务公出,切审核状态为其他,则重置审核