Skip to content

A
amos-boot-biz
Commit 4f80e132 authored by 李秀明's avatar 李秀明
Browse files
Options

驳回生成整改单代码修改

parent 8eba24ba
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 14 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/BasicGridAcceptancEnum.java
View file @ 4f80e132
...@@ -14,14 +14,10 @@ public enum BasicGridAcceptancEnum { ...@@ -14,14 +14,10 @@ public enum BasicGridAcceptancEnum {
并网管理端工程审核("hygf_bw2", "hygf_bw2"), 并网管理端工程审核("hygf_bw2", "hygf_bw2"),
经销商工程提交验收("hygf_ys1", "hygf_ys1"), 经销商工程提交验收("hygf_ys1", "hygf_ys1"),
管理端投融审核("hygf_ys2", "hygf_ys2"), 管理端投融审核("hygf_ys2", "hygf_ys2"),
经销商投融整改("hygf_zg_tr", "hygf_zg_tr"),
管理端法务审核("hygf_ys3", "hygf_ys3"), 管理端法务审核("hygf_ys3", "hygf_ys3"),
经销商法务整改("hygf_zg_fw", "hygf_zg_fw"),
管理端工程审核("hygf_ys4", "hygf_ys4"), 管理端工程审核("hygf_ys4", "hygf_ys4"),
经销商工程整改("hygf_zg_gc", "hygf_zg_gc"),
管理端工程是否线下("hygf_ys5", "hygf_ys5"), 管理端工程是否线下("hygf_ys5", "hygf_ys5"),
管理端工程线下验("hygf_ys6", "hygf_ys6"), 管理端工程线下验("hygf_ys6", "hygf_ys6");
经销商线下整改("hygf_zg_xx", "hygf_zg_xx");
/** /**
* 名称，描述 * 名称，描述
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java
View file @ 4f80e132
...@@ -159,18 +159,18 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -159,18 +159,18 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode()); basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
} }
// 投融/法务/工程/线下验收审核不通过 // 投融/法务/工程/线下验收审核不通过
else if ( else if (PASS.equals(dto.getApprovalStatus()) && (
BasicGridAcceptancEnum.经销商投融整改.getCode().equals(nextNodeKey) || BasicGridAcceptancEnum.管理端投融审核.getCode().equals(nextNodeKey) ||
BasicGridAcceptancEnum.经销商法务整改.getCode().equals(nextNodeKey) || BasicGridAcceptancEnum.管理端法务审核.getCode().equals(nextNodeKey) ||
BasicGridAcceptancEnum.经销商工程整改.getCode().equals(nextNodeKey) || BasicGridAcceptancEnum.管理端工程审核.getCode().equals(nextNodeKey) ||
BasicGridAcceptancEnum.经销商线下整改.getCode().equals(nextNodeKey) BasicGridAcceptancEnum.管理端工程是否线下.getCode().equals(nextNodeKey)
) { )) {
AcceptanceRectificationOrder rectificationOrder = new AcceptanceRectificationOrder(); AcceptanceRectificationOrder rectificationOrder = new AcceptanceRectificationOrder();
try { try {
rectificationOrder.setRectificationOrderCode("ZGD" + DateUtil.formatDate(new Date(), DateUtil.YMDHM)); rectificationOrder.setRectificationOrderCode("ZGD" + DateUtil.formatDate(new Date(), DateUtil.YMDHM));
rectificationOrder.setWorkOrderId(dto.getWorkOrderId()); rectificationOrder.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
rectificationOrder.setWorkOrderPowerStationId(dto.getWorkOrderPowerStationId()); rectificationOrder.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
rectificationOrder.setPeasantHouseholdId(dto.getPeasantHouseholdId()); rectificationOrder.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());
rectificationOrder.setProblemDescription(dto.getComment()); rectificationOrder.setProblemDescription(dto.getComment());
rectificationOrder.setRectificationStatus(String.valueOf(RectificationStatusEnum.待整改.getCode())); rectificationOrder.setRectificationStatus(String.valueOf(RectificationStatusEnum.待整改.getCode()));
} catch (Exception e) { } catch (Exception e) {
......
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