智慧保安后台管理-外网项目备份
装备批量导入修改,新增示例字段,出资人,管理人批量导入修改,时间格式化
6 files modified
79 ■■■■■ changed files
src/main/java/org/springblade/modules/equipage/controller/EquipageController.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/member/controller/MemberController.java 25 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java 24 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/shareholder/excel/shareExcel.java 8 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
@@ -161,7 +161,7 @@
     */
    @GetMapping("export-template")
    @ApiOperation(value = "导出模板")
    public void exportUser(HttpServletResponse response) {
    public void exportEquipage(HttpServletResponse response) {
        List<EquipageExcel> list = new ArrayList<>();
        EquipageExcel equipage = new EquipageExcel();
        equipage.setDeptName("***保安公司");
src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -29,6 +29,7 @@
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.equipage.excel.EquipageExcel;
import org.springblade.modules.member.entity.Member;
import org.springblade.modules.member.excel.memberExcel;
import org.springblade.modules.member.excel.memberImporter;
@@ -39,7 +40,10 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**
 *  控制器
@@ -133,7 +137,7 @@
    /**
     * 主要管理员信息
     * @param creditcode
     * @param member
     * @return
     */
    @PostMapping("/selectMemberInfo")
@@ -156,4 +160,23 @@
        return R.success("操作成功");
    }
    /**
     * 导出模板
     */
    @GetMapping("export-template")
    @ApiOperation(value = "导出模板")
    public void exportMember(HttpServletResponse response) {
        List<memberExcel> list = new ArrayList<>();
        memberExcel member = new memberExcel();
        member.setCreditcode("xx12351214112");
        member.setName("张三");
        member.setPost("经理");
        member.setCardid("360***********0001");
        member.setCell("131********");
        member.setRtime("2020/01/01");
        list.add(member);
        ExcelUtil.export(response, "主要管理人员数据导入模板", "主要管理人员导入数据表", list, memberExcel.class);
    }
}
src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
@@ -27,6 +27,8 @@
import org.springblade.modules.shareholder.entity.Shareholder;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Objects;
@@ -53,6 +55,11 @@
    public void importmember(List<memberExcel> data, Boolean isCovered) {
        data.forEach(memberExcel -> {
            Member member = Objects.requireNonNull(BeanUtil.copy(memberExcel, Member.class));
            try {
                member.setRtime(new SimpleDateFormat("yyyy/MM/dd").parse(memberExcel.getRtime()));
            } catch (ParseException e) {
                e.printStackTrace();
            }
            this.save(member);
        });
    }
src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -31,6 +31,7 @@
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.member.excel.memberExcel;
import org.springblade.modules.shareholder.entity.Shareholder;
import org.springblade.modules.shareholder.excel.shareExcel;
import org.springblade.modules.shareholder.excel.shareImporter;
@@ -39,7 +40,10 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**
 *  控制器
@@ -155,4 +159,24 @@
        return R.success("操作成功");
    }
    /**
     * 导出模板
     */
    @GetMapping("export-template")
    @ApiOperation(value = "导出模板")
    public void exportMember(HttpServletResponse response) {
        List<shareExcel> list = new ArrayList<>();
        shareExcel share = new shareExcel();
        share.setCreditcode("xx12351214112");
        share.setShareholder("张三");
        share.setShareholdingratio("10");
        share.setCardid("360***********0001");
        share.setCell("131********");
        share.setCapital("50");
        share.setCapitaltime("2020/01/01");
        list.add(share);
        ExcelUtil.export(response, "出资人数据导入模板", "出资人导入数据表", list, shareExcel.class);
    }
}
src/main/java/org/springblade/modules/shareholder/excel/shareExcel.java
@@ -44,18 +44,18 @@
    private String shareholder;
    @ColumnWidth(20)
    @ExcelProperty("持股比例")
    @ExcelProperty("持股比例(%)")
    private String shareholdingratio;
    @ColumnWidth(15)
    @ExcelProperty("出资金额")
    @ExcelProperty("出资金额(万元)")
    private String capital;
    @ColumnWidth(10)
    @ColumnWidth(20)
    @ExcelProperty("出资时间")
    private String capitaltime;
    @ColumnWidth(10)
    @ColumnWidth(20)
    @ExcelProperty("身份证")
    private String cardid;
src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
@@ -27,6 +27,8 @@
import org.springblade.modules.shareholder.vo.ShareholderVO;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Objects;
@@ -53,6 +55,17 @@
    public void importshare(List<shareExcel> data, Boolean isCovered) {
        data.forEach(shareExcel -> {
            Shareholder shareholder = Objects.requireNonNull(BeanUtil.copy(shareExcel, Shareholder.class));
            try {
                shareholder.setCapitaltime(new SimpleDateFormat("yyyy/MM/dd").parse(shareExcel.getCapitaltime()));
            } catch (ParseException e) {
                e.printStackTrace();
            }
            if (null!=shareExcel.getCapital() && shareExcel.getCapital()!=""){
                shareholder.setCapital(shareExcel.getCapital());
            }
            if (null!=shareExcel.getShareholdingratio() && shareExcel.getShareholdingratio()!=""){
                shareholder.setShareholdingratio(shareExcel.getShareholdingratio());
            }
            this.save(shareholder);
        });
    }