shiyang / regional-platform

Download as
Browse Code »

Commit a154398f2c9cc78a643f08ce92951200b2e37647

Authored by jiangjiazhi
1 parent 5f93b19294
Exists in master and in 1 other branch nobuildprocess

增加设置parentid

Showing 1 changed file with 39 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ a154398
... ... @@ -50,6 +50,8 @@
50 50  
51 51 private static Map<Integer,String> ONE_ENUMS= new HashMap<>();
52 52 static {
  53 + ONE_ENUMS.put(0,"长");
  54 + ONE_ENUMS.put(1,"次");
53 55 ONE_ENUMS.put(2,"三");
54 56 ONE_ENUMS.put(3,"四");
55 57 ONE_ENUMS.put(4,"五");
56 58  
... ... @@ -203,11 +205,12 @@
203 205  
204 206  
205 207 private static List buildBabyName(List<MatDeliverAddRequest.Baby> list) {
206   - Map<String, List> babyMap = new HashMap<>();
  208 + /* Map<String, List> babyMap = new HashMap<>();
207 209 List<String> b1 = new ArrayList<>();
208 210 b1.add("长女");
209 211 b1.add("次女");
210   - babyMap.put("00", b1);
  212 + b1.add("三女");
  213 + babyMap.put("000", b1);
211 214  
212 215 List<String> b2 = new ArrayList<>();
213 216 b2.add("长子");
214 217  
215 218  
216 219  
217 220  
218 221  
... ... @@ -222,31 +225,59 @@
222 225 b4.add("之女");
223 226 b4.add("之子");
224 227 babyMap.put("01", b4);
225   - babyMap.put("10", b3);
  228 + babyMap.put("10", b3);*/
226 229  
227   - String id="";
  230 +
  231 + int boyCount =0;
  232 + int girlCount =0;
  233 + List<String> l = new ArrayList<>();
  234 + for (int i = 0; i < list.size(); i++) {
  235 + MatDeliverAddRequest.Baby baby = list.get(i);
  236 + if(StringUtils.isNotEmpty(baby.getBabyGender())){
  237 + if("1".equals(baby.getBabyGender())){
  238 + l.add(ONE_ENUMS.get(boyCount)+"子");
  239 + boyCount++;
  240 + }else if("0".equals(baby.getBabyGender())){
  241 + l.add(ONE_ENUMS.get(girlCount)+"女");
  242 + girlCount++;
  243 + }
  244 + }
  245 + }
  246 + System.out.print(l);
  247 +
  248 +
  249 +
  250 + return l;
  251 + /* String id="";
  252 +
228 253 for (int i = 0; i < list.size() && i < 2; i++) {
229 254 MatDeliverAddRequest.Baby baby = list.get(i);
230 255 if(StringUtils.isNotEmpty(baby.getBabyGender())){
231 256 id+=baby.getBabyGender();
232 257 }
233 258 }
234   - return babyMap.get(id);
  259 + return babyMap.get(id);*/
235 260 }
236 261  
237 262 public static void main(String[] args){
238 263 MatDeliverAddRequest.Baby baby=new MatDeliverAddRequest.Baby();
239   - baby.setBabyGender("1");
  264 + baby.setBabyGender("0");
240 265  
241 266 MatDeliverAddRequest.Baby baby1=new MatDeliverAddRequest.Baby();
242 267 baby1.setBabyGender("1");
243 268 MatDeliverAddRequest.Baby baby2=new MatDeliverAddRequest.Baby();
244 269 baby2.setBabyGender("0");
  270 + MatDeliverAddRequest.Baby baby3=new MatDeliverAddRequest.Baby();
  271 + baby3.setBabyGender("1");
  272 + MatDeliverAddRequest.Baby baby4=new MatDeliverAddRequest.Baby();
  273 + baby4.setBabyGender("0");
245 274 List list = new ArrayList();
246 275 list.add(baby);
247 276 list.add(baby1);
248 277 list.add(baby2);
249   - System.out.print((buildBabyName(list)));
  278 + list.add(baby3);
  279 + list.add(baby4);
  280 + buildBabyName(list);
250 281 }
251 282  
252 283 /**
253 284  
... ... @@ -293,10 +324,8 @@
293 324 babyModel.setEarlySuck(baby1.getEarlySuck());
294 325 babyModel.setParentId(parentId);
295 326 babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女"));
296   - if(CollectionUtils.isNotEmpty(babyName)&&i<babyName.size()){
  327 + if(CollectionUtils.isNotEmpty(babyName)){
297 328 babyModel.setName(userName + babyName.get(i));
298   - }else if(i>=2){
299   - babyModel.setName(userName + ONE_ENUMS.get(i) + (babyModel.getSex() == 1 ? "子" : "女"));
300 329 }
301 330 babyModel.setYn(YnEnums.NO.getId());
302 331