|
|
@@ -101,11 +101,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setTechStartProcess(1);
|
|
|
}
|
|
|
}
|
|
|
- if (in.getValidDate()!=null){
|
|
|
- String validDate = in.getValidDate();
|
|
|
- List<Map> maps = JSONArray.parseArray(validDate, Map.class);
|
|
|
-
|
|
|
- }
|
|
|
publicReleaseMapper.insertSelective(in);
|
|
|
List<PublicReleaseDetails> prdList=new ArrayList<>();
|
|
|
List<User> users=new ArrayList<>();
|
|
|
@@ -164,7 +159,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(updateName);
|
|
|
addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
|
|
|
asyncUtils.addNoticAndEmail(NoticeStatus.MENBER_START.getCode(),TokenManager.getAdminId()
|
|
|
- ,String.format("营销员XXX,2024年6月5日10:00-12:00,将公出湖南XXXX公司,请知悉!"));
|
|
|
+ ,String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),in.getReleaseStart(),in.getReleaseEnd(),
|
|
|
+ userNames));
|
|
|
return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
|
|
|
}
|
|
|
|