server/company/src/main/java/com/doumee/api/business/CompanySolutionController.java
@@ -74,6 +74,7 @@ return ApiResponse.success(companySolutionService.findPage(pageWrap)); } @ApiOperation("导出Excel") @PostMapping("/exportExcel") @RequiresPermissions("business:companysolution:exportExcel") server/platform/src/main/java/com/doumee/api/business/CompanySolutionController.java
@@ -73,6 +73,18 @@ public ApiResponse<PageData<CompanySolution>> findPage (@RequestBody PageWrap<CompanySolution> pageWrap) { return ApiResponse.success(companySolutionService.findPage(pageWrap)); } @ApiOperation("查询全部") @PostMapping("/list") @RequiresPermissions("business:companysolution:query") public ApiResponse<List<CompanySolution>> findPage (@RequestBody CompanySolution pageWrap) { return ApiResponse.success(companySolutionService.findList(pageWrap)); } @ApiOperation("查询企业全部关联方案") @PostMapping("/listForCompany") @RequiresPermissions("business:companysolution:query") public ApiResponse<List<CompanySolution>> findListForCompany (@RequestBody CompanySolution pageWrap) { return ApiResponse.success(companySolutionService.findListForCompany(pageWrap)); } @ApiOperation("导出Excel") @PostMapping("/exportExcel") server/platform/src/main/java/com/doumee/api/common/PublicController.java
@@ -60,8 +60,9 @@ @ApiOperation("君子签签约回调通知") @PostMapping("/signNotify") public ApiResponse updateStatus(@RequestBody NotifyReq request) { public void updateStatus(@RequestBody NotifyReq request,HttpServletResponse response) { Map<String, Object> context = new HashMap<>(); context.put("success",true); InterfaceLog log=new InterfaceLog(); log.setType(1); log.setCreateDate(new Date()); @@ -85,12 +86,14 @@ insuranceApplyService.dealSignResult(request.getData()); }catch (Exception e){ log.setRepose("处理异常；"+e.getMessage()); context.put("success",false); context.put("msg","处理发生异常"); throw e; }finally { interfaceLogService.create(log); } return ApiResponse.success(null); writerJson(response, context); } @ApiOperation(value = "上传", notes = "上传", httpMethod = "POST", position = 6) server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
@@ -65,8 +65,8 @@ @ExcelColumn(name="排序码") private Integer sortnum; @ApiModelProperty(value = "企业编码（关联solution_base）", example = "1") @ExcelColumn(name="企业编码（关联solution_base）") @ApiModelProperty(value = "方案编码（关联solutions）", example = "1") @ExcelColumn(name="方案编码（关联solutions）") private Integer solutionBaseId; @ApiModelProperty(value = "是否可加保 0否 1是", example = "1") server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
@@ -129,6 +129,23 @@ @ApiModelProperty(value = "报案人姓名") @ExcelColumn(name="报案人姓名") private String informantName; @ApiModelProperty(value = "医疗理赔") @ExcelColumn(name="医疗理赔") private BigDecimal ylClaimAccount; @ApiModelProperty(value = "误工理赔") @ExcelColumn(name="误工理赔") private BigDecimal wgClaimAccount; @ApiModelProperty(value = "死亡理赔") @ExcelColumn(name="死亡理赔") private BigDecimal swClaimAccount; @ApiModelProperty(value = "伤残理赔") @ExcelColumn(name="伤残理赔") private BigDecimal scClaimAccount; @ApiModelProperty(value = "理赔总额") @ExcelColumn(name="理赔总额") private BigDecimal claimAccount; @ApiModelProperty(value = "报案人联系方式") @ExcelColumn(name="报案人联系方式") server/service/src/main/java/com/doumee/service/business/CompanySolutionService.java
@@ -78,6 +78,7 @@ * @return List<CompanySolution> */ List<CompanySolution> findList(CompanySolution companySolution); List<CompanySolution> findListForCompany(CompanySolution companySolution); /** * 分页查询 server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java
@@ -2,14 +2,18 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.business.CompanySolutionMapper; import com.doumee.dao.business.join.CompanySolutionJoinMapper; import com.doumee.dao.business.model.CompanySolution; import com.doumee.dao.business.model.Solutions; import com.doumee.service.business.CompanySolutionService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -24,6 +28,8 @@ @Service public class CompanySolutionServiceImpl implements CompanySolutionService { @Autowired private CompanySolutionJoinMapper companySolutionJoinMapper; @Autowired private CompanySolutionMapper companySolutionMapper; @@ -77,7 +83,18 @@ QueryWrapper<CompanySolution> wrapper = new QueryWrapper<>(companySolution); return companySolutionMapper.selectOne(wrapper); } @Override public List<CompanySolution> findListForCompany(CompanySolution companySolution) { MPJLambdaWrapper<CompanySolution> csWrapper = new MPJLambdaWrapper<>(); csWrapper.selectAll(CompanySolution.class); csWrapper.selectAs(Solutions::getName,CompanySolution::getSolutionName); csWrapper.leftJoin(Solutions.class,Solutions::getId,CompanySolution::getSolutionBaseId); csWrapper.eq(CompanySolution::getCompanyId,companySolution.getCompanyId()); csWrapper.eq(CompanySolution::getIsdeleted, Constants.ZERO); csWrapper.eq(Solutions::getIsdeleted, Constants.ZERO); csWrapper.orderByAsc(CompanySolution::getSortnum); return companySolutionJoinMapper.selectJoinList(CompanySolution.class,csWrapper); } @Override public List<CompanySolution> findList(CompanySolution companySolution) { QueryWrapper<CompanySolution> wrapper = new QueryWrapper<>(companySolution); server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -218,6 +218,11 @@ update.setCheckUserId(user.getId()); update.setStatus(Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey()); update.setId(model.getId()); update.setYlClaimAccount(Constants.formatBigdecimal(param.getYlClaimAccount())); update.setSwClaimAccount(Constants.formatBigdecimal(param.getSwClaimAccount())); update.setWgClaimAccount(Constants.formatBigdecimal(param.getWgClaimAccount())); update.setScClaimAccount(Constants.formatBigdecimal(param.getScClaimAccount())); update.setClaimAccount(update.getYlClaimAccount().add(update.getSwClaimAccount()).add(update.getScClaimAccount()).add(update.getWgClaimAccount())); settleClaimsMapper.updateById(update); Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_FINISH;
