yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 6854ce2788 2172931c71
commit 8d332250d7
5 changed files with 270 additions and 272 deletions
Show Stats Download Patch File Download Diff File

276
SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java
Unescape View File

@ -38,8 +38,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
*
* jg_natural * jg_natural
*
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
@ -47,7 +47,7 @@ import java.util.Map;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@Api(tags = "jg_natural" , value = "example") @Api(tags = "jg_natural", value = "example")
@RequestMapping("/api/example/Jg_natural") @RequestMapping("/api/example/Jg_natural")
public class Jg_naturalController { public class Jg_naturalController {
@ -64,28 +64,24 @@ public class Jg_naturalController {
private Jg_naturalService jg_naturalService; private Jg_naturalService jg_naturalService;
/** /**
* 列表 * 列表
* *
* @param jg_naturalPagination * @param jg_naturalPagination
* @return * @return
*/ */
@PostMapping("/getList") @PostMapping("/getList")
public ActionResult list(@RequestBody Jg_naturalPagination jg_naturalPagination)throws IOException{ public ActionResult list(@RequestBody Jg_naturalPagination jg_naturalPagination) throws IOException {
List<Jg_naturalMobileEntity> list= jg_naturalService.getList(jg_naturalPagination); List<Jg_naturalMobileEntity> list = jg_naturalService.getList(jg_naturalPagination);
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(Jg_naturalMobileEntity entity:list){ for (Jg_naturalMobileEntity entity : list) {
} }
List<Jg_naturalListVO> listVO=JsonUtil.getJsonToList(list,Jg_naturalListVO.class); List<Jg_naturalListVO> listVO = JsonUtil.getJsonToList(list, Jg_naturalListVO.class);
for(Jg_naturalListVO jg_naturalVO:listVO){ for (Jg_naturalListVO jg_naturalVO : listVO) {
} }
PageListVO vo = new PageListVO();
PageListVO vo=new PageListVO();
vo.setList(listVO); vo.setList(listVO);
PaginationVO page=JsonUtil.getJsonToBean(jg_naturalPagination,PaginationVO.class); PaginationVO page = JsonUtil.getJsonToBean(jg_naturalPagination, PaginationVO.class);
vo.setPagination(page); vo.setPagination(page);
return ActionResult.success(vo); return ActionResult.success(vo);
} }
@ -100,109 +96,110 @@ public class Jg_naturalController {
@PostMapping @PostMapping
@Transactional @Transactional
public ActionResult create(@RequestBody @Valid Jg_naturalCrForm jg_naturalCrForm) throws DataException { public ActionResult create(@RequestBody @Valid Jg_naturalCrForm jg_naturalCrForm) throws DataException {
String mainId =RandomUtil.uuId(); String mainId = RandomUtil.uuId();
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
jg_naturalCrForm.setCreatorTime(DateUtil.getNow()); jg_naturalCrForm.setCreatorTime(DateUtil.getNow());
Jg_naturalEntity entity = JsonUtil.getJsonToBean(jg_naturalCrForm, Jg_naturalEntity.class); Jg_naturalEntity entity = JsonUtil.getJsonToBean(jg_naturalCrForm, Jg_naturalEntity.class);
entity.setId(mainId); entity.setId(mainId);
jg_naturalService.save(entity); jg_naturalService.save(entity);
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");
} }
/** /**
* 模板下载 * 模板下载
* *
* @return * @return
*/ */
@ApiOperation("模板下载") @ApiOperation("模板下载")
@GetMapping("/templateDownload") @GetMapping("/templateDownload")
public ActionResult<DownloadVO> TemplateDownload(){ public ActionResult<DownloadVO> TemplateDownload() {
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
DownloadVO vo=DownloadVO.builder().build(); DownloadVO vo = DownloadVO.builder().build();
try{ try {
vo.setName("职员信息.xlsx"); vo.setName("职员信息.xlsx");
vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary")); vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=", userInfo.getId() + "#" + "职员信息.xlsx" + "#" + "Temporary"));
}catch(Exception e){ } catch (Exception e) {
log.error("信息导出Excel错误:{}" ,e.getMessage()); log.error("信息导出Excel错误:{}", e.getMessage());
} }
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* 导出Excel * 导出Excel
* *
* @return * @return
*/ */
@ApiOperation("导出Excel") @ApiOperation("导出Excel")
@GetMapping("/Actions/Export") @GetMapping("/Actions/Export")
public ActionResult Export(Jg_naturalPaginationExportModel jg_naturalPaginationExportModel) throws IOException { public ActionResult Export(Jg_naturalPaginationExportModel jg_naturalPaginationExportModel) throws IOException {
if (StringUtil.isEmpty(jg_naturalPaginationExportModel.getSelectKey())){ if (StringUtil.isEmpty(jg_naturalPaginationExportModel.getSelectKey())) {
return ActionResult.fail("请选择导出字段"); return ActionResult.fail("请选择导出字段");
} }
Jg_naturalPagination jg_naturalPagination=JsonUtil.getJsonToBean(jg_naturalPaginationExportModel, Jg_naturalPagination.class); Jg_naturalPagination jg_naturalPagination = JsonUtil.getJsonToBean(jg_naturalPaginationExportModel, Jg_naturalPagination.class);
List<Jg_naturalEntity> list= jg_naturalService.getTypeList(jg_naturalPagination,jg_naturalPaginationExportModel.getDataType()); List<Jg_naturalEntity> list = jg_naturalService.getTypeList(jg_naturalPagination, jg_naturalPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(Jg_naturalEntity entity:list){ for (Jg_naturalEntity entity : list) {
} }
List<Jg_naturalListVO> listVO=JsonUtil.getJsonToList(list,Jg_naturalListVO.class); List<Jg_naturalListVO> listVO = JsonUtil.getJsonToList(list, Jg_naturalListVO.class);
for(Jg_naturalListVO jg_naturalVO:listVO){ for (Jg_naturalListVO jg_naturalVO : listVO) {
} }
//转换为map输出 //转换为map输出
List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); List<Map<String, Object>> 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]; String[] keys = !StringUtil.isEmpty(jg_naturalPaginationExportModel.getSelectKey()) ? jg_naturalPaginationExportModel.getSelectKey().split(",") : new String[0];
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo); DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), mapList, keys, userInfo);
return ActionResult.success(vo); return ActionResult.success(vo);
} }
//导出表格 //导出表格
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){ public DownloadVO creatModelExcel(String path, List<Map<String, Object>> list, String[] keys, UserInfo userInfo) {
DownloadVO vo=DownloadVO.builder().build(); DownloadVO vo = DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>(); List<ExcelExportEntity> entitys = new ArrayList<>();
if(keys.length>0){ if (keys.length > 0) {
for(String key:keys){ for (String key : keys) {
switch(key){ switch (key) {
case "name" : case "name":
entitys.add(new ExcelExportEntity("姓名" ,"name")); entitys.add(new ExcelExportEntity("姓名", "name"));
break; break;
case "adress" : case "adress":
entitys.add(new ExcelExportEntity("地址" ,"adress")); entitys.add(new ExcelExportEntity("地址", "adress"));
break; break;
case "contact" : case "contact":
entitys.add(new ExcelExportEntity("手机号" ,"contact")); entitys.add(new ExcelExportEntity("手机号", "contact"));
break; break;
case "creatorUserName" : case "creatorUserName":
entitys.add(new ExcelExportEntity("录入人" ,"creatorUserName")); entitys.add(new ExcelExportEntity("录入人", "creatorUserName"));
break; break;
case "creatorTime" : case "creatorTime":
entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime")); entitys.add(new ExcelExportEntity("创建时间", "creatorTime"));
break; break;
default: default:
break; break;
}
} }
} }
}
ExportParams exportParams = new ExportParams(null, "表单信息"); ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF); exportParams.setType(ExcelType.XSSF);
try{ try {
@Cleanup Workbook workbook = new HSSFWorkbook(); @Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){ if (entitys.size() > 0) {
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list); workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
} }
String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx"; String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
String fileName = configValueUtil.getTemporaryFilePath() + name; String fileName = configValueUtil.getTemporaryFilePath() + name;
@Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName)); @Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName));
workbook.write(output); workbook.write(output);
//上传文件 //上传文件
UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name); UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name);
vo.setName(name); vo.setName(name);
vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary")); vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary"));
} catch (Exception e) { } catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage()); log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace(); e.printStackTrace();
@ -219,96 +216,93 @@ public class Jg_naturalController {
*/ */
@DeleteMapping("/batchRemove/{ids}") @DeleteMapping("/batchRemove/{ids}")
@Transactional @Transactional
public ActionResult batchRemove(@PathVariable("ids") String ids){ public ActionResult batchRemove(@PathVariable("ids") String ids) {
String[] idList = ids.split(","); String[] idList = ids.split(",");
int i =0; int i = 0;
for (String allId : idList){ for (String allId : idList) {
this.delete(allId); this.delete(allId);
i++; i++;
} }
if (i == 0 ){ if (i == 0) {
return ActionResult.fail("删除失败"); return ActionResult.fail("删除失败");
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");
} }
/** /**
* 信息 * 信息
* *
* @param id * @param id
* @return * @return
*/ */
@GetMapping("/{id}") @GetMapping("/{id}")
public ActionResult<Jg_naturalInfoVO> info(@PathVariable("id") String id){ public ActionResult<Jg_naturalInfoVO> info(@PathVariable("id") String id) {
Jg_naturalEntity entity= jg_naturalService.getInfo(id); Jg_naturalEntity entity = jg_naturalService.getInfo(id);
Jg_naturalInfoVO vo=JsonUtil.getJsonToBean(entity, Jg_naturalInfoVO.class); Jg_naturalInfoVO vo = JsonUtil.getJsonToBean(entity, Jg_naturalInfoVO.class);
if(vo.getCreatorTime()!=null){ if (vo.getCreatorTime() != null) {
vo.setCreatorTime(vo.getCreatorTime()); vo.setCreatorTime(vo.getCreatorTime());
} }
//子表 //子表
//副表 //副表
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* 表单信息(详情页) * 表单信息(详情页)
* *
* @param id * @param id
* @return * @return
*/ */
@GetMapping("/detail/{id}") @GetMapping("/detail/{id}")
public ActionResult<Jg_naturalInfoVO> detailInfo(@PathVariable("id") String id){ public ActionResult<Jg_naturalInfoVO> detailInfo(@PathVariable("id") String id) {
Jg_naturalEntity entity= jg_naturalService.getInfo(id); Jg_naturalEntity entity = jg_naturalService.getInfo(id);
Jg_naturalInfoVO vo=JsonUtil.getJsonToBean(entity, Jg_naturalInfoVO.class); Jg_naturalInfoVO vo = JsonUtil.getJsonToBean(entity, Jg_naturalInfoVO.class);
//子表数据转换 //子表数据转换
//附表数据转换 //附表数据转换
//添加到详情表单对象中 //添加到详情表单对象中
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* 更新 * 更新
* *
* @param id * @param id
* @return * @return
*/ */
@PutMapping("/{id}") @PutMapping("/{id}")
@Transactional @Transactional
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid Jg_naturalUpForm jg_naturalUpForm) throws DataException { public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid Jg_naturalUpForm jg_naturalUpForm) throws DataException {
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
Jg_naturalEntity entity= jg_naturalService.getInfo(id); Jg_naturalEntity entity = jg_naturalService.getInfo(id);
if(entity!=null){ if (entity != null) {
Jg_naturalEntity subentity=JsonUtil.getJsonToBean(jg_naturalUpForm, Jg_naturalEntity.class); Jg_naturalEntity subentity = JsonUtil.getJsonToBean(jg_naturalUpForm, Jg_naturalEntity.class);
subentity.setCreatorTime(entity.getCreatorTime()); subentity.setCreatorTime(entity.getCreatorTime());
jg_naturalService.update(id, subentity); jg_naturalService.update(id, subentity);
return ActionResult.success("更新成功"); return ActionResult.success("更新成功");
}else{ } else {
return ActionResult.fail("更新失败，数据不存在"); return ActionResult.fail("更新失败，数据不存在");
} }
} }
/**
/** * 删除
* 删除 *
* * @param id
* @param id * @return
* @return */
*/
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@Transactional @Transactional
public ActionResult delete(@PathVariable("id") String id){ public ActionResult delete(@PathVariable("id") String id) {
Jg_naturalEntity entity= jg_naturalService.getInfo(id); Jg_naturalEntity entity = jg_naturalService.getInfo(id);
if(entity!=null){ if (entity != null) {
jg_naturalService.delete(entity); jg_naturalService.delete(entity);
} }
@ -316,8 +310,4 @@ public class Jg_naturalController {
} }
} }

215
SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java
Unescape View File

@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
*
* jg_natural * jg_natural
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
@ -47,75 +46,74 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
private Jg_naturalMapper naturalMapper; private Jg_naturalMapper naturalMapper;
@Override @Override
public List<Jg_naturalMobileEntity> getList(Jg_naturalPagination jg_naturalPagination){ public List<Jg_naturalMobileEntity> getList(Jg_naturalPagination jg_naturalPagination) {
String userId=userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList = new ArrayList();
int total=0; System.out.println(AllIdList);
int jg_naturalNum =0; int total = 0;
QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper=new QueryWrapper<>(); int jg_naturalNum = 0;
boolean pcPermission = true; QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper = new QueryWrapper<>();
boolean appPermission = true; boolean pcPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean appPermission = true;
if(isPc && pcPermission){ boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if (!userProvider.get().getIsAdministrator()){ if (isPc && pcPermission) {
Object jg_naturalObj=authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper,jg_naturalPagination.getMenuId(),"jg_natural")); if (!userProvider.get().getIsAdministrator()) {
if (ObjectUtil.isEmpty(jg_naturalObj)){ Object jg_naturalObj = authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper, jg_naturalPagination.getMenuId(), "jg_natural"));
return new ArrayList<>(); if (ObjectUtil.isEmpty(jg_naturalObj)) {
} else { return new ArrayList<>();
jg_naturalQueryWrapper = (QueryWrapper<Jg_naturalEntity>)jg_naturalObj; } else {
jg_naturalNum++; jg_naturalQueryWrapper = (QueryWrapper<Jg_naturalEntity>) jg_naturalObj;
jg_naturalNum++;
}
} }
} }
} if (!isPc && appPermission) {
if(!isPc && appPermission){ if (!userProvider.get().getIsAdministrator()) {
if (!userProvider.get().getIsAdministrator()){ Object jg_naturalObj = authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper, jg_naturalPagination.getMenuId(), "jg_natural"));
Object jg_naturalObj=authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper,jg_naturalPagination.getMenuId(),"jg_natural")); if (ObjectUtil.isEmpty(jg_naturalObj)) {
if (ObjectUtil.isEmpty(jg_naturalObj)){ return new ArrayList<>();
return new ArrayList<>(); } else {
} else { jg_naturalQueryWrapper = (QueryWrapper<Jg_naturalEntity>) jg_naturalObj;
jg_naturalQueryWrapper = (QueryWrapper<Jg_naturalEntity>)jg_naturalObj; jg_naturalNum++;
jg_naturalNum++; }
}
} }
} }
if(StringUtil.isNotEmpty(jg_naturalPagination.getName())){ if (StringUtil.isNotEmpty(jg_naturalPagination.getName())) {
jg_naturalNum++; 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_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); jg_naturalQueryWrapper.lambda().in(Jg_naturalEntity::getId, AllIdList);
} }
//排序 //排序
if(StringUtil.isEmpty(jg_naturalPagination.getSidx())){ if (StringUtil.isEmpty(jg_naturalPagination.getSidx())) {
jg_naturalQueryWrapper.lambda().orderByDesc(Jg_naturalEntity::getCreatorTime); jg_naturalQueryWrapper.lambda().orderByDesc(Jg_naturalEntity::getCreatorTime);
}else{ } else {
try { try {
String sidx = jg_naturalPagination.getSidx(); String sidx = jg_naturalPagination.getSidx();
Jg_naturalEntity jg_naturalEntity = new Jg_naturalEntity(); Jg_naturalEntity jg_naturalEntity = new Jg_naturalEntity();
Field declaredField = jg_naturalEntity.getClass().getDeclaredField(sidx); Field declaredField = jg_naturalEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); 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) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
if((total>0 && AllIdList.size()>0) || total==0){ if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<Jg_naturalMobileEntity> page=new Page<>(jg_naturalPagination.getCurrentPage(), jg_naturalPagination.getPageSize()); Page<Jg_naturalMobileEntity> page = new Page<>(jg_naturalPagination.getCurrentPage(), jg_naturalPagination.getPageSize());
IPage<Jg_naturalMobileEntity> userIPage = this.page(page, jg_naturalQueryWrapper); IPage<Jg_naturalMobileEntity> userIPage = this.page(page, jg_naturalQueryWrapper);
return jg_naturalPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return jg_naturalPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<Jg_naturalMobileEntity> list = new ArrayList(); List<Jg_naturalMobileEntity> list = new ArrayList();
return jg_naturalPagination.setData(list, list.size()); return jg_naturalPagination.setData(list, list.size());
} }
@ -123,105 +121,106 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
@Override @Override
public IPage<Jg_naturalMobileEntity> page(Page<Jg_naturalMobileEntity> page, Wrapper<Jg_naturalEntity> queryWrapper) { public IPage<Jg_naturalMobileEntity> page(Page<Jg_naturalMobileEntity> page, Wrapper<Jg_naturalEntity> queryWrapper) {
return naturalMapper.getNaturalList(page,queryWrapper); return naturalMapper.getNaturalList(page, queryWrapper);
} }
@Override @Override
public List<Jg_naturalEntity> getTypeList(Jg_naturalPagination jg_naturalPagination,String dataType){ public List<Jg_naturalEntity> getTypeList(Jg_naturalPagination jg_naturalPagination, String dataType) {
String userId=userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList = new ArrayList();
int total=0; int total = 0;
int jg_naturalNum =0; int jg_naturalNum = 0;
QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper=new QueryWrapper<>(); QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper = new QueryWrapper<>();
boolean pcPermission = true; boolean pcPermission = true;
boolean appPermission = true; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object jg_naturalObj=authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper,jg_naturalPagination.getMenuId(),"jg_natural")); Object jg_naturalObj = authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper, jg_naturalPagination.getMenuId(), "jg_natural"));
if (ObjectUtil.isEmpty(jg_naturalObj)){ if (ObjectUtil.isEmpty(jg_naturalObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
jg_naturalQueryWrapper = (QueryWrapper<Jg_naturalEntity>)jg_naturalObj; jg_naturalQueryWrapper = (QueryWrapper<Jg_naturalEntity>) jg_naturalObj;
jg_naturalNum++; jg_naturalNum++;
}
} }
} }
} if (!isPc && appPermission) {
if(!isPc && appPermission){ if (!userProvider.get().getIsAdministrator()) {
if (!userProvider.get().getIsAdministrator()){ Object jg_naturalObj = authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper, jg_naturalPagination.getMenuId(), "jg_natural"));
Object jg_naturalObj=authorizeService.getCondition(new AuthorizeConditionModel(jg_naturalQueryWrapper,jg_naturalPagination.getMenuId(),"jg_natural")); if (ObjectUtil.isEmpty(jg_naturalObj)) {
if (ObjectUtil.isEmpty(jg_naturalObj)){ return new ArrayList<>();
return new ArrayList<>(); } else {
} else { jg_naturalQueryWrapper = (QueryWrapper<Jg_naturalEntity>) jg_naturalObj;
jg_naturalQueryWrapper = (QueryWrapper<Jg_naturalEntity>)jg_naturalObj; jg_naturalNum++;
jg_naturalNum++; }
}
} }
} }
if(StringUtil.isNotEmpty(jg_naturalPagination.getName())){ if (StringUtil.isNotEmpty(jg_naturalPagination.getName())) {
jg_naturalNum++; 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_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); jg_naturalQueryWrapper.lambda().in(Jg_naturalEntity::getId, AllIdList);
} }
//排序 //排序
if(StringUtil.isEmpty(jg_naturalPagination.getSidx())){ if (StringUtil.isEmpty(jg_naturalPagination.getSidx())) {
jg_naturalQueryWrapper.lambda().orderByDesc(Jg_naturalEntity::getCreatorTime); jg_naturalQueryWrapper.lambda().orderByDesc(Jg_naturalEntity::getCreatorTime);
}else{ } else {
try { try {
String sidx = jg_naturalPagination.getSidx(); String sidx = jg_naturalPagination.getSidx();
Jg_naturalEntity jg_naturalEntity = new Jg_naturalEntity(); Jg_naturalEntity jg_naturalEntity = new Jg_naturalEntity();
Field declaredField = jg_naturalEntity.getClass().getDeclaredField(sidx); Field declaredField = jg_naturalEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); 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) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
if("0".equals(dataType)){ if ("0".equals(dataType)) {
if((total>0 && AllIdList.size()>0) || total==0){ if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<Jg_naturalEntity> page=new Page<>(jg_naturalPagination.getCurrentPage(), jg_naturalPagination.getPageSize()); Page<Jg_naturalEntity> page = new Page<>(jg_naturalPagination.getCurrentPage(), jg_naturalPagination.getPageSize());
IPage<Jg_naturalEntity> userIPage=this.page(page, jg_naturalQueryWrapper); IPage<Jg_naturalEntity> userIPage = this.page(page, jg_naturalQueryWrapper);
return jg_naturalPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return jg_naturalPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<Jg_naturalEntity> list = new ArrayList(); List<Jg_naturalEntity> list = new ArrayList();
return jg_naturalPagination.setData(list, list.size()); return jg_naturalPagination.setData(list, list.size());
} }
}else{ } else {
return this.list(jg_naturalQueryWrapper); return this.list(jg_naturalQueryWrapper);
} }
} }
@Override @Override
public Jg_naturalEntity getInfo(String id){ public Jg_naturalEntity getInfo(String id) {
QueryWrapper<Jg_naturalEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<Jg_naturalEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Jg_naturalEntity::getId,id); queryWrapper.lambda().eq(Jg_naturalEntity::getId, id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(Jg_naturalEntity entity){ public void create(Jg_naturalEntity entity) {
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, Jg_naturalEntity entity){ public boolean update(String id, Jg_naturalEntity entity) {
entity.setId(id); entity.setId(id);
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(Jg_naturalEntity entity){ public void delete(Jg_naturalEntity entity) {
if(entity!=null){ if (entity != null) {
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }

10
SC-boot/linkage-scm/src/main/resources/mapper/natural/Jg_naturalMapper.xml
Unescape View File

@ -21,6 +21,11 @@
a.adress, a.adress,
a.`name`, a.`name`,
a.contact, a.contact,
a.identity,
a.bank_account,
a.bank,
a.bank_no,
a.photos,
COUNT( b.id ) naturalCount, COUNT( b.id ) naturalCount,
IFNULL( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement / 1000 END ), 0 ) naturalSum IFNULL( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement / 1000 END ), 0 ) naturalSum
FROM FROM
@ -50,6 +55,11 @@
<result column="adress" property="adress"/> <result column="adress" property="adress"/>
<result column="name" property="name"/> <result column="name" property="name"/>
<result column="contact" property="contact"/> <result column="contact" property="contact"/>
<result column="identity" property="identity"/>
<result column="bank_account" property="bankAccount"/>
<result column="bank" property="bank"/>
<result column="bank_no" property="bankNo"/>
<result column="photos" property="photos"/>
<result column="naturalSum" property="naturalSum"/> <result column="naturalSum" property="naturalSum"/>
<result column="naturalCount" property="naturalCount"/> <result column="naturalCount" property="naturalCount"/>
</resultMap> </resultMap>

19
SC-web/src/views/scm/basicInformation/natural/Form.vue
Unescape View File

@ -28,14 +28,16 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="手机号" prop="contact"> <el-form-item label="手机号" prop="contact">
<el-input v-model="dataForm.contact" placeholder="请输入手机号" clearable :style='{ "width": "100%" }'> <el-input v-model="dataForm.contact" placeholder="请输入手机号" clearable
:style='{ "width": "100%" }'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="身份证" prop="identity"> <el-form-item label="身份证" prop="identity">
<el-input v-model="dataForm.identity" placeholder="请输入身份证" clearable :style='{ "width": "100%" }'> <el-input v-model="dataForm.identity" placeholder="请输入身份证" clearable
:style='{ "width": "100%" }'>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -69,14 +71,6 @@
</JNPF-UploadImg> </JNPF-UploadImg>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="录入人" prop="creatorUserName">
<el-input v-model="dataForm.creatorUserName" placeholder="请输入录入人" clearable
:style='{ "width": "100%" }'>
</el-input>
</el-form-item>
</el-col>
</template> </template>
</el-form> </el-form>
</el-row> </el-row>
@ -106,7 +100,7 @@ export default {
bankAccount: '', bankAccount: '',
bank: '', bank: '',
bankNo: '', bankNo: '',
photos: [], photos: null,
creatorUserName: '', creatorUserName: '',
creatorTime: "", creatorTime: "",
}, },
@ -152,6 +146,9 @@ export default {
url: '/api/example/Jg_natural/' + this.dataForm.id, url: '/api/example/Jg_natural/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
if (res.data.photos == null) {
res.data.photos = JSON.stringify([]);
}
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}); });

22
SC-web/src/views/scm/basicInformation/natural/index.vue
Unescape View File

@ -60,16 +60,15 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange" border>
<el-table-column prop="name" label="姓名" width="0" align="left" /> <el-table-column prop="name" label="姓名" width="0" align="center" sortable />
<el-table-column prop="adress" label="地址" width="0" align="left" /> <el-table-column prop="adress" label="地址" width="0" align="center" sortable />
<el-table-column prop="contact" label="手机号" width="0" align="left" /> <el-table-column prop="contact" label="手机号" width="0" align="center" sortable />
<el-table-column prop="creatorUserName" label="录入人" width="0" align="left" /> <el-table-column prop="creatorTime" label="创建时间" width="0" align="center" sortable />
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left" /> <el-table-column prop="identity" label="身份证" width="0" align="center" sortable />
<el-table-column prop="identity" label="身份证" width="0" align="left" /> <el-table-column prop="bankAccount" label="银行账户" width="0" align="center" sortable />
<el-table-column prop="bankAccount" label="银行账户" width="0" align="left" /> <el-table-column prop="bank" label="开户行" width="0" align="center" sortable />
<el-table-column prop="bank" label="开户行" width="0" align="left" /> <el-table-column prop="bankNo" label="行号" width="0" align="center" sortable />
<el-table-column prop="bankNo" label="行号" width="0" align="left" />
<el-table-column label="操作" fixed="right" width="100"> <el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑 <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑
@ -171,9 +170,12 @@ export default {
method: 'post', method: 'post',
data: _query data: _query
}).then(res => { }).then(res => {
console.log(res)
var _list = []; var _list = [];
for (let i = 0; i < res.data.list.length; i++) { for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i]; let _data = res.data.list[i];
console.log(_data);
i
_list.push(_data) _list.push(_data)
} }
this.list = _list this.list = _list

Write Preview
Loading…
Cancel
Save