二维码生成地址修改，保安证编码生成修改

Administrator

2021-08-31 08363052cecb30230a2c8b3eba791ca8d1be00a5

 src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java

@@ -24,14 +24,20 @@
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.information.excel.InforExcel;
import org.springblade.modules.information.excel.InforImporter;
import org.springblade.modules.shareholder.entity.Shareholder;
import org.springblade.modules.shareholder.excel.shareExcel;
import org.springblade.modules.shareholder.excel.shareImporter;
import org.springblade.modules.shareholder.service.IShareholderService;
import org.springblade.modules.shareholder.vo.ShareholderVO;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.Valid;

@@ -89,8 +95,8 @@
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入shareholder")
   public R save(@Valid @RequestBody Shareholder shareholder) throws Exception {
      arg arg = new arg();
      arg.test01(arg.url+"/shareholder/save",shareholder);
      //arg arg = new arg();
      //arg.test01(arg.url+"/shareholder/save",shareholder);
      return R.status(shareholderService.save(shareholder));
   }

@@ -100,7 +106,8 @@
   @PostMapping("/update")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入shareholder")
   public R update(@Valid @RequestBody Shareholder shareholder) {
   public R update(@Valid @RequestBody Shareholder shareholder) throws Exception {
      //arg.test01(arg.url+"/shareholder/update",shareholder);
      return R.status(shareholderService.updateById(shareholder));
   }

@@ -127,14 +134,25 @@

   /**
    * 出资人信息
    * @param creditcode
    * @param shareholderVO
    * @return
    */
   @PostMapping("/selectShareholderInfo")
   public R<IPage<ShareholderVO>> selectShareholderInfo(String creditcode, Query query) {
      IPage<ShareholderVO> pages=shareholderService.selectShareholderInfo(Condition.getPage(query), creditcode);
   public R<IPage<ShareholderVO>> selectShareholderInfo(ShareholderVO shareholderVO, Query query) {
      IPage<ShareholderVO> pages=shareholderService.selectShareholderInfo(Condition.getPage(query), shareholderVO);
      return R.data(pages);
   }

   /**
    * 导入投资人信息
    */
   @PostMapping("import-share")
   @ApiOperationSupport(order = 12)
   @ApiOperation(value = "导入投资人", notes = "传入excel")
   public R importUser(MultipartFile file, Integer isCovered) {
      shareImporter shareImporter = new shareImporter(shareholderService, false);
      ExcelUtil.save(file, shareImporter, shareExcel.class);
      return R.success("操作成功");
   }

}