|
|
@@ -278,7 +278,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
|
|
|
private void addPublicExamine(Integer id, String aid) {
|
|
|
- Admin admin = adminMapper.queryById(aid);
|
|
|
+ Admin admin = adminMapper.selectById(aid);
|
|
|
addPublicExamine(id,admin);
|
|
|
}
|
|
|
|
|
|
@@ -323,7 +323,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
Map<String, Object>map=new HashMap<String, Object>();
|
|
|
//无需订单负责人审核
|
|
|
if (in.getTechStartProcess()==0){
|
|
|
-// Admin a=adminMapper.queryById(my.getReviewer());
|
|
|
+// Admin a=adminMapper.selectById(my.getReviewer());
|
|
|
//订单审核换成多人
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(in.getAid());
|
|
|
String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
|
@@ -338,7 +338,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
//不是自己的客户
|
|
|
if (!u.getAid().equals(my.getId())) {
|
|
|
StringBuilder str2 = new StringBuilder();
|
|
|
- Admin admin = adminMapper.queryById(u.getAid());
|
|
|
+ Admin admin = adminMapper.selectById(u.getAid());
|
|
|
//业务公出限定项目直接公出,不是业务项目审核公出
|
|
|
if(in.getType()==0){
|
|
|
List<RestrictProject> list = restrictProjectMapper.selectListByParam(new InputRestrictProject(u.getId(), my.getId()));
|
|
|
@@ -388,7 +388,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
if (status.get()==1){
|
|
|
for (AdminPublicReviewerBo adminPublicReviewerBo : adminPublicReviewerBos) {
|
|
|
- Admin admin = adminMapper.queryById(adminPublicReviewerBo.getReviewerId());
|
|
|
+ Admin admin = adminMapper.selectById(adminPublicReviewerBo.getReviewerId());
|
|
|
pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
|
|
|
}
|
|
|
|
|
|
@@ -397,7 +397,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}else {
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
|
|
|
String salesmanId = tOrderNew.getSalesmanId();
|
|
|
- Admin a = adminMapper.queryById(salesmanId);
|
|
|
+ Admin a = adminMapper.selectById(salesmanId);
|
|
|
addPublicExamine(in.getId(),a);
|
|
|
CheckOrderNoOut data = (CheckOrderNoOut) checkOrderNo.get("data");
|
|
|
String format = getString(my, data,tOrderNew);
|
|
|
@@ -451,7 +451,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
String [] ss=assistAid.split(",");
|
|
|
StringBuffer sb=new StringBuffer();
|
|
|
for (String s : ss) {
|
|
|
- Admin a=adminMapper.queryById(s);
|
|
|
+ Admin a=adminMapper.selectById(s);
|
|
|
if (a!=null&&a.getName()!=null)sb=sb.append(a.getName()).append(",");
|
|
|
}
|
|
|
if (sb.length()<1)return "";
|
|
|
@@ -460,7 +460,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
private void sendEmailAndNoticeAndSoucket(String id,Integer type,String content){
|
|
|
sendNoticeAndSoucket(id,type,content);
|
|
|
- Admin admin = adminMapper.queryById(id);
|
|
|
+ Admin admin = adminMapper.selectById(id);
|
|
|
String title="暂无标题";
|
|
|
if (type==3)title=NoticeStatus.PUBLIC_OTHERS_USER.getDesc();
|
|
|
EmailBo emailBo=new EmailBo(title,admin.getEmail(),content);
|
|
|
@@ -977,10 +977,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
}
|
|
|
//当前审核人员
|
|
|
- Admin ad=adminMapper.queryById(aid);
|
|
|
+ Admin ad=adminMapper.selectById(aid);
|
|
|
//公出负责人
|
|
|
Admin a;
|
|
|
- Admin publicAdmin =adminMapper.queryById(use.getAid());
|
|
|
+ Admin publicAdmin =adminMapper.selectById(use.getAid());
|
|
|
a=publicAdmin;
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
str=str.append("(").append(ad.getName()).append(")");
|
|
|
@@ -1492,7 +1492,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
addOrderPublicReleaseLog(orderNo,status,process,remarks,null,null);
|
|
|
}
|
|
|
private void addOrderPublicReleaseLog(String orderNo, Integer status, Integer process, String remarks,Double useDuration,Double newDuration) {
|
|
|
- Admin admin = adminMapper.queryById(TokenManager.getAdminId());
|
|
|
+ Admin admin = adminMapper.selectById(TokenManager.getAdminId());
|
|
|
OrderPublicReleaseLog log = new OrderPublicReleaseLog();
|
|
|
log.setOrderNo(orderNo);
|
|
|
log.setProcessStatus(process);
|
|
|
@@ -1518,7 +1518,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
Integer status=0;
|
|
|
PublicRelease use=publicReleaseMapper.selectById(id);
|
|
|
PublicRelease mainPublic= publicReleaseMapper.selectById(use.getMainId());
|
|
|
- Admin ad=adminMapper.queryById(TokenManager.getAdminId());
|
|
|
+ Admin ad=adminMapper.selectById(TokenManager.getAdminId());
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
if (use.getAssist()!=2){
|
|
|
throw new BusinessException("只有技术公出能发起技术驳回");
|
|
|
@@ -1551,7 +1551,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
*/
|
|
|
private Integer addNoticeAndWeChat(Integer id,String aid, String remarks, Integer status) {
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(aid);
|
|
|
- Admin a = adminMapper.queryById(TokenManager.getAdminId());
|
|
|
+ Admin a = adminMapper.selectById(TokenManager.getAdminId());
|
|
|
if (my.getOpenId()!=null) {
|
|
|
if (remarks.length()>19) {
|
|
|
remarks=remarks.substring(0, 15)+"...";
|
|
|
@@ -1672,7 +1672,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
adminPublicReviewerBos = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
//协单人
|
|
|
- Admin admin = adminMapper.queryById(out.getAid());
|
|
|
+ Admin admin = adminMapper.selectById(out.getAid());
|
|
|
int x=pushAssist(np, use,adminPublicReviewerBos);
|
|
|
if (np.getId() == null){
|
|
|
publicReleaseMapper.insertSelective(np);
|
|
|
@@ -1699,7 +1699,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
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());
|
|
|
+ Admin ad = adminMapper.selectById(e.getAid());
|
|
|
weChatUtils.addNotice(ad.getOpenId(),1, use.getId(), date, a.getName(),str.toString());
|
|
|
}
|
|
|
|
|
|
@@ -2675,7 +2675,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
* @param prid 公出编号
|
|
|
*/
|
|
|
private void addWeChatNotice(String aid,Integer type,String str,Integer prid){
|
|
|
- Admin recipient = adminMapper.queryById(aid);
|
|
|
+ Admin recipient = adminMapper.selectById(aid);
|
|
|
addWeChatNotice( recipient, type, str, prid);
|
|
|
}
|
|
|
|
|
|
@@ -2742,7 +2742,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
for (String s : list) {
|
|
|
- sb.append(adminMapper.queryById(s).getName()).append(",");
|
|
|
+ sb.append(adminMapper.selectById(s).getName()).append(",");
|
|
|
}
|
|
|
return sb.length()>0?sb.substring(0,sb.length()-1):sb.toString();
|
|
|
}
|