Commit 36975467 authored by chenyuxi's avatar chenyuxi

feat: 瓜子代码调整

parent 35f3cbf9
......@@ -143,13 +143,13 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM
// 发送短信
switch (lGuaziOfferRecordVo.getRecordFrom()) {
case CommonConstants.THREE_STRING:
sendFrom = "发送Offer查阅短信";
sendFrom = "Offer查阅短信";
break;
case CommonConstants.FOUR_STRING:
sendFrom = "发送信息收集短信";
sendFrom = "信息收集短信";
break;
default:
sendFrom = "发送合同下载短信";
sendFrom = "合同下载短信";
break;
}
content = MessageFormat.format(sendSmsTemplate, sendFrom, sendSmsRes);
......@@ -163,12 +163,7 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM
if(changeArr.size() != 2 ){
continue;
}
if(Common.isEmpty(this.getStatusLabel(changeArr.get(0)))
|| Common.isEmpty(this.getStatusLabel(changeArr.get(1)))){
continue;
}
String fieldChangeContent = fieldZhName+":由"+changeArr.get(0)+"更新为"+ changeArr.get(1)+";";
String fieldChangeContent = fieldZhName+":由"+changeArr.get(0)+"更新为"+ changeArr.get(1)+";";
content = content + fieldChangeContent;
}
}
......
......@@ -97,6 +97,9 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
// 当前Offer更新状态,无法再发起更新:5:拒绝Offer、10:取消offer、8:合同审核通过、99:已归档
private final String[] failStatusArr = {"5", "10", "8", "99"};
// 当前Offer更新状态,允许编辑:3:待发送Offer,4:待接受Offer
private final String[] allowUpdateArr = {"3", "4"};
private final TGzEmpInfoService tGzEmpInfoService;
/**
......@@ -152,6 +155,11 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
if (Common.isEmpty(findInfo)) {
return R.failed(CommonConstants.ERROR_NO_DOMAIN);
}
// 判断当前Offer更新状态,是否可以编辑
if (!ArrayUtils.contains(allowUpdateArr, findInfo.getOfferStatus())) {
return R.failed("当前Offer状态,禁止编辑");
}
tGzOfferInfo.setUpdateBy(user.getId());
tGzOfferInfo.setUpdateTime(LocalDateTime.now());
......@@ -160,13 +168,13 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
// 记录offer操作日志
LGuaziOfferRecordVo lGuaziOfferRecordVo = new LGuaziOfferRecordVo();
Map<String,List<String>> changeInfoMap = new HashMap<>();
if(!tGzOfferInfo.getPhone().equals(findInfo.getPhone())){
if(Common.isNotNull(tGzOfferInfo.getPhone()) && !tGzOfferInfo.getPhone().equals(findInfo.getPhone())){
List<String> valueList = new ArrayList<>();
valueList.add(findInfo.getPhone());
valueList.add(tGzOfferInfo.getPhone());
changeInfoMap.put("个人手机号",valueList);
}
if(!tGzOfferInfo.getEmail().equals(findInfo.getEmail())){
if(Common.isNotNull(tGzOfferInfo.getEmail()) && !tGzOfferInfo.getEmail().equals(findInfo.getEmail())){
List<String> valueList = new ArrayList<>();
valueList.add(findInfo.getEmail());
valueList.add(tGzOfferInfo.getEmail());
......
......@@ -45,6 +45,7 @@ security:
- /sysguazibankbranch/page
- /sysoutempforminfo/configList
- /dict/getDictMapByClientId
- /sysoutreldictitem/inner/getDictMap
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment