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);
@@ -12,7 +12,7 @@ # application:git # name: doumeemes profiles: active: dev active: pro # JSON返回配置 jackson:
