提交一把

jiangping

2024-06-25 545cc3a93547af47080440010c03b70ed7baabdd

提交一把

 server/company/pom.xml

@@ -26,7 +26,7 @@
    </dependencies>

    <build>
        <finalName>company</finalName>
        <finalName>yyb_web_api</finalName>
        <resources>
            <resource>
                <directory>src/main/resources</directory>

 server/platform/pom.xml

@@ -22,7 +22,7 @@
        </dependency>
    </dependencies>
    <build>
        <finalName>platform</finalName>
        <finalName>yyb_admin_api</finalName>
        <resources>
            <resource>
                <directory>src/main/resources</directory>

 server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java

@@ -211,7 +211,8 @@
                if(StringUtils.isBlank(systemUser.getMobile()) || StringUtils.isBlank(systemUser.getCaptcha())){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"短信验证码不能为空！");
                }
                if(!debugModel){
                String  phoneAtuh = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_PHONE_AUTH).getCode();
                if(!debugModel && !StringUtils.equals(phoneAtuh,Constants.ONE+"")){
                    SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,systemUser.getMobile(),systemUser.getCaptcha());
                }
            }

 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java

@@ -1190,24 +1190,27 @@
            }
            Row header1 = sheet.createRow(1);
            header1.createCell(0).setCellValue("投保人");
            header1.createCell(1).setCellValue("被保险人");
            header1.createCell(2).setCellValue("");
            header1.createCell(3).setCellValue("保险方案");
            header1.createCell(4).setCellValue("保险生效起期");
            header1.createCell(5).setCellValue("保险生效止期");
            header1.createCell(1).setCellValue("");
            header1.createCell(2).setCellValue("被保险人");
            header1.createCell(3).setCellValue("");
            header1.createCell(4).setCellValue("保险方案");
            header1.createCell(5).setCellValue("申请提交日期");
//            header1.createCell(5).setCellValue("保险生效止期");
            for (int i = 0; i < 6; i++) {
                configFirstCell(sxssfWorkbook,header1.getCell(i));
            }
            sheet.addMergedRegion(new CellRangeAddress(1  ,1,1,2));
            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,1));
            sheet.addMergedRegion(new CellRangeAddress(1  ,1,2,3));

            Row header2 = sheet.createRow(2);
            header2.createCell(0).setCellValue(insuranceApply.getShopName());
            header2.createCell(1).setCellValue(insuranceApply.getCompanyName());
            header2.createCell(2).setCellValue(insuranceApply.getInsureNum());
            header2.createCell(3).setCellValue(insuranceApply.getSolutionsName());
            header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(insuranceApply.getStartTime()));
            header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(insuranceApply.getEndTime()));
            sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,2));
            header2.createCell(1).setCellValue("");
            header2.createCell(2).setCellValue(insuranceApply.getCompanyName());
            header2.createCell(3).setCellValue("");
            header2.createCell(4).setCellValue(insuranceApply.getSolutionsName());
            header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(insuranceApply.getCreateDate()));
            sheet.addMergedRegion(new CellRangeAddress(2  ,2,0,1));
            sheet.addMergedRegion(new CellRangeAddress(2  ,2,2,3));
            for (int i = 0; i < 6; i++) {
                configDataCell(sxssfWorkbook,header2.getCell(i));
            }

 server/shop/pom.xml

@@ -23,13 +23,12 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
    <build>
        <finalName>shop</finalName>
        <finalName>yyb_shop_api</finalName>
        <resources>
            <resource>
                <directory>src/main/resources</directory>
            </resource>
        </resources>

        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>