1 changed files with 12 additions and 12 deletions
Unified View
Diff Options
+ 12
- 12
pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
View File
| @@ -219,10 +219,10 @@ public class ProjectConvert { | |||||
| req.setPreliminaryDesignFile(approve.getPreliminaryDesignFile()); | req.setPreliminaryDesignFile(approve.getPreliminaryDesignFile()); | ||||
| req.setAreaCode(approve.getAreaCode()); | req.setAreaCode(approve.getAreaCode()); | ||||
| req.setBaseDevelopCode(approve.getBaseDevelopCode()); | req.setBaseDevelopCode(approve.getBaseDevelopCode()); | ||||
| req.setBaseExpertTotalMoney(String.valueOf(approve.getBaseExpertTotalMoney())); | |||||
| req.setBaseExpertYearMoney(String.valueOf(approve.getBaseExpertYearMoney())); | |||||
| req.setReleaseYearMoney(String.valueOf(approve.getReleaseYearMoney())); | |||||
| req.setBaseInitialReviewTotalMoney(String.valueOf(approve.getBaseInitialReviewTotalMoney())); | |||||
| req.setBaseExpertTotalMoney(Objects.nonNull(approve.getBaseExpertTotalMoney()) ? String.valueOf(approve.getBaseExpertTotalMoney()) : null); | |||||
| req.setBaseExpertYearMoney(Objects.nonNull(approve.getBaseExpertYearMoney()) ? String.valueOf(approve.getBaseExpertYearMoney()) : null); | |||||
| req.setReleaseYearMoney(Objects.nonNull(approve.getReleaseYearMoney()) ? String.valueOf(approve.getReleaseYearMoney()) : null); | |||||
| req.setBaseInitialReviewTotalMoney(Objects.nonNull(approve.getBaseInitialReviewTotalMoney()) ? String.valueOf(approve.getBaseInitialReviewTotalMoney()) : null); | |||||
| req.setBaseReviewOpinion(approve.getBaseReviewOpinion()); | req.setBaseReviewOpinion(approve.getBaseReviewOpinion()); | ||||
| req.setBaseReviewResults(approve.getBaseReviewResults()); | req.setBaseReviewResults(approve.getBaseReviewResults()); | ||||
| req.setEqualProtectionLevel(approve.getEqualProtectionLevel()); | req.setEqualProtectionLevel(approve.getEqualProtectionLevel()); | ||||
| @@ -244,10 +244,10 @@ public class ProjectConvert { | |||||
| req.setPreliminaryDesignFile(approve.getPreliminaryDesignFile()); | req.setPreliminaryDesignFile(approve.getPreliminaryDesignFile()); | ||||
| req.setAreaCode(approve.getAreaCode()); | req.setAreaCode(approve.getAreaCode()); | ||||
| req.setBaseDevelopCode(approve.getBaseDevelopCode()); | req.setBaseDevelopCode(approve.getBaseDevelopCode()); | ||||
| req.setBaseExpertTotalMoney(String.valueOf(approve.getBaseExpertTotalMoney())); | |||||
| req.setBaseExpertYearMoney(String.valueOf(approve.getBaseExpertYearMoney())); | |||||
| req.setReleaseYearMoney(String.valueOf(approve.getReleaseYearMoney())); | |||||
| req.setBaseInitialReviewTotalMoney(String.valueOf(approve.getBaseInitialReviewTotalMoney())); | |||||
| req.setBaseExpertTotalMoney(Objects.nonNull(approve.getBaseExpertTotalMoney()) ? String.valueOf(approve.getBaseExpertTotalMoney()) : null); | |||||
| req.setBaseExpertYearMoney(Objects.nonNull(approve.getBaseExpertYearMoney()) ? String.valueOf(approve.getBaseExpertYearMoney()) : null); | |||||
| req.setReleaseYearMoney(Objects.nonNull(approve.getReleaseYearMoney()) ? String.valueOf(approve.getReleaseYearMoney()) : null); | |||||
| req.setBaseInitialReviewTotalMoney(Objects.nonNull(approve.getBaseInitialReviewTotalMoney()) ? String.valueOf(approve.getBaseInitialReviewTotalMoney()) : null); | |||||
| req.setBaseReviewOpinion(approve.getBaseReviewOpinion()); | req.setBaseReviewOpinion(approve.getBaseReviewOpinion()); | ||||
| req.setBaseReviewResults(approve.getBaseReviewResults()); | req.setBaseReviewResults(approve.getBaseReviewResults()); | ||||
| req.setEqualProtectionLevel(approve.getEqualProtectionLevel()); | req.setEqualProtectionLevel(approve.getEqualProtectionLevel()); | ||||
| @@ -272,10 +272,10 @@ public class ProjectConvert { | |||||
| approve.getPreliminaryDesignFile()); | approve.getPreliminaryDesignFile()); | ||||
| req.setAreaCode(approve.getAreaCode()); | req.setAreaCode(approve.getAreaCode()); | ||||
| req.setBaseDevelopCode(approve.getBaseDevelopCode()); | req.setBaseDevelopCode(approve.getBaseDevelopCode()); | ||||
| req.setBaseExpertTotalMoney(String.valueOf(approve.getBaseExpertTotalMoney())); | |||||
| req.setBaseExpertYearMoney(String.valueOf(approve.getBaseExpertYearMoney())); | |||||
| req.setReleaseYearMoney(String.valueOf(approve.getReleaseYearMoney())); | |||||
| req.setBaseInitialReviewTotalMoney(String.valueOf(approve.getBaseInitialReviewTotalMoney())); | |||||
| req.setBaseExpertTotalMoney(Objects.nonNull(approve.getBaseExpertTotalMoney()) ? String.valueOf(approve.getBaseExpertTotalMoney()) : null); | |||||
| req.setBaseExpertYearMoney(Objects.nonNull(approve.getBaseExpertYearMoney()) ? String.valueOf(approve.getBaseExpertYearMoney()) : null); | |||||
| req.setReleaseYearMoney(Objects.nonNull(approve.getReleaseYearMoney()) ? String.valueOf(approve.getReleaseYearMoney()) : null); | |||||
| req.setBaseInitialReviewTotalMoney(Objects.nonNull(approve.getBaseInitialReviewTotalMoney()) ? String.valueOf(approve.getBaseInitialReviewTotalMoney()) : null); | |||||
| req.setBaseReviewOpinion(approve.getBaseReviewOpinion()); | req.setBaseReviewOpinion(approve.getBaseReviewOpinion()); | ||||
| req.setBaseReviewResults(approve.getBaseReviewResults()); | req.setBaseReviewResults(approve.getBaseReviewResults()); | ||||
| req.setEqualProtectionLevel(approve.getEqualProtectionLevel()); | req.setEqualProtectionLevel(approve.getEqualProtectionLevel()); | ||||