|
|
@@ -178,7 +178,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
PublicRelease updateName=new PublicRelease();
|
|
|
updateName.setId(in.getId());
|
|
|
updateName.setUserNames(userNames);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(updateName);
|
|
|
+ publicReleaseMapper.update(updateName);
|
|
|
addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
|
|
|
if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
|
|
|
String startTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseStart());
|
|
|
@@ -308,7 +308,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
+ publicReleaseMapper.update(in);
|
|
|
}else {
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
|
|
|
String salesmanId = tOrderNew.getSalesmanId();
|
|
|
@@ -437,7 +437,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
Map checkOrderNo =null;
|
|
|
|
|
|
List<User> uses=null;
|
|
|
- PublicRelease use = publicReleaseMapper.selectByPrimaryKey(in.getId());
|
|
|
+ PublicRelease use = publicReleaseMapper.queryById(in.getId());
|
|
|
in.setCreateTime(use.getCreateTime());
|
|
|
String userNames=publicReleaseDetailsMapper.getNamesByPrid(in.getId());
|
|
|
PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),null,in.getReason(),date);
|
|
|
@@ -503,18 +503,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (PublicRelease out : list) {
|
|
|
addpublicLog(out.getId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单");
|
|
|
out.setStatus(3);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(out);
|
|
|
+ publicReleaseMapper.update(out);
|
|
|
}
|
|
|
|
|
|
for (PublicRelease out : list2) {
|
|
|
addpublicLog(out.getId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单助手");
|
|
|
out.setStatus(3);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(out);
|
|
|
+ publicReleaseMapper.update(out);
|
|
|
}
|
|
|
}
|
|
|
addPublicReleaseDateClock(in);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
+ publicReleaseMapper.update(in);
|
|
|
if (in.getOrderNo()!=null){
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
|
|
|
orderNewService.pushOrderPublicReleaseCount(tOrderNew);
|
|
|
@@ -670,7 +670,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
newP.setId(use.getId());
|
|
|
if (str.length()>1)newP.setUserNames(str.substring(0,str.length()-1));
|
|
|
newP.setPublicType(publicType);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(newP);
|
|
|
+ publicReleaseMapper.update(newP);
|
|
|
}
|
|
|
if (!addPrdList.isEmpty())publicReleaseDetailsMapper.insertBatch(addPrdList);
|
|
|
return users;
|
|
|
@@ -785,7 +785,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
boolean flag=false;
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
p.setId(id);
|
|
|
- PublicRelease use=publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
+ PublicRelease use=publicReleaseMapper.queryById(id);
|
|
|
if (use.getStatus()!=1) {
|
|
|
throw new BusinessException("只能修改发起的状态公出");
|
|
|
}
|
|
|
@@ -892,7 +892,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
PublicExamine newp=new PublicExamine();
|
|
|
newp.setId(pe.getId());
|
|
|
newp.setStatus(1);
|
|
|
- publicExamineMapper.updateByPrimaryKeySelective(newp);
|
|
|
+ publicExamineMapper.updateByPrimaryKey(newp);
|
|
|
x++;
|
|
|
}else {
|
|
|
if (pe.getStatus()==1){
|
|
|
@@ -924,7 +924,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
}
|
|
|
if (p.getStatus()!=null||p.getPublicType()!=null||p.getTechStartProcess()!=null){
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(p);
|
|
|
+ publicReleaseMapper.update(p);
|
|
|
updateAdminUserCountPublicRelease(use.getAid(),use.getReleaseStart());
|
|
|
}
|
|
|
if (a.getOpenId()!=null) {
|
|
|
@@ -944,7 +944,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
@Override
|
|
|
public Object updateAssistExamine(Integer id, Integer status, String remarks) {
|
|
|
- PublicRelease use = publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
+ PublicRelease use = publicReleaseMapper.queryById(id);
|
|
|
PublicRelease mianUse = publicReleaseMapper.selectSonIdByMain(id);
|
|
|
if (use.getAssist()!=2 && use.getStatus()!=1){
|
|
|
throw new BusinessException("该公出不是待协单审核的公出。");
|
|
|
@@ -960,14 +960,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
addpublicLog(id, status, remarks);
|
|
|
newPublic2.setId(use.getId());
|
|
|
newPublic2.setStatus(status);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(newPublic2);
|
|
|
+ publicReleaseMapper.update(newPublic2);
|
|
|
}else if(status==2){
|
|
|
content+="已通过审核。";
|
|
|
addpublicLog(id, status, remarks);
|
|
|
newPublic.setId(use.getId());
|
|
|
newPublic.setStatus(status);
|
|
|
}
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(newPublic);
|
|
|
+ publicReleaseMapper.update(newPublic);
|
|
|
sendNoticeAndSoucket(mianUse.getAid(),status,content.toString());
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -1075,8 +1075,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
@Override
|
|
|
public int pushTechReject(Integer id, String remarks) {
|
|
|
Integer status=0;
|
|
|
- PublicRelease use=publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
- PublicRelease mainPublic= publicReleaseMapper.selectByPrimaryKey(use.getMainId());
|
|
|
+ PublicRelease use=publicReleaseMapper.queryById(id);
|
|
|
+ PublicRelease mainPublic= publicReleaseMapper.queryById(use.getMainId());
|
|
|
Admin ad=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
if (use.getAssist()!=2){
|
|
|
@@ -1089,13 +1089,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
newMain.setRejectName(ad.getName());
|
|
|
newMain.setAuditInfo(str.toString());
|
|
|
addWeChatNotice(mainPublic.getAid(),0,str.toString(),mainPublic.getId());
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(newMain);
|
|
|
+ publicReleaseMapper.update(newMain);
|
|
|
PublicRelease up=new PublicRelease();
|
|
|
up.setId(id);
|
|
|
up.setAuditInfo(str.toString());
|
|
|
up.setStatus(3);
|
|
|
addpublicLog(id, status, remarks);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(up);
|
|
|
+ publicReleaseMapper.update(up);
|
|
|
deleteAssistantPulicRelease(use,null);
|
|
|
return addNoticeAndWeChat(mainPublic.getId(), mainPublic.getAid(), str.toString(), status);
|
|
|
}
|
|
|
@@ -1162,7 +1162,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
PublicRelease in = new PublicRelease();
|
|
|
in.setId(out.getId());
|
|
|
in.setStatus(3);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
+ publicReleaseMapper.update(in);
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]取消公出").append("[").append(use.getUserNames()).append("]。");
|
|
|
PublicReleaseLog log = new PublicReleaseLog(in.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.cx.getCode(), str.toString(), date);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
@@ -1177,7 +1177,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
//协单审核,判定是否跳过的逻辑
|
|
|
int x=pushAssist(out.getAid(), np,use);
|
|
|
np.setAid(null);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(np);
|
|
|
+ publicReleaseMapper.update(np);
|
|
|
updatePublicReleaseDtails(use,np);
|
|
|
if (x==2){
|
|
|
PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单未设置审核人,自动通过", new Date());
|
|
|
@@ -1347,7 +1347,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
p.setAssistantAid(use.getAssistantAid());
|
|
|
p.setAssistantName(use.getAssistantName());
|
|
|
p.setUserNames(use.getUserNames());
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(p);
|
|
|
+ publicReleaseMapper.update(p);
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了").append("[").append(use.getUserNames()).append("]。");
|
|
|
PublicReleaseLog log = new PublicReleaseLog(p.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), str.toString(), new Date());
|
|
|
sendNoticeAndSoucket(p.getAid(),p.getStatus(),str.toString());
|
|
|
@@ -1365,7 +1365,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
@Override
|
|
|
public int pushPublicReleaseClockIn(Integer id,String photoUrl,Integer clockIn ,String clockInRemarks ,String uid) {
|
|
|
if (clockIn == null) clockIn = 1;
|
|
|
- PublicRelease use = publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
+ PublicRelease use = publicReleaseMapper.queryById(id);
|
|
|
if (use.getPublicType()==1||use.getPublicType()==3) {
|
|
|
return -1;
|
|
|
}
|
|
|
@@ -1452,7 +1452,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
PublicRelease newp=new PublicRelease();
|
|
|
newp.setId(id);
|
|
|
newp.setClockIn(1);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(newp);
|
|
|
+ publicReleaseMapper.update(newp);
|
|
|
}
|
|
|
publicReleaseClockMapper.insertSelective(pc);
|
|
|
if (!flag){
|
|
|
@@ -1704,7 +1704,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
pr.setId(id);
|
|
|
if (StringUtils.isNotEmpty(supplement)) pr.setSupplement(supplement);
|
|
|
if (StringUtils.isNotEmpty(nextPlan)) pr.setNextPlan(nextPlan);
|
|
|
- return publicReleaseMapper.updateByPrimaryKeySelective(pr);
|
|
|
+ return publicReleaseMapper.update(pr);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -1851,7 +1851,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
@Override
|
|
|
public int addAssistant(Integer id,String aid) {
|
|
|
- PublicRelease p = publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
+ PublicRelease p = publicReleaseMapper.queryById(id);
|
|
|
List<String> list=new ArrayList<>();
|
|
|
if (StringUtils.isNotEmpty(p.getAssistantAid())){
|
|
|
list =new ArrayList<>(Arrays.asList(p.getAssistantAid().split(",")));
|
|
|
@@ -1883,7 +1883,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
newP.setId(pr.getId());
|
|
|
newP.setAssistantAid(p.getAssistantAid());
|
|
|
newP.setAssistantName(p.getAssistantName());
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(newP);
|
|
|
+ publicReleaseMapper.update(newP);
|
|
|
updatePublicReleaseDtails(p,newP);
|
|
|
}
|
|
|
}
|
|
|
@@ -1940,9 +1940,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
mianPr.setAid(said);
|
|
|
mianPr.setAssistantAid(said);
|
|
|
mianPr.setAssistantName(sname);
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(mianPr);
|
|
|
+ publicReleaseMapper.update(mianPr);
|
|
|
}
|
|
|
- return publicReleaseMapper.updateByPrimaryKeySelective(newPr);
|
|
|
+ return publicReleaseMapper.update(newPr);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -1973,7 +1973,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
@Override
|
|
|
public int deleteAssistant(Integer id, String aid) {
|
|
|
- PublicRelease p = publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
+ PublicRelease p = publicReleaseMapper.queryById(id);
|
|
|
if (p.getAssistantAid()==null){
|
|
|
throw new BusinessException("人员不存在");
|
|
|
}
|
|
|
@@ -2004,14 +2004,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
newPr.setId(pr.getId());
|
|
|
newPr.setAssistantAid(p.getAssistantAid());
|
|
|
newPr.setAssistantName(p.getAssistantName());
|
|
|
- publicReleaseMapper.updateByPrimaryKeySelective(newPr);
|
|
|
+ publicReleaseMapper.update(newPr);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public boolean checkdeleteAssistant(Integer id, String aid) {
|
|
|
- PublicRelease p = publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
+ PublicRelease p = publicReleaseMapper.queryById(id);
|
|
|
List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, aid);
|
|
|
for (PublicRelease use : list) {
|
|
|
// if (use.getClockIn()==1){
|
|
|
@@ -2023,7 +2023,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
@Override
|
|
|
public boolean checkaddAssistant(Integer id, String aid) {
|
|
|
- PublicRelease p = publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
+ PublicRelease p = publicReleaseMapper.queryById(id);
|
|
|
List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, aid);
|
|
|
for (PublicRelease use : list) {
|
|
|
if (use.getAid().equals(aid)&&use.getStatus()!=3){
|