Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-06-17 63aab08cd422e940bf27a6908acd0e93a4df3a5c

Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

 company/.env.developmentCom

@@ -11,10 +11,8 @@

# VUE_APP_API = 'http://localhost:10031/'

<<<<<<< HEAD
# VUE_APP_API = 'http://192.168.0.138:10031/'
=======
VUE_APP_API = 'http://192.168.0.138:10031/'
>>>>>>> 5337d6006b45ca61881623ad2e8738e03ad3bde2

VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
VUE_APP_API = 'http://192.168.0.129:10031/'

# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'

 company/src/components/business/OperaWtbApplyShopWindow.vue

@@ -18,7 +18,7 @@
                </div>
                <div class="desc_item_label">
                    <div class="desc_item_label_left">
                        <span>投保人：{{ model.shopName }}</span>
                        <span>委托人：{{ model.shopName }}</span>
                        <span>被保险人：{{ model.companyName }}</span>
                      <span>保单状态：
                          <span  :class="'apply-status'+model.status" >{{ model.statusInfo }}</span>

 company/src/components/enterprise/onlineReporting.vue

@@ -231,7 +231,7 @@
                                            <span>{{ item.name }}</span>
                                        </div>
                                    </div>
                                    <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 1)" />
                                    <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 1)" />
                                </div>
                            </div>
                            <div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -259,7 +259,7 @@
                                            <span>{{ item.name }}</span>
                                        </div>
                                    </div>
                                    <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 2)" />
                                    <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 2)" />
                                </div>
                            </div>
                            <div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -287,7 +287,7 @@
                                            <span>{{ item.name }}</span>
                                        </div>
                                    </div>
                                    <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 3)" />
                                    <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 3)" />
                                </div>
                            </div>
                            <div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -315,7 +315,7 @@
                                            <span>{{ item.name }}</span>
                                        </div>
                                    </div>
                                    <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 4)" />
                                    <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 4)" />
                                </div>
                            </div>
                            <div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -343,7 +343,7 @@
                                            <span>{{ item.name }}</span>
                                        </div>
                                    </div>
                                    <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 5)" />
                                    <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 5)" />
                                </div>
                            </div>
                        </div>
@@ -360,17 +360,17 @@
                        </div>
                        <div class="box_desc_list">
                            <div class="box_desc_list_row">
                                <el-form-item label="收款银行" prop="receiveBank">
                                <el-form-item label="收款银行" :prop="userInfo.type === 1 ? '' : 'receiveBank'">
                                    <el-input v-model="form.receiveBank" placeholder="请输入收款银行支行名称"></el-input>
                                </el-form-item>
                            </div>
                            <div class="box_desc_list_row">
                                <el-form-item label="收款人" prop="receiveUserName">
                                <el-form-item label="收款人" :prop="userInfo.type === 1 ? '' : 'receiveUserName'">
                                    <el-input v-model="form.receiveUserName" placeholder="请输入开户姓名"></el-input>
                                </el-form-item>
                            </div>
                            <div class="box_desc_list_row">
                                <el-form-item label="收款账号" prop="receiveAccount">
                                <el-form-item label="收款账号" :prop="userInfo.type === 1 ? '' : 'receiveAccount'">
                                    <el-input v-model="form.receiveAccount" placeholder="请输入银行账号"></el-input>
                                </el-form-item>
                            </div>

 server/company/src/main/resources/application.yml

@@ -12,7 +12,7 @@
#  application:git
#    name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson:

 server/platform/src/main/resources/application.yml

@@ -11,7 +11,7 @@
#  application:
#  name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson:

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

@@ -1199,7 +1199,7 @@
                configTitleCell(sxssfWorkbook,title.getCell(i));
            }
            Row header1 = sheet.createRow(1);
            header1.createCell(0).setCellValue("投保人");
            header1.createCell(0).setCellValue("委托人");//投保人
            header1.createCell(1).setCellValue("");
            header1.createCell(2).setCellValue("被保险人");
            header1.createCell(3).setCellValue("");
@@ -1351,7 +1351,7 @@
            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,6));
            Row header1 = sheet.createRow(1);
            header1.setHeight((short) 500);
            header1.createCell(0).setCellValue("投保人");
            header1.createCell(0).setCellValue("委托人");//投保人
            header1.createCell(1).setCellValue("被保险人");
            header1.createCell(2).setCellValue("保险方案");
            header1.createCell(3).setCellValue("保险生效起期");
@@ -1459,7 +1459,7 @@
                configTitleCell(sxssfWorkbook,title.getCell(i));
            }
            Row header1 = sheet.createRow(1);
            header1.createCell(0).setCellValue("投保人");
            header1.createCell(0).setCellValue("委托人");//投保人
            header1.createCell(1).setCellValue("");
            header1.createCell(2).setCellValue("保险方案");
            header1.createCell(3).setCellValue("");
@@ -1623,7 +1623,7 @@
                configTitleCell(sxssfWorkbook,title.getCell(i));
            }
            Row header1 = sheet.createRow(1);
            header1.createCell(0).setCellValue("投保人");
            header1.createCell(0).setCellValue("委托人");//投保人
            header1.createCell(1).setCellValue("保险方案");
            header1.createCell(2).setCellValue("保单号");
            header1.createCell(3).setCellValue("保险生效起期");
@@ -1847,7 +1847,7 @@
                configTitleCell(sxssfWorkbook,title.getCell(i));
            }
            Row header1 = sheet.createRow(1);
            header1.createCell(0).setCellValue("投保人");
            header1.createCell(0).setCellValue("委托人");//投保人
            header1.createCell(1).setCellValue("保险方案");
            header1.createCell(2).setCellValue("保单号");
            header1.createCell(3).setCellValue("保险生效起期");
@@ -2016,7 +2016,7 @@
                configTitleCell(sxssfWorkbook,title.getCell(i));
            }
            Row header1 = sheet.createRow(1);
            header1.createCell(0).setCellValue("投保人");
            header1.createCell(0).setCellValue("委托人");//投保人
            header1.createCell(1).setCellValue("");
            header1.createCell(2).setCellValue("保险方案");
            header1.createCell(3).setCellValue("");

 server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java

@@ -251,8 +251,8 @@
        queryWrapper.le(StringUtils.isNotBlank(applyDetailPageDTO.getStartTimeE()),ApplyDetail::getStartTime,applyDetailPageDTO.getStartTimeE()+" 23:59:59.0");
        queryWrapper.ge(StringUtils.isNotBlank(applyDetailPageDTO.getEndTimeS()),ApplyDetail::getEndTime,applyDetailPageDTO.getEndTimeS()+" 00:00:00.0");
        queryWrapper.le(StringUtils.isNotBlank(applyDetailPageDTO.getEndTimeE()),ApplyDetail::getEndTime,applyDetailPageDTO.getEndTimeE()+" 23:59:59.0");
        queryWrapper.ge(Objects.nonNull(applyDetailPageDTO.getIsExcel())&&Constants.equalsInteger(applyDetailPageDTO.getIsExcel(),Constants.ONE),
                ApplyDetail::getEndTime,DateUtil.getPlusTime2(new Date()));
//        queryWrapper.ge(Objects.nonNull(applyDetailPageDTO.getIsExcel())&&Constants.equalsInteger(applyDetailPageDTO.getIsExcel(),Constants.ONE),
//                ApplyDetail::getEndTime,DateUtil.getPlusTime2(new Date()));

        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(pageWrap.getSorts())){
            for(PageWrap.SortData sortData: pageWrap.getSorts()) {

 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -40,6 +40,8 @@

import java.math.BigDecimal;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
@@ -573,9 +575,15 @@
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，保险方案下未查询到工种信息");
            }
        }

        //String pattern = "^[\\u4e00-\\u9fa5\\d·]+$";
        String pattern = "^[\\u4e00-\\u9fa5·]*$";
        Pattern r = Pattern.compile(pattern);
        index = Constants.TWO;
        for(MemberImport model : dataList){
            Matcher m = r.matcher(model.getName());
            if (!m.matches()) {
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，"+model.getName() + "姓名无效，请检查后重试");
            }
            //检查派遣单位和工种有效性
            dealDuAndWorktype(model,index,dispatchUnitList,solutions,solutionWorktypeList);
            index += 1;

 server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java

@@ -1364,9 +1364,9 @@
                    ||Objects.isNull(settleClaimsDTO.getMedicalInsurance())
                    ||StringUtils.isBlank(settleClaimsDTO.getInformantName())
                    ||StringUtils.isBlank(settleClaimsDTO.getInformantPhone())
                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveUserName())
                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveBank())
                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveAccount())
//                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveUserName())
//                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveBank())
//                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveAccount())
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }

 server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java

@@ -444,11 +444,14 @@
    @Override
    public List<SolutionsBase> findList(SolutionsBase solutionsBase) {
        QueryWrapper<SolutionsBase> wrapper = new QueryWrapper<>();
        wrapper.lambda().select(SolutionsBase::getId,SolutionsBase::getName);
        wrapper.lambda().eq(SolutionsBase::getDataType,Constants.ZERO);
        wrapper.lambda().eq(SolutionsBase::getIsdeleted,Constants.ZERO);
        return solutionsBaseMapper.selectList(wrapper);
    }



    @Override
    public PageData<SolutionsBase> findPage(PageWrap<SolutionsBase> pageWrap) {
        IPage<SolutionsBase> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());

 server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java

@@ -346,6 +346,7 @@
                        .eq(Multifile::getIsdeleted,Constants.ZERO)
                        .eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey()));
        Multifile file = solutions.getFanganFile();
        file.setId(null);
        file.setIsdeleted(Constants.ZERO);
        file.setCreateDate(solutions.getEditDate());
        file.setCreator(solutions.getEditor());
@@ -353,6 +354,7 @@
        file.setObjType(Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey());
        file.setType(Constants.formatIntegerNum(file.getType()));
        multifileMapper.insert(file);
        file.setId(null);
        file.setObjId(newModel.getId());
        multifileMapper.insert(file);


 server/shop/src/main/resources/application.yml

@@ -12,7 +12,7 @@
#  application:git
#    name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson: