From 2172931c71b0064c84acc4dd1e6ee725f3c96b28 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Fri, 17 Mar 2023 13:48:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=982=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/Jg_naturalController.java | 276 +++++++++--------- .../service/impl/Jg_naturalServiceImpl.java | 215 +++++++------- .../mapper/natural/Jg_naturalMapper.xml | 10 + .../scm/basicInformation/natural/Form.vue | 19 +- .../scm/basicInformation/natural/index.vue | 22 +- 5 files changed, 270 insertions(+), 272 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java index 9f6f2476..57c953db 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java @@ -38,8 +38,8 @@ import java.util.List; import java.util.Map; /** - * * jg_natural + * * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 @@ -47,7 +47,7 @@ import java.util.Map; */ @Slf4j @RestController -@Api(tags = "jg_natural" , value = "example") +@Api(tags = "jg_natural", value = "example") @RequestMapping("/api/example/Jg_natural") public class Jg_naturalController { @@ -64,28 +64,24 @@ public class Jg_naturalController { private Jg_naturalService jg_naturalService; - - /** * 列表 * * @param jg_naturalPagination * @return */ - @PostMapping("/getList") - public ActionResult list(@RequestBody Jg_naturalPagination jg_naturalPagination)throws IOException{ - List list= jg_naturalService.getList(jg_naturalPagination); + @PostMapping("/getList") + public ActionResult list(@RequestBody Jg_naturalPagination jg_naturalPagination) throws IOException { + List list = jg_naturalService.getList(jg_naturalPagination); //处理id字段转名称，若无需转或者为空可删除 - for(Jg_naturalMobileEntity entity:list){ - } - List listVO=JsonUtil.getJsonToList(list,Jg_naturalListVO.class); - for(Jg_naturalListVO jg_naturalVO:listVO){ - } - - - PageListVO vo=new PageListVO(); + for (Jg_naturalMobileEntity entity : list) { + } + List listVO = JsonUtil.getJsonToList(list, Jg_naturalListVO.class); + for (Jg_naturalListVO jg_naturalVO : listVO) { + } + PageListVO vo = new PageListVO(); vo.setList(listVO); - PaginationVO page=JsonUtil.getJsonToBean(jg_naturalPagination,PaginationVO.class); + PaginationVO page = JsonUtil.getJsonToBean(jg_naturalPagination, PaginationVO.class); vo.setPagination(page); return ActionResult.success(vo); } @@ -100,109 +96,110 @@ public class Jg_naturalController { @PostMapping @Transactional public ActionResult create(@RequestBody @Valid Jg_naturalCrForm jg_naturalCrForm) throws DataException { - String mainId =RandomUtil.uuId(); - UserInfo userInfo=userProvider.get(); + String mainId = RandomUtil.uuId(); + UserInfo userInfo = userProvider.get(); jg_naturalCrForm.setCreatorTime(DateUtil.getNow()); Jg_naturalEntity entity = JsonUtil.getJsonToBean(jg_naturalCrForm, Jg_naturalEntity.class); - entity.setId(mainId); - jg_naturalService.save(entity); + entity.setId(mainId); + jg_naturalService.save(entity); return ActionResult.success("创建成功"); -} - + } /** - * 模板下载 - * - * @return - */ + * 模板下载 + * + * @return + */ @ApiOperation("模板下载") @GetMapping("/templateDownload") - public ActionResult TemplateDownload(){ - UserInfo userInfo=userProvider.get(); - DownloadVO vo=DownloadVO.builder().build(); - try{ + public ActionResult TemplateDownload() { + UserInfo userInfo = userProvider.get(); + DownloadVO vo = DownloadVO.builder().build(); + try { vo.setName("职员信息.xlsx"); - vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary")); - }catch(Exception e){ - log.error("信息导出Excel错误:{}" ,e.getMessage()); + vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=", userInfo.getId() + "#" + "职员信息.xlsx" + "#" + "Temporary")); + } catch (Exception e) { + log.error("信息导出Excel错误:{}", e.getMessage()); } return ActionResult.success(vo); } + /** - * 导出Excel - * - * @return - */ + * 导出Excel + * + * @return + */ @ApiOperation("导出Excel") @GetMapping("/Actions/Export") public ActionResult Export(Jg_naturalPaginationExportModel jg_naturalPaginationExportModel) throws IOException { - if (StringUtil.isEmpty(jg_naturalPaginationExportModel.getSelectKey())){ + if (StringUtil.isEmpty(jg_naturalPaginationExportModel.getSelectKey())) { return ActionResult.fail("请选择导出字段"); } - Jg_naturalPagination jg_naturalPagination=JsonUtil.getJsonToBean(jg_naturalPaginationExportModel, Jg_naturalPagination.class); - List list= jg_naturalService.getTypeList(jg_naturalPagination,jg_naturalPaginationExportModel.getDataType()); + Jg_naturalPagination jg_naturalPagination = JsonUtil.getJsonToBean(jg_naturalPaginationExportModel, Jg_naturalPagination.class); + List list = jg_naturalService.getTypeList(jg_naturalPagination, jg_naturalPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 - for(Jg_naturalEntity entity:list){ - } - List listVO=JsonUtil.getJsonToList(list,Jg_naturalListVO.class); - for(Jg_naturalListVO jg_naturalVO:listVO){ - } + for (Jg_naturalEntity entity : list) { + } + List listVO = JsonUtil.getJsonToList(list, Jg_naturalListVO.class); + for (Jg_naturalListVO jg_naturalVO : listVO) { + } //转换为map输出 - List>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); - String[]keys=!StringUtil.isEmpty(jg_naturalPaginationExportModel.getSelectKey())?jg_naturalPaginationExportModel.getSelectKey().split(","):new String[0]; - UserInfo userInfo=userProvider.get(); - DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo); + List> mapList = JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO, "yyyy-MM-dd HH:mm:ss")); + String[] keys = !StringUtil.isEmpty(jg_naturalPaginationExportModel.getSelectKey()) ? jg_naturalPaginationExportModel.getSelectKey().split(",") : new String[0]; + UserInfo userInfo = userProvider.get(); + DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), mapList, keys, userInfo); return ActionResult.success(vo); } + //导出表格 - public DownloadVO creatModelExcel(String path,List>list,String[]keys,UserInfo userInfo){ - DownloadVO vo=DownloadVO.builder().build(); - List entitys=new ArrayList<>(); - if(keys.length>0){ - for(String key:keys){ - switch(key){ - case "name" : - entitys.add(new ExcelExportEntity("姓名" ,"name")); - break; - case "adress" : - entitys.add(new ExcelExportEntity("地址" ,"adress")); - break; - case "contact" : - entitys.add(new ExcelExportEntity("手机号" ,"contact")); - break; - case "creatorUserName" : - entitys.add(new ExcelExportEntity("录入人" ,"creatorUserName")); - break; - case "creatorTime" : - entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime")); - break; - default: - break; - } + public DownloadVO creatModelExcel(String path, List> list, String[] keys, UserInfo userInfo) { + DownloadVO vo = DownloadVO.builder().build(); + List entitys = new ArrayList<>(); + if (keys.length > 0) { + for (String key : keys) { + switch (key) { + case "name": + entitys.add(new ExcelExportEntity("姓名", "name")); + break; + case "adress": + entitys.add(new ExcelExportEntity("地址", "adress")); + break; + case "contact": + entitys.add(new ExcelExportEntity("手机号", "contact")); + break; + case "creatorUserName": + entitys.add(new ExcelExportEntity("录入人", "creatorUserName")); + break; + case "creatorTime": + entitys.add(new ExcelExportEntity("创建时间", "creatorTime")); + break; + default: + break; } } + } ExportParams exportParams = new ExportParams(null, "表单信息"); exportParams.setType(ExcelType.XSSF); - try{ - @Cleanup Workbook workbook = new HSSFWorkbook(); - if (entitys.size()>0){ - workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list); - } - String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx"; + try { + @Cleanup Workbook workbook = new HSSFWorkbook(); + if (entitys.size() > 0) { + workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list); + } + String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx"; - String fileName = configValueUtil.getTemporaryFilePath() + name; - @Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName)); - workbook.write(output); - //上传文件 - UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name); + String fileName = configValueUtil.getTemporaryFilePath() + name; + @Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName)); + workbook.write(output); + //上传文件 + UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name); - vo.setName(name); - vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary")); + vo.setName(name); + vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary")); } catch (Exception e) { log.error("信息导出Excel错误:{}", e.getMessage()); e.printStackTrace(); @@ -219,96 +216,93 @@ public class Jg_naturalController { */ @DeleteMapping("/batchRemove/{ids}") @Transactional - public ActionResult batchRemove(@PathVariable("ids") String ids){ + public ActionResult batchRemove(@PathVariable("ids") String ids) { String[] idList = ids.split(","); - int i =0; - for (String allId : idList){ + int i = 0; + for (String allId : idList) { this.delete(allId); i++; } - if (i == 0 ){ + if (i == 0) { return ActionResult.fail("删除失败"); } - return ActionResult.success("删除成功"); + return ActionResult.success("删除成功"); } /** - * 信息 - * - * @param id - * @return - */ + * 信息 + * + * @param id + * @return + */ @GetMapping("/{id}") - public ActionResult info(@PathVariable("id") String id){ - Jg_naturalEntity entity= jg_naturalService.getInfo(id); - Jg_naturalInfoVO vo=JsonUtil.getJsonToBean(entity, Jg_naturalInfoVO.class); - if(vo.getCreatorTime()!=null){ + public ActionResult info(@PathVariable("id") String id) { + Jg_naturalEntity entity = jg_naturalService.getInfo(id); + Jg_naturalInfoVO vo = JsonUtil.getJsonToBean(entity, Jg_naturalInfoVO.class); + if (vo.getCreatorTime() != null) { vo.setCreatorTime(vo.getCreatorTime()); } - //子表 - //副表 + //子表 + //副表 return ActionResult.success(vo); } /** - * 表单信息(详情页) - * - * @param id - * @return - */ + * 表单信息(详情页) + * + * @param id + * @return + */ @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - Jg_naturalEntity entity= jg_naturalService.getInfo(id); - Jg_naturalInfoVO vo=JsonUtil.getJsonToBean(entity, Jg_naturalInfoVO.class); + public ActionResult detailInfo(@PathVariable("id") String id) { + Jg_naturalEntity entity = jg_naturalService.getInfo(id); + Jg_naturalInfoVO vo = JsonUtil.getJsonToBean(entity, Jg_naturalInfoVO.class); - //子表数据转换 + //子表数据转换 - //附表数据转换 + //附表数据转换 //添加到详情表单对象中 return ActionResult.success(vo); - } - - + } - /** - * 更新 - * - * @param id - * @return - */ + /** + * 更新 + * + * @param id + * @return + */ @PutMapping("/{id}") @Transactional - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid Jg_naturalUpForm jg_naturalUpForm) throws DataException { - UserInfo userInfo=userProvider.get(); - Jg_naturalEntity entity= jg_naturalService.getInfo(id); - if(entity!=null){ - Jg_naturalEntity subentity=JsonUtil.getJsonToBean(jg_naturalUpForm, Jg_naturalEntity.class); - subentity.setCreatorTime(entity.getCreatorTime()); + public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid Jg_naturalUpForm jg_naturalUpForm) throws DataException { + UserInfo userInfo = userProvider.get(); + Jg_naturalEntity entity = jg_naturalService.getInfo(id); + if (entity != null) { + Jg_naturalEntity subentity = JsonUtil.getJsonToBean(jg_naturalUpForm, Jg_naturalEntity.class); + subentity.setCreatorTime(entity.getCreatorTime()); jg_naturalService.update(id, subentity); - return ActionResult.success("更新成功"); - }else{ + return ActionResult.success("更新成功"); + } else { return ActionResult.fail("更新失败，数据不存在"); } } - - /** - * 删除 - * - * @param id - * @return - */ + /** + * 删除 + * + * @param id + * @return + */ @DeleteMapping("/{id}") @Transactional - public ActionResult delete(@PathVariable("id") String id){ - Jg_naturalEntity entity= jg_naturalService.getInfo(id); - if(entity!=null){ + public ActionResult delete(@PathVariable("id") String id) { + Jg_naturalEntity entity = jg_naturalService.getInfo(id); + if (entity != null) { jg_naturalService.delete(entity); } @@ -316,8 +310,4 @@ public class Jg_naturalController { } - - - - } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java index 0e843c9d..8ca0cf35 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.List; /** - * * jg_natural * 版本： V3.2.0 * 版权： LINKAGE-BOOT @@ -47,75 +46,74 @@ public class Jg_naturalServiceImpl extends ServiceImpl getList(Jg_naturalPagination jg_naturalPagination){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - int total=0; - int jg_naturalNum =0; - QueryWrapper jg_naturalQueryWrapper=new QueryWrapper<>(); - boolean pcPermission = true; - boolean appPermission = true; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object jg_naturalObj=authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper,jg_naturalPagination.getMenuId(),"jg_natural")); - if (ObjectUtil.isEmpty(jg_naturalObj)){ - return new ArrayList<>(); - } else { - jg_naturalQueryWrapper = (QueryWrapper)jg_naturalObj; - jg_naturalNum++; + public List getList(Jg_naturalPagination jg_naturalPagination) { + String userId = userProvider.get().getUserId(); + List AllIdList = new ArrayList(); + System.out.println(AllIdList); + int total = 0; + int jg_naturalNum = 0; + QueryWrapper jg_naturalQueryWrapper = new QueryWrapper<>(); + boolean pcPermission = true; + boolean appPermission = true; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if (isPc && pcPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object jg_naturalObj = authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper, jg_naturalPagination.getMenuId(), "jg_natural")); + if (ObjectUtil.isEmpty(jg_naturalObj)) { + return new ArrayList<>(); + } else { + jg_naturalQueryWrapper = (QueryWrapper) jg_naturalObj; + jg_naturalNum++; + } } } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object jg_naturalObj=authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper,jg_naturalPagination.getMenuId(),"jg_natural")); - if (ObjectUtil.isEmpty(jg_naturalObj)){ - return new ArrayList<>(); - } else { - jg_naturalQueryWrapper = (QueryWrapper)jg_naturalObj; - jg_naturalNum++; - } + if (!isPc && appPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object jg_naturalObj = authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper, jg_naturalPagination.getMenuId(), "jg_natural")); + if (ObjectUtil.isEmpty(jg_naturalObj)) { + return new ArrayList<>(); + } else { + jg_naturalQueryWrapper = (QueryWrapper) jg_naturalObj; + jg_naturalNum++; + } - } - } - if(StringUtil.isNotEmpty(jg_naturalPagination.getName())){ + } + } + if (StringUtil.isNotEmpty(jg_naturalPagination.getName())) { jg_naturalNum++; - jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getName,jg_naturalPagination.getName()); - } + jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getName, jg_naturalPagination.getName()); + } - if(StringUtil.isNotEmpty(jg_naturalPagination.getContact())){ + if (StringUtil.isNotEmpty(jg_naturalPagination.getContact())) { jg_naturalNum++; - jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getContact,jg_naturalPagination.getContact()); - } + jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getContact, jg_naturalPagination.getContact()); + } - if(AllIdList.size()>0){ + if (AllIdList.size() > 0) { jg_naturalQueryWrapper.lambda().in(Jg_naturalEntity::getId, AllIdList); } //排序 - if(StringUtil.isEmpty(jg_naturalPagination.getSidx())){ - jg_naturalQueryWrapper.lambda().orderByDesc(Jg_naturalEntity::getCreatorTime); - }else{ + if (StringUtil.isEmpty(jg_naturalPagination.getSidx())) { + jg_naturalQueryWrapper.lambda().orderByDesc(Jg_naturalEntity::getCreatorTime); + } else { try { String sidx = jg_naturalPagination.getSidx(); Jg_naturalEntity jg_naturalEntity = new Jg_naturalEntity(); Field declaredField = jg_naturalEntity.getClass().getDeclaredField(sidx); declaredField.setAccessible(true); String value = declaredField.getAnnotation(TableField.class).value(); - jg_naturalQueryWrapper="asc".equals(jg_naturalPagination.getSort().toLowerCase())?jg_naturalQueryWrapper.orderByAsc(value):jg_naturalQueryWrapper.orderByDesc(value); + jg_naturalQueryWrapper = "asc".equals(jg_naturalPagination.getSort().toLowerCase()) ? jg_naturalQueryWrapper.orderByAsc(value) : jg_naturalQueryWrapper.orderByDesc(value); } catch (NoSuchFieldException e) { e.printStackTrace(); } } - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(jg_naturalPagination.getCurrentPage(), jg_naturalPagination.getPageSize()); + if ((total > 0 && AllIdList.size() > 0) || total == 0) { + Page page = new Page<>(jg_naturalPagination.getCurrentPage(), jg_naturalPagination.getPageSize()); IPage userIPage = this.page(page, jg_naturalQueryWrapper); - return jg_naturalPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ + return jg_naturalPagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } else { List list = new ArrayList(); return jg_naturalPagination.setData(list, list.size()); } @@ -123,105 +121,106 @@ public class Jg_naturalServiceImpl extends ServiceImpl page(Page page, Wrapper queryWrapper) { - return naturalMapper.getNaturalList(page,queryWrapper); + return naturalMapper.getNaturalList(page, queryWrapper); } @Override - public List getTypeList(Jg_naturalPagination jg_naturalPagination,String dataType){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - int total=0; - int jg_naturalNum =0; - QueryWrapper jg_naturalQueryWrapper=new QueryWrapper<>(); - boolean pcPermission = true; - boolean appPermission = true; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object jg_naturalObj=authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper,jg_naturalPagination.getMenuId(),"jg_natural")); - if (ObjectUtil.isEmpty(jg_naturalObj)){ - return new ArrayList<>(); - } else { - jg_naturalQueryWrapper = (QueryWrapper)jg_naturalObj; - jg_naturalNum++; + public List getTypeList(Jg_naturalPagination jg_naturalPagination, String dataType) { + String userId = userProvider.get().getUserId(); + List AllIdList = new ArrayList(); + int total = 0; + int jg_naturalNum = 0; + QueryWrapper jg_naturalQueryWrapper = new QueryWrapper<>(); + boolean pcPermission = true; + boolean appPermission = true; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if (isPc && pcPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object jg_naturalObj = authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper, jg_naturalPagination.getMenuId(), "jg_natural")); + if (ObjectUtil.isEmpty(jg_naturalObj)) { + return new ArrayList<>(); + } else { + jg_naturalQueryWrapper = (QueryWrapper) jg_naturalObj; + jg_naturalNum++; + } } } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object jg_naturalObj=authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper,jg_naturalPagination.getMenuId(),"jg_natural")); - if (ObjectUtil.isEmpty(jg_naturalObj)){ - return new ArrayList<>(); - } else { - jg_naturalQueryWrapper = (QueryWrapper)jg_naturalObj; - jg_naturalNum++; - } + if (!isPc && appPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object jg_naturalObj = authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper, jg_naturalPagination.getMenuId(), "jg_natural")); + if (ObjectUtil.isEmpty(jg_naturalObj)) { + return new ArrayList<>(); + } else { + jg_naturalQueryWrapper = (QueryWrapper) jg_naturalObj; + jg_naturalNum++; + } - } - } - if(StringUtil.isNotEmpty(jg_naturalPagination.getName())){ + } + } + if (StringUtil.isNotEmpty(jg_naturalPagination.getName())) { jg_naturalNum++; - jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getName,jg_naturalPagination.getName()); - } + jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getName, jg_naturalPagination.getName()); + } - if(StringUtil.isNotEmpty(jg_naturalPagination.getContact())){ + if (StringUtil.isNotEmpty(jg_naturalPagination.getContact())) { jg_naturalNum++; - jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getContact,jg_naturalPagination.getContact()); - } + jg_naturalQueryWrapper.lambda().like(Jg_naturalEntity::getContact, jg_naturalPagination.getContact()); + } - if(AllIdList.size()>0){ - jg_naturalQueryWrapper.lambda().in(Jg_naturalEntity::getId, AllIdList); - } + if (AllIdList.size() > 0) { + jg_naturalQueryWrapper.lambda().in(Jg_naturalEntity::getId, AllIdList); + } //排序 - if(StringUtil.isEmpty(jg_naturalPagination.getSidx())){ - jg_naturalQueryWrapper.lambda().orderByDesc(Jg_naturalEntity::getCreatorTime); - }else{ + if (StringUtil.isEmpty(jg_naturalPagination.getSidx())) { + jg_naturalQueryWrapper.lambda().orderByDesc(Jg_naturalEntity::getCreatorTime); + } else { try { - String sidx = jg_naturalPagination.getSidx(); + String sidx = jg_naturalPagination.getSidx(); Jg_naturalEntity jg_naturalEntity = new Jg_naturalEntity(); - Field declaredField = jg_naturalEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - jg_naturalQueryWrapper="asc".equals(jg_naturalPagination.getSort().toLowerCase())?jg_naturalQueryWrapper.orderByAsc(value):jg_naturalQueryWrapper.orderByDesc(value); + Field declaredField = jg_naturalEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + jg_naturalQueryWrapper = "asc".equals(jg_naturalPagination.getSort().toLowerCase()) ? jg_naturalQueryWrapper.orderByAsc(value) : jg_naturalQueryWrapper.orderByDesc(value); } catch (NoSuchFieldException e) { e.printStackTrace(); } } - if("0".equals(dataType)){ - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(jg_naturalPagination.getCurrentPage(), jg_naturalPagination.getPageSize()); - IPage userIPage=this.page(page, jg_naturalQueryWrapper); - return jg_naturalPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ + if ("0".equals(dataType)) { + if ((total > 0 && AllIdList.size() > 0) || total == 0) { + Page page = new Page<>(jg_naturalPagination.getCurrentPage(), jg_naturalPagination.getPageSize()); + IPage userIPage = this.page(page, jg_naturalQueryWrapper); + return jg_naturalPagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } else { List list = new ArrayList(); return jg_naturalPagination.setData(list, list.size()); } - }else{ + } else { return this.list(jg_naturalQueryWrapper); } } @Override - public Jg_naturalEntity getInfo(String id){ - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(Jg_naturalEntity::getId,id); + public Jg_naturalEntity getInfo(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Jg_naturalEntity::getId, id); return this.getOne(queryWrapper); } @Override - public void create(Jg_naturalEntity entity){ + public void create(Jg_naturalEntity entity) { this.save(entity); } @Override - public boolean update(String id, Jg_naturalEntity entity){ + public boolean update(String id, Jg_naturalEntity entity) { entity.setId(id); return this.updateById(entity); } + @Override - public void delete(Jg_naturalEntity entity){ - if(entity!=null){ + public void delete(Jg_naturalEntity entity) { + if (entity != null) { this.removeById(entity.getId()); } } diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/natural/Jg_naturalMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/natural/Jg_naturalMapper.xml index 634e793c..5491edc3 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/natural/Jg_naturalMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/natural/Jg_naturalMapper.xml @@ -21,6 +21,11 @@ a.adress, a.`name`, a.contact, + a.identity, + a.bank_account, + a.bank, + a.bank_no, + a.photos, COUNT( b.id ) naturalCount, IFNULL( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement / 1000 END ), 0 ) naturalSum FROM @@ -50,6 +55,11 @@ + + + + + diff --git a/SC-web/src/views/scm/basicInformation/natural/Form.vue b/SC-web/src/views/scm/basicInformation/natural/Form.vue index df4d933a..d70bd023 100644 --- a/SC-web/src/views/scm/basicInformation/natural/Form.vue +++ b/SC-web/src/views/scm/basicInformation/natural/Form.vue @@ -28,14 +28,16 @@ - + - + @@ -69,14 +71,6 @@ - - - - - - - @@ -106,7 +100,7 @@ export default { bankAccount: '', bank: '', bankNo: '', - photos: [], + photos: null, creatorUserName: '', creatorTime: "", }, @@ -152,6 +146,9 @@ export default { url: '/api/example/Jg_natural/' + this.dataForm.id, method: 'get' }).then(res => { + if (res.data.photos == null) { + res.data.photos = JSON.stringify([]); + } this.dataInfo(res.data) this.loading = false }); diff --git a/SC-web/src/views/scm/basicInformation/natural/index.vue b/SC-web/src/views/scm/basicInformation/natural/index.vue index 46700a86..6807328b 100644 --- a/SC-web/src/views/scm/basicInformation/natural/index.vue +++ b/SC-web/src/views/scm/basicInformation/natural/index.vue @@ -60,16 +60,15 @@ - - - - - - - - - + @selection-change="handleSelectionChange" border> + + + + + + + +