git ch

k94314517

2024-04-01 0c1ac49f859a0570a19f267d6def82100cb39860

git ch

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

@@ -1139,13 +1139,13 @@
                sheet.setColumnWidth(i, ((i==3|| i== 4|| i== 5 )?16:8) * 2 * 256);
            }
            sheet.createFreezePane(0, 1);
            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,6));
            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,5));
            Row title = sheet.createRow(0);
            title.setHeight((short) 2000);
            Cell c = title.createCell(0);
            c.setCellValue(sheetName);
            configFirstCell(sxssfWorkbook,c);
            for (int i = 0; i < 8; i++) {
            for (int i = 0; i < 6; i++) {
                if(i>0){
                    title.createCell(i).setCellValue("");
                }
@@ -1154,7 +1154,7 @@
            Row header1 = sheet.createRow(1);
            header1.createCell(0).setCellValue("投保人");
            header1.createCell(1).setCellValue("报保险人");
            header1.createCell(2).setCellValue("投保人数");
            header1.createCell(2).setCellValue("");
            header1.createCell(3).setCellValue("保险方案");
            header1.createCell(4).setCellValue("保险生效起期");
            header1.createCell(5).setCellValue("保险生效止期");
@@ -1192,8 +1192,8 @@
                header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
                header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"男":(Constants.equalsInteger(addModel.getSex(),1)?"女":"-"));
                header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getIdcardNo(),""));
                header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
                header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
                header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
                header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
                for (int i = 0; i < 6; i++) {
                    configDataCell(sxssfWorkbook,header5.getCell(i));
                }
@@ -1214,7 +1214,7 @@
                configInfoCell(sxssfWorkbook,header6.getCell(i),HorizontalAlignment.LEFT);
            }
            header6.setHeight((short) 2000);
            sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,0,7));
            sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,0,5));
            Row header7= sheet.createRow(rowIndex+1);
            header7.setHeight((short) 3000);
            header7.createCell(0).setCellValue("投保企业签章 ：                            \n \n \n" +"日期：     年     月     日    ");
@@ -1224,7 +1224,7 @@
                }
                configInfoCell(sxssfWorkbook,header7.getCell(i),HorizontalAlignment.RIGHT);
            }
            sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,7));
            sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,5));

            //临时缓冲区
            ByteArrayOutputStream out = new ByteArrayOutputStream();

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

@@ -2447,7 +2447,7 @@
                .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
                .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
                .isNull(ApplyDetail::getFromId)
                .eq(ApplyDetail::getId,model.getId())
                .eq(ApplyDetail::getApplyId,model.getId())
        );
        model.setApplyDetailList(applyDetailList);
        return model;

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

@@ -463,15 +463,24 @@
        //合并单状态处于待投保
        if(unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())
        || unionApply.getStatus().equals(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
            //TODO 删除企业投保单的 签署数据

            multifileMapper.delete(new QueryWrapper<Multifile>()
                    .lambda()
                    .apply(" multifile.id in ( select i.id  from insurance_apply i where i.UNION_APPLY_ID = "+unionApply.getId()+" ) ")
                    .eq(Multifile::getObjType,Constants.MultiFile.COMPANY_TBD_SIGNED.getKey()));
        }
        insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
                .set(InsuranceApply::getUnionApplyId,null)
                .set(InsuranceApply::getCheckDate,new Date())
                .set(unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())
                        || unionApply.getStatus().equals(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey()),
                        InsuranceApply::getUnionApplyTbdStatus,Constants.ZERO)
                .set(unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())
                        || unionApply.getStatus().equals(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey()),
                        InsuranceApply::getApplyTbdNo,null)
                .set(InsuranceApply::getCheckUserId,user.getId())
                .set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey())
                .eq(InsuranceApply::getUnionApplyId,unionApply.getId()));
                .eq(InsuranceApply::getUnionApplyId,unionApply.getId())
        );

        applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda()
                .set(ApplyDetail::getUnionApplyId,null)