Skip to content

京
京能客户端
Commit 590b1e92 authored by liangyb's avatar liangyb
Browse files
Options

#394 2024708 解决专家回退会生成json字符给用户展示

parent 68a92b5e
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 24 deletions
OBE-CONFIG/config_final.properties
View file @ 590b1e92
#\u7cfb\u7edf\u7248\u672c #\u7cfb\u7edf\u7248\u672c
version=OBEV7.7.9.20240611 version=OBEV7.7.9.20240705
keyCharacter= keyCharacter=
#\u6b63\u5f0f\u7248\u672c\u68c0\u67e5\u5347\u7ea7\u7f16\u7801 #\u6b63\u5f0f\u7248\u672c\u68c0\u67e5\u5347\u7ea7\u7f16\u7801
versionUpdateType=OBE_FinalService versionUpdateType=OBE_FinalService
......
OBE-CONFIG/config_test.properties
View file @ 590b1e92
#\u7cfb\u7edf\u7248\u672c #\u7cfb\u7edf\u7248\u672c
version=OBEV7.7.9.20240611 version=OBEV7.7.9.20240705
keyCharacter=g keyCharacter=g
versionUpdateType=OBE_Service versionUpdateType=OBE_Service
#\u6d4b\u8bd5\u7ad9\u4e13\u5bb6\u7b7e\u670d\u52a1 #\u6d4b\u8bd5\u7ad9\u4e13\u5bb6\u7b7e\u670d\u52a1
......
com.gx.obe.step/src/com/gx/obe/step/dialog/ReEvaluationConfirmDialog.java
View file @ 590b1e92
package com.gx.obe.step.dialog; package com.gx.obe.step.dialog;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -288,20 +289,22 @@ public class ReEvaluationConfirmDialog extends EDialog { ...@@ -288,20 +289,22 @@ public class ReEvaluationConfirmDialog extends EDialog {
} }
List<ExpertEvaluationStep> expertEvaluationStepList = new ArrayList<ExpertEvaluationStep>(); List<ExpertEvaluationStep> expertEvaluationStepList = new ArrayList<ExpertEvaluationStep>();
if (null != expertEvaluationStep) { if (null != expertEvaluationStep) {
List<ExpertEvaluationStepLogInfo> list = ExpertEvaluationStepLogInfoUtils.getExpertEvaluationStepLogInfo(expertEvaluationStep.getApplyReason()); // List<ExpertEvaluationStepLogInfo> list = ExpertEvaluationStepLogInfoUtils.getExpertEvaluationStepLogInfo(expertEvaluationStep.getApplyReason());
if (list.size() >= 1) { // if (list.size() >= 1) {
ExpertEvaluationStepLogInfo info = list.get(list.size() - 1); // ExpertEvaluationStepLogInfo info = list.get(list.size() - 1);
info.setApproveDate(NowTimeUtils.getNowDate()); // info.setApproveDate(NowTimeUtils.getNowDate());
info.setApproveUserIdCard(Constants.USER.getIdCard() != null ? Constants.USER.getIdCard() : Constants.USER.getUserAccount()); // info.setApproveUserIdCard(Constants.USER.getIdCard() != null ? Constants.USER.getIdCard() : Constants.USER.getUserAccount());
info.setApproveUserAccount(Constants.USER.getUserAccount()); // info.setApproveUserAccount(Constants.USER.getUserAccount());
info.setApproveUserName(Constants.USER.getUserName()); // info.setApproveUserName(Constants.USER.getUserName());
expertEvaluationStep.setApplyReason(JsonUtil.jacksonObjectToStr(list)); // expertEvaluationStep.setApplyReason(JsonUtil.jacksonObjectToStr(list));
} // }
String applyReason = StringUtils.isEmpty(expertEvaluationStep.getApplyReason()) ? "" : expertEvaluationStep.getApplyReason();
historyApplyReasonText.setText(applyReason);
expertEvaluationStepList.add(expertEvaluationStep); expertEvaluationStepList.add(expertEvaluationStep);
if (isApply) { if (isApply) {
ActionLogUtils.addServerLog(evaluationStep.getTenderId(), "退回专家", expertEvaluationStep.getUserId() + "退回原因：" + rebackReasonText.getText()); ActionLogUtils.addServerLog(evaluationStep.getTenderId(), "退回专家", expertEvaluationStep.getUserId() + "退回原因：" + historyApplyReasonText.getText());
} else { } else {
ActionLogUtils.addServerLog(evaluationStep.getTenderId(), "同意退回", expertEvaluationStep.getUserId() + "退回原因：" + historyApplyReasonText.getText()); ActionLogUtils.addServerLog(evaluationStep.getTenderId(), "同意退回", expertEvaluationStep.getUserId() + "退回原因：" + rebackReasonText.getText());
} }
} else { } else {
...@@ -334,18 +337,32 @@ public class ReEvaluationConfirmDialog extends EDialog { ...@@ -334,18 +337,32 @@ public class ReEvaluationConfirmDialog extends EDialog {
stepService.deleteById(everyExpertEvaluationStep.getId()); stepService.deleteById(everyExpertEvaluationStep.getId());
continue; continue;
} }
if (null != everyExpertEvaluationStep.getApplyStatus() && everyExpertEvaluationStep.getApplyStatus().equals(CommonEnum.YES)) { // if (null != everyExpertEvaluationStep.getApplyStatus() && everyExpertEvaluationStep.getApplyStatus().equals(CommonEnum.YES)) {
everyExpertEvaluationStep.setApplyStatus(null); // everyExpertEvaluationStep.setApplyStatus(null);
stepService.updateAssignProperty(everyExpertEvaluationStep, new String[] { "applyStatus", "applyReason" }); // stepService.updateAssignProperty(everyExpertEvaluationStep, new String[] { "applyStatus", "applyReason" });
} else { // } else {
List<ExpertEvaluationStepLogInfo> expertEvaluationStepLogInfoList = ExpertEvaluationStepLogInfoUtils.getExpertEvaluationStepLogInfo(everyExpertEvaluationStep.getApplyReason()); // List<ExpertEvaluationStepLogInfo> expertEvaluationStepLogInfoList = ExpertEvaluationStepLogInfoUtils.getExpertEvaluationStepLogInfo(everyExpertEvaluationStep.getApplyReason());
Date date = NowTimeUtils.getNowDate(); // Date date = NowTimeUtils.getNowDate();
ExpertEvaluationStepLogInfo info = new ExpertEvaluationStepLogInfo(rebackReasonText.getText(), Constants.USER.getUserName(), Constants.USER.getUserAccount(), Constants.USER.getIdCard(), "01", date, date, Constants.USER.getUserName(), Constants.USER.getIdCard(), Constants.USER.getUserAccount()); // ExpertEvaluationStepLogInfo info = new ExpertEvaluationStepLogInfo(rebackReasonText.getText(), Constants.USER.getUserName(), Constants.USER.getUserAccount(), Constants.USER.getIdCard(), "01", date, date, Constants.USER.getUserName(), Constants.USER.getIdCard(), Constants.USER.getUserAccount());
expertEvaluationStepLogInfoList.add(info); // expertEvaluationStepLogInfoList.add(info);
everyExpertEvaluationStep.setApplyStatus(null); // everyExpertEvaluationStep.setApplyStatus(null);
everyExpertEvaluationStep.setApplyReason(JsonUtil.jsonObjectToStr(expertEvaluationStepLogInfoList)); // everyExpertEvaluationStep.setApplyReason(JsonUtil.jsonObjectToStr(expertEvaluationStepLogInfoList));
stepService.updateAssignProperty(everyExpertEvaluationStep, new String[] { "applyStatus", "applyReason" }); // stepService.updateAssignProperty(everyExpertEvaluationStep, new String[] { "applyStatus", "applyReason" });
// }
if(!isApply){
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
StringBuilder reason = new StringBuilder();
if(everyExpertEvaluationStep.getApplyReason().length() > 0){
reason.append(everyExpertEvaluationStep.getApplyReason());
reason.append("\r\n");
}
reason.append(format.format(NowTimeUtils.getNowDate()));
reason.append("\r\n ");
reason.append(rebackReasonText.getText().trim());
everyExpertEvaluationStep.setApplyReason(reason.toString());
} }
everyExpertEvaluationStep.setApplyStatus(null);
stepService.updateAssignProperty(everyExpertEvaluationStep, new String[] { "applyStatus", "applyReason" });
} }
} }
// //如果是废标 // //如果是废标
......
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