From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 02 一月 2025 18:44:28 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java | 509 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 256 insertions(+), 253 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java index 6971650..9b321ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java @@ -9,6 +9,7 @@ import com.ruoyi.common.enums.Education; import com.ruoyi.common.enums.NationalityEnum; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.project.domain.vo.RelativeConfirmationVO; import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper; import com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper; @@ -20,6 +21,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -40,15 +42,14 @@ /** * 鎹愮尞浜插睘纭Controller - * + * * @author ruoyi * @date 2021-11-15 */ @Api("浜插睘纭绠$悊") @RestController @RequestMapping("/project/relativesconfirmation") -public class ServiceRelativesconfirmationController extends BaseController -{ +public class ServiceRelativesconfirmationController extends BaseController { @Autowired private IServiceRelativesconfirmationService serviceRelativesconfirmationService; @@ -70,18 +71,16 @@ * 鏌ヨ鎹愮尞浜插睘纭鍒楄〃 */ @ApiOperation("鑾峰彇浜插睘纭鍒楄〃") - //@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:list')") + //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:list')") @GetMapping("/list") - public TableDataInfo list(ServiceRelativesconfirmation serviceRelativesconfirmation) - { + public TableDataInfo list(ServiceRelativesconfirmation serviceRelativesconfirmation) { startPage(); List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation); return getDataTable(list); } @GetMapping("/listnew") - public TableDataInfo listnew (RelativeConfirmationVO relativeConfirmationVO) - { + public TableDataInfo listnew(RelativeConfirmationVO relativeConfirmationVO) { startPage(); List<RelativeConfirmationVO> list = serviceRelativesconfirmationService.selectVOList(relativeConfirmationVO); return getDataTable(list); @@ -92,11 +91,10 @@ * 瀵煎嚭鎹愮尞浜插睘纭鍒楄〃 */ @ApiOperation("瀵煎嚭浜插睘纭鍒楄〃") - //@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:export')") + //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:export')") @Log(title = "鎹愮尞浜插睘纭", businessType = BusinessType.EXPORT) @GetMapping("/export") - public AjaxResult export(ServiceRelativesconfirmation serviceRelativesconfirmation) - { + public AjaxResult export(ServiceRelativesconfirmation serviceRelativesconfirmation) { List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation); ExcelUtil<ServiceRelativesconfirmation> util = new ExcelUtil<ServiceRelativesconfirmation>(ServiceRelativesconfirmation.class); return util.exportExcel(list, "鎹愮尞浜插睘纭鏁版嵁"); @@ -106,10 +104,9 @@ * 鑾峰彇鎹愮尞浜插睘纭璇︾粏淇℃伅 */ @ApiOperation("閫氳繃id鑾峰彇浜插睘纭淇℃伅") - //@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:query')") + //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(serviceRelativesconfirmationService.getById(id)); } @@ -117,25 +114,34 @@ * 鏂板鎹愮尞浜插睘纭 */ @ApiOperation("鏂板浜插睘纭") - //@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:add')") + //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:add')") @Log(title = "鎹愮尞浜插睘纭", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") @RepeatSubmit - public AjaxResult add(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) - { - return toAjax(serviceRelativesconfirmationService.save(serviceRelativesconfirmation)); + public AjaxResult add(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) { + boolean save = serviceRelativesconfirmationService.save(serviceRelativesconfirmation); + return AjaxResult.success(serviceRelativesconfirmation); } /** * 淇敼鎹愮尞浜插睘纭 */ @ApiOperation("淇敼浜插睘纭") - //@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:edit')") + //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:edit')") @Log(title = "鎹愮尞浜插睘纭", businessType = BusinessType.UPDATE) - @PutMapping - @RepeatSubmit - public AjaxResult edit(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) - { + @PostMapping("/edit") + @RepeatSubmit + public AjaxResult edit(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) { + if (serviceRelativesconfirmation.getInfoid() == null || serviceRelativesconfirmation.getId() == null) { + throw new BaseException("璇疯仈绯诲伐绋嬪笀妫�鏌D鏄惁涓虹┖"); + } +// ServiceRelativesconfirmation serviceRelativesconfirmation1 = new ServiceRelativesconfirmation(); +// serviceRelativesconfirmation1.setInfoid(serviceRelativesconfirmation.getInfoid()); +// List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation1); +// if (CollectionUtils.isEmpty(list)) { +// return error("鎹愮尞浜插睘纭鏁版嵁涓嶅瓨鍦�,璇锋鏌ュ悗鍐嶆淇敼"); +// } +// serviceRelativesconfirmation.setId(list.get(0).getId()); return toAjax(serviceRelativesconfirmationService.updateById(serviceRelativesconfirmation)); } @@ -143,17 +149,16 @@ * 鍒犻櫎鎹愮尞浜插睘纭 */ @ApiOperation("鍒犻櫎浜插睘纭") - //@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:remove')") + //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:remove')") @Log(title = "鎹愮尞浜插睘纭", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @GetMapping("/remove/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(serviceRelativesconfirmationService.removeByIds(Arrays.asList(ids))); } @GetMapping(value = "/addH4H5InDonateNumber/{infoid}") - public AjaxResult addH4H5 (@PathVariable Long infoid){ + public AjaxResult addH4H5(@PathVariable Long infoid) { return AjaxResult.success(serviceRelativesconfirmationService.addH4H5(infoid)); } @@ -164,12 +169,12 @@ @GetMapping(value = "/download/{id}") public Map downloadInfo(@PathVariable("id") Long id) throws IOException { Map dataMap = new HashMap(); - getData(dataMap,id); + getData(dataMap, id); String filePath = getClass().getResource("/template/").getPath(); System.out.println(filePath); //璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛� configuration.setDirectoryForTemplateLoading(new File(filePath)); - Template t=null; + Template t = null; try { //鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉� t = configuration.getTemplate("浜轰綋鍣ㄥ畼鎹愮尞浜插睘纭鐧昏琛�.ftl"); @@ -177,35 +182,33 @@ e.printStackTrace(); } String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis()); - String name = "浜轰綋鍣ㄥ畼鎹愮尞浜插睘纭鐧昏琛╛"+dataMap.get("XM")+"_"+ newTime; + String name = "浜轰綋鍣ㄥ畼鎹愮尞浜插睘纭鐧昏琛╛" + dataMap.get("XM") + "_" + newTime; //杈撳嚭鏂囨。璺緞鍙婂悕绉� - File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc"); + File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc"); Writer out = null; try { - out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8")); - - } catch (FileNotFoundException e1) { - e1.printStackTrace(); - } - try { + out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8")); t.process(dataMap, out); } catch (TemplateException e) { e.printStackTrace(); } - Map<String ,Object> map = new HashMap<>(); - map.put("downloadUrl","/profile/download/wordtemplate/"+name+".doc"); + Map<String, Object> map = new HashMap<>(); + map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc"); + map.put("downloadName", name + ".doc"); return map; } + /** * 娉ㄦ剰dataMap閲屽瓨鏀剧殑鏁版嵁Key鍊艰涓庢ā鏉夸腑鐨勫弬鏁扮浉瀵瑰簲 + * * @param dataMap */ - private void getData(Map dataMap,Long id){ + private void getData(Map dataMap, Long id) { ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation(); serviceRelativesconfirmation.setInfoid(id); List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation); - if(list.size()== 0 || list.size() > 1){ + if (list.size() == 0 || list.size() > 1) { throw new ServiceException("涓嬭浇澶辫触锛屼翰灞炰俊鎭嚭閿�", HttpStatus.NO_CONTENT); } //浜插睘淇℃伅 @@ -214,303 +217,303 @@ RelativeConfirmationVO relativeConfirmationVO = new RelativeConfirmationVO(); relativeConfirmationVO.setInfoid(id); List<RelativeConfirmationVO> selectVOList = serviceRelativesconfirmationMapper.selectVOList(relativeConfirmationVO); - if(selectVOList.size() ==0 || list.size() > 1){ + if (selectVOList.size() == 0 || list.size() > 1) { throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT); } //鎹愮尞浜轰俊鎭� RelativeConfirmationVO relativeConfirmation = selectVOList.get(0); - dataMap.put("JXBH",serviceRelatives.getDonorno() == null ? "" : serviceRelatives.getDonorno()); + dataMap.put("JXBH", serviceRelatives.getDonorno() == null ? "" : serviceRelatives.getDonorno()); String donorName = serviceDonatebaseinfoMapper.getDonorNameById(serviceRelatives.getInfoid()); dataMap.put("XM", donorName == null ? "" : donorName); - if(relativeConfirmation.getSex().equals("0")){ - dataMap.put("XB","鏈煡鐨勬�у埆"); - }else if(relativeConfirmation.getSex().equals("1")){ - dataMap.put("XB","鐢�"); - }else if(relativeConfirmation.getSex().equals("2")){ - dataMap.put("XB","濂�"); + if (relativeConfirmation.getSex().equals("0")) { + dataMap.put("XB", "鏈煡鐨勬�у埆"); + } else if (relativeConfirmation.getSex().equals("1")) { + dataMap.put("XB", "鐢�"); + } else if (relativeConfirmation.getSex().equals("2")) { + dataMap.put("XB", "濂�"); } - dataMap.put("CSRQ",relativeConfirmation.getBirthday() == null ? "" : relativeConfirmation.getBirthday().substring(0, 10)); + dataMap.put("CSRQ", relativeConfirmation.getBirthday() == null ? "" : relativeConfirmation.getBirthday().substring(0, 10)); dataMap.put("MZ", NationalityEnum.getDescByCode(relativeConfirmation.getNation()) == null ? "" : NationalityEnum.getDescByCode(relativeConfirmation.getNation())); dataMap.put("XL", Education.getDescByCode(relativeConfirmation.getEducation()) == null ? "" : Education.getDescByCode(relativeConfirmation.getEducation())); String occupation = ""; - if(relativeConfirmation.getOccupation().equals("admin")){ + if (relativeConfirmation.getOccupation().equals("admin")) { occupation = "鍥藉鏈哄叧宸ヤ綔浜哄憳"; } - if(relativeConfirmation.getOccupation().equals("tech")){ + if (relativeConfirmation.getOccupation().equals("tech")) { occupation = "涓撲笟鎶�鏈汉鍛�"; } - if(relativeConfirmation.getOccupation().equals("business")){ + if (relativeConfirmation.getOccupation().equals("business")) { occupation = "鍟嗕笟浠庝笟浜哄憳"; } - if(relativeConfirmation.getOccupation().equals("worker")){ + if (relativeConfirmation.getOccupation().equals("worker")) { occupation = "宸ヤ汉"; } - if(relativeConfirmation.getOccupation().equals("peasant")){ + if (relativeConfirmation.getOccupation().equals("peasant")) { occupation = "鍐滄灄鐗ф笖姘村埄鐢熶骇浜哄憳"; } - if(relativeConfirmation.getOccupation().equals("police")){ + if (relativeConfirmation.getOccupation().equals("police")) { occupation = "鍐涗汉"; } - if(relativeConfirmation.getOccupation().equals("student")){ + if (relativeConfirmation.getOccupation().equals("student")) { occupation = "瀛︾敓"; } - if(relativeConfirmation.getOccupation().equals("others")){ + if (relativeConfirmation.getOccupation().equals("others")) { occupation = "鍏朵粬浜哄憳"; } - dataMap.put("ZY",relativeConfirmation.getOccupation() == null ? "" : occupation); - dataMap.put("JG",relativeConfirmation.getNativeplace() == null ? "" : relativeConfirmation.getNativeplace()); - dataMap.put("GJ",relativeConfirmation.getNationality() == null ? "" : relativeConfirmation.getNationality()); - if(relativeConfirmation.getIdcardtype() == 1) { - dataMap.put("ZJLX","韬唤璇�"); - }else if(relativeConfirmation.getIdcardtype() == 2){ - dataMap.put("ZJLX","鍐涗汉璇�"); - }else if(relativeConfirmation.getIdcardtype() == 3){ - dataMap.put("ZJLX","鎶ょ収"); - }else if(relativeConfirmation.getIdcardtype() == 4){ - dataMap.put("ZJLX","鎴峰彛鏈�"); - }else if(relativeConfirmation.getIdcardtype() == 5){ - dataMap.put("ZJLX","澶栧浗浜烘案涔呭眳浣忚瘉"); - }else if(relativeConfirmation.getIdcardtype() == 6){ - dataMap.put("ZJLX","姝﹁璇�"); - }else if(relativeConfirmation.getIdcardtype() == 10){ - dataMap.put("ZJLX","瀛︾敓璇�"); - }else if(relativeConfirmation.getIdcardtype() == 11){ - dataMap.put("ZJLX","澹叺璇�"); - }else if(relativeConfirmation.getIdcardtype() == 16){ - dataMap.put("ZJLX","娓境灞呮皯鏉ュ線鍐呭湴閫氳璇�"); - }else if(relativeConfirmation.getIdcardtype() == 17){ - dataMap.put("ZJLX","鍙版咕灞呮皯鏉ュ線澶ч檰閫氳璇�"); - }else if(relativeConfirmation.getIdcardtype() == 18){ - dataMap.put("ZJLX","鍏朵粬璇佷欢绫诲瀷"); + dataMap.put("ZY", relativeConfirmation.getOccupation() == null ? "" : occupation); + dataMap.put("JG", relativeConfirmation.getNativeplace() == null ? "" : relativeConfirmation.getNativeplace()); + dataMap.put("GJ", relativeConfirmation.getNationality() == null ? "" : relativeConfirmation.getNationality()); + if (relativeConfirmation.getIdcardtype() == 1) { + dataMap.put("ZJLX", "韬唤璇�"); + } else if (relativeConfirmation.getIdcardtype() == 2) { + dataMap.put("ZJLX", "鍐涗汉璇�"); + } else if (relativeConfirmation.getIdcardtype() == 3) { + dataMap.put("ZJLX", "鎶ょ収"); + } else if (relativeConfirmation.getIdcardtype() == 4) { + dataMap.put("ZJLX", "鎴峰彛鏈�"); + } else if (relativeConfirmation.getIdcardtype() == 5) { + dataMap.put("ZJLX", "澶栧浗浜烘案涔呭眳浣忚瘉"); + } else if (relativeConfirmation.getIdcardtype() == 6) { + dataMap.put("ZJLX", "姝﹁璇�"); + } else if (relativeConfirmation.getIdcardtype() == 10) { + dataMap.put("ZJLX", "瀛︾敓璇�"); + } else if (relativeConfirmation.getIdcardtype() == 11) { + dataMap.put("ZJLX", "澹叺璇�"); + } else if (relativeConfirmation.getIdcardtype() == 16) { + dataMap.put("ZJLX", "娓境灞呮皯鏉ュ線鍐呭湴閫氳璇�"); + } else if (relativeConfirmation.getIdcardtype() == 17) { + dataMap.put("ZJLX", "鍙版咕灞呮皯鏉ュ線澶ч檰閫氳璇�"); + } else if (relativeConfirmation.getIdcardtype() == 18) { + dataMap.put("ZJLX", "鍏朵粬璇佷欢绫诲瀷"); } - dataMap.put("ZJHM",relativeConfirmation.getIdcardno() == null ? "" : relativeConfirmation.getIdcardno()); - dataMap.put("QSXM",serviceRelatives.getName() == null ? "" : serviceRelatives.getName()); - if(serviceRelatives.getFamilyrelations() == null){ - dataMap.put("GX",""); + dataMap.put("ZJHM", relativeConfirmation.getIdcardno() == null ? "" : relativeConfirmation.getIdcardno()); + dataMap.put("QSXM", serviceRelatives.getName() == null ? "" : serviceRelatives.getName()); + if (serviceRelatives.getFamilyrelations() == null) { + dataMap.put("GX", ""); } - if(serviceRelatives.getFamilyrelations().equals("0")){ - dataMap.put("GX","鏈汉"); - }else if(serviceRelatives.getFamilyrelations().equals("1")){ - dataMap.put("GX","閰嶅伓"); - }else if(serviceRelatives.getFamilyrelations().equals("2")){ - dataMap.put("GX","瀛�"); - }else if(serviceRelatives.getFamilyrelations().equals("3")){ - dataMap.put("GX","濂�"); - }else if(serviceRelatives.getFamilyrelations().equals("4")){ - dataMap.put("GX","鐖舵瘝"); - }else if(serviceRelatives.getFamilyrelations().equals("5")){ - dataMap.put("GX","鐖风埛"); - }else if(serviceRelatives.getFamilyrelations().equals("6")){ - dataMap.put("GX","鍏朵粬"); + if (serviceRelatives.getFamilyrelations().equals("0")) { + dataMap.put("GX", "鏈汉"); + } else if (serviceRelatives.getFamilyrelations().equals("1")) { + dataMap.put("GX", "閰嶅伓"); + } else if (serviceRelatives.getFamilyrelations().equals("2")) { + dataMap.put("GX", "瀛�"); + } else if (serviceRelatives.getFamilyrelations().equals("3")) { + dataMap.put("GX", "濂�"); + } else if (serviceRelatives.getFamilyrelations().equals("4")) { + dataMap.put("GX", "鐖舵瘝"); + } else if (serviceRelatives.getFamilyrelations().equals("5")) { + dataMap.put("GX", "鐖风埛"); + } else if (serviceRelatives.getFamilyrelations().equals("6")) { + dataMap.put("GX", "鍏朵粬"); } - dataMap.put("SFZH",serviceRelatives.getIdcardno() == null ? "" : serviceRelatives.getIdcardno()); - dataMap.put("SHENG",serviceRelatives.getResidenceprovincename() == null ? "" : serviceRelatives.getResidenceprovincename()); - dataMap.put("SHI",serviceRelatives.getResidencecityname() == null ? "" : serviceRelatives.getResidencecityname()); - dataMap.put("XIAN",serviceRelatives.getResidencetownname() == null ? "" : serviceRelatives.getResidencetownname()); - dataMap.put("QT",serviceRelatives.getResidencecommunityname() == null ? "" : serviceRelatives.getResidencecommunityname()); - dataMap.put("XJZD",serviceRelatives.getResidenceaddress() == null ? "" : serviceRelatives.getResidenceaddress()); - dataMap.put("SJHM",serviceRelatives.getPhone() == null ? "" : serviceRelatives.getPhone()); - if(serviceRelatives.getKinship().contains("0")){ - dataMap.put("PE",(char)8730); - if(serviceRelatives.getKinship().contains("1")){ - dataMap.put("CNZN",(char)8730); - if(serviceRelatives.getKinship().contains("2")){ - dataMap.put("FQ",(char)8730); - if(serviceRelatives.getKinship().contains("3")){ - dataMap.put("MQ",(char)8730); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + dataMap.put("SFZH", serviceRelatives.getIdcardno() == null ? "" : serviceRelatives.getIdcardno()); + dataMap.put("SHENG", serviceRelatives.getResidenceprovincename() == null ? "" : serviceRelatives.getResidenceprovincename()); + dataMap.put("SHI", serviceRelatives.getResidencecityname() == null ? "" : serviceRelatives.getResidencecityname()); + dataMap.put("XIAN", serviceRelatives.getResidencetownname() == null ? "" : serviceRelatives.getResidencetownname()); + dataMap.put("QT", serviceRelatives.getResidencecommunityname() == null ? "" : serviceRelatives.getResidencecommunityname()); + dataMap.put("XJZD", serviceRelatives.getResidenceaddress() == null ? "" : serviceRelatives.getResidenceaddress()); + dataMap.put("SJHM", serviceRelatives.getPhone() == null ? "" : serviceRelatives.getPhone()); + if (serviceRelatives.getKinship().contains("0")) { + dataMap.put("PE", (char) 8730); + if (serviceRelatives.getKinship().contains("1")) { + dataMap.put("CNZN", (char) 8730); + if (serviceRelatives.getKinship().contains("2")) { + dataMap.put("FQ", (char) 8730); + if (serviceRelatives.getKinship().contains("3")) { + dataMap.put("MQ", (char) 8730); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } - }else{ - dataMap.put("MQ","鈻�"); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("MQ", "鈻�"); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } } - }else{ - dataMap.put("FQ","鈻�"); - if(serviceRelatives.getKinship().contains("3")){ - dataMap.put("MQ",(char)8730); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("FQ", "鈻�"); + if (serviceRelatives.getKinship().contains("3")) { + dataMap.put("MQ", (char) 8730); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } - }else{ - dataMap.put("MQ","鈻�"); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("MQ", "鈻�"); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } } } - }else{ - dataMap.put("CNZN","鈻�"); - if(serviceRelatives.getKinship().contains("2")){ - dataMap.put("FQ",(char)8730); - if(serviceRelatives.getKinship().contains("3")){ - dataMap.put("MQ",(char)8730); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("CNZN", "鈻�"); + if (serviceRelatives.getKinship().contains("2")) { + dataMap.put("FQ", (char) 8730); + if (serviceRelatives.getKinship().contains("3")) { + dataMap.put("MQ", (char) 8730); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } - }else{ - dataMap.put("MQ","鈻�"); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("MQ", "鈻�"); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } } - }else{ - dataMap.put("FQ","鈻�"); - if(serviceRelatives.getKinship().contains("3")){ - dataMap.put("MQ",(char)8730); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("FQ", "鈻�"); + if (serviceRelatives.getKinship().contains("3")) { + dataMap.put("MQ", (char) 8730); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } - }else{ - dataMap.put("MQ","鈻�"); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("MQ", "鈻�"); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } } } } - }else{ - dataMap.put("PE","鈻�"); - if(serviceRelatives.getKinship().contains("1")){ - dataMap.put("CNZN",(char)8730); - if(serviceRelatives.getKinship().contains("2")){ - dataMap.put("FQ",(char)8730); - if(serviceRelatives.getKinship().contains("3")){ - dataMap.put("MQ",(char)8730); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("PE", "鈻�"); + if (serviceRelatives.getKinship().contains("1")) { + dataMap.put("CNZN", (char) 8730); + if (serviceRelatives.getKinship().contains("2")) { + dataMap.put("FQ", (char) 8730); + if (serviceRelatives.getKinship().contains("3")) { + dataMap.put("MQ", (char) 8730); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } - }else{ - dataMap.put("MQ","鈻�"); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("MQ", "鈻�"); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } } - }else{ - dataMap.put("FQ","鈻�"); - if(serviceRelatives.getKinship().contains("3")){ - dataMap.put("MQ",(char)8730); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("FQ", "鈻�"); + if (serviceRelatives.getKinship().contains("3")) { + dataMap.put("MQ", (char) 8730); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } - }else{ - dataMap.put("MQ","鈻�"); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("MQ", "鈻�"); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } } } - }else{ - dataMap.put("CNZN","鈻�"); - if(serviceRelatives.getKinship().contains("2")){ - dataMap.put("FQ",(char)8730); - if(serviceRelatives.getKinship().contains("3")){ - dataMap.put("MQ",(char)8730); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("CNZN", "鈻�"); + if (serviceRelatives.getKinship().contains("2")) { + dataMap.put("FQ", (char) 8730); + if (serviceRelatives.getKinship().contains("3")) { + dataMap.put("MQ", (char) 8730); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } - }else{ - dataMap.put("MQ","鈻�"); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("MQ", "鈻�"); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } } - }else{ - dataMap.put("FQ","鈻�"); - if(serviceRelatives.getKinship().contains("3")){ - dataMap.put("MQ",(char)8730); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("FQ", "鈻�"); + if (serviceRelatives.getKinship().contains("3")) { + dataMap.put("MQ", (char) 8730); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } - }else{ - dataMap.put("MQ","鈻�"); - if(serviceRelatives.getKinship().contains("5")){ - dataMap.put("STR",(char)8730); - }else{ - dataMap.put("STR","鈻�"); + } else { + dataMap.put("MQ", "鈻�"); + if (serviceRelatives.getKinship().contains("5")) { + dataMap.put("STR", (char) 8730); + } else { + dataMap.put("STR", "鈻�"); } } } } } - dataMap.put("ZNSL",serviceRelatives.getKinshipChildrennum() == null ? "" : serviceRelatives.getKinshipChildrennum()); - if(serviceRelatives.getOrgandecision().contains("鑲濊剰")) { + dataMap.put("ZNSL", serviceRelatives.getKinshipChildrennum() == null ? "" : serviceRelatives.getKinshipChildrennum()); + if (serviceRelatives.getOrgandecision().contains("鑲濊剰")) { dataMap.put("GZ", (char) 8730); - }else{ + } else { dataMap.put("GZ", "鈻�"); } - if(serviceRelatives.getOrgandecision().contains("鍙岃偩鑴�")) { + if (serviceRelatives.getOrgandecision().contains("鍙岃偩鑴�")) { dataMap.put("SSZ", (char) 8730); - }else{ + } else { dataMap.put("SSZ", "鈻�"); } - if(serviceRelatives.getOrgandecision().contains("蹇冭剰")) { + if (serviceRelatives.getOrgandecision().contains("蹇冭剰")) { dataMap.put("XZ", (char) 8730); - }else{ + } else { dataMap.put("XZ", "鈻�"); } - if(serviceRelatives.getOrgandecision().contains("鑲鸿剰")) { + if (serviceRelatives.getOrgandecision().contains("鑲鸿剰")) { dataMap.put("FZ", (char) 8730); - }else{ + } else { dataMap.put("FZ", "鈻�"); } - if(serviceRelatives.getOrgandecision().contains("鑳拌吅")) { + if (serviceRelatives.getOrgandecision().contains("鑳拌吅")) { dataMap.put("YX", (char) 8730); - }else{ + } else { dataMap.put("YX", "鈻�"); } - if(serviceRelatives.getOrgandecision().contains("灏忚偁")) { + if (serviceRelatives.getOrgandecision().contains("灏忚偁")) { dataMap.put("XC", (char) 8730); - }else{ + } else { dataMap.put("XC", "鈻�"); } - if(serviceRelatives.getOrgandecision().contains("鍙岀溂缁勭粐")) { + if (serviceRelatives.getOrgandecision().contains("鍙岀溂缁勭粐")) { dataMap.put("SYZZ", (char) 8730); - }else{ + } else { dataMap.put("SYZZ", "鈻�"); } - if(serviceRelatives.getOrgandecision().contains("閬椾綋")) { + if (serviceRelatives.getOrgandecision().contains("閬椾綋")) { dataMap.put("YT", (char) 8730); - }else{ + } else { dataMap.put("YT", "鈻�"); } - dataMap.put("JXJDQT",serviceRelatives.getOrgandecisionOther() == null ? "" : serviceRelatives.getOrgandecisionOther()); - dataMap.put("HQZZ",serviceRelatives.getAcquisitiontissuename() == null ? "" : serviceRelatives.getAcquisitiontissuename()); + dataMap.put("JXJDQT", serviceRelatives.getOrgandecisionOther() == null ? "" : serviceRelatives.getOrgandecisionOther()); + dataMap.put("HQZZ", serviceRelatives.getAcquisitiontissuename() == null ? "" : serviceRelatives.getAcquisitiontissuename()); dataMap.put("XTY1", serviceRelatives.getCoordinatedusernameo() == null ? "" : serviceRelatives.getCoordinatedusernameo()); dataMap.put("XTY2", serviceRelatives.getCoordinatedusernamet() == null ? "" : serviceRelatives.getCoordinatedusernamet()); -- Gitblit v1.9.3