Merge remote-tracking branch 'origin/master'

jiangping

2024-01-23 a946438f6d69f976c94935f53dd7f326947aba0f

Merge remote-tracking branch 'origin/master'

 server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java

@@ -85,8 +85,6 @@
    }




    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:settleclaims:query")
@@ -105,6 +103,6 @@
    @GetMapping("/{id}")
    @RequiresPermissions("business:settleclaims:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(settleClaimsService.findById(id));
        return ApiResponse.success(settleClaimsService.getSettleClaimsDetail(id));
    }
}

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -958,7 +958,6 @@



//3=退回申请；4=平台审批通过；0=审批驳回;5=平台审批驳回
    public  enum ApplyChangeLogStatus {
        UPLOAD(0, "发起申请"),
        RETURN_APPLY(3, "发起退回申请"),
@@ -1005,6 +1004,8 @@

    }



    public  enum ProjectRecord {

        COM_EDITING(0, "企业保存数据", "由 ${param2} ${param3}保存成功，当前进度为 ã€${param4}】"),

 server/service/src/main/java/com/doumee/dao/business/join/SettleClaimsLogJoinMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.doumee.dao.business.join;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.SettleClaimsLog;
import com.github.yulichang.base.mapper.MPJJoinMapper;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/01/16 10:03
 */
public interface SettleClaimsLogJoinMapper extends MPJJoinMapper<SettleClaimsLog> {

}

 server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java

@@ -152,4 +152,30 @@
    @TableField(exist = false)
    private List<Multifile> reportFileList;

    @ApiModelProperty(value = "员工关系资料")
    @TableField(exist = false)
    private List<Multifile> relationFileList;

    @ApiModelProperty(value = "门诊资料")
    @TableField(exist = false)
    private List<Multifile> outpatientFileList;

    @ApiModelProperty(value = "住院资料")
    @TableField(exist = false)
    private List<Multifile> hospitalFileList;

    @ApiModelProperty(value = "伤残资料")
    @TableField(exist = false)
    private List<Multifile> disabilityFileList;

    @ApiModelProperty(value = "赔付结案资料")
    @TableField(exist = false)
    private List<Multifile> compensationFileList;

    @ApiModelProperty(value = "日志列表")
    @TableField(exist = false)
    List<SettleClaimsLog> settleClaimsLogList;



}

 server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -79,4 +80,11 @@
    @ExcelColumn(name="操作后内容")
    private String afterContent;

    @ApiModelProperty(value = "创建人名称", example = "1")
    @TableField(exist = false)
    private String  creatorName;

    @ApiModelProperty(value = "公司名称", example = "1")
    @TableField(exist = false)
    private String  companyName;
}

 server/service/src/main/java/com/doumee/service/business/SettleClaimsService.java

@@ -109,4 +109,6 @@
     * @return long
     */
    long count(SettleClaims settleClaims);

    SettleClaims getSettleClaimsDetail(Integer id);
}

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

@@ -12,6 +12,7 @@
import com.doumee.dao.business.SettleClaimsMapper;
import com.doumee.dao.business.dto.SCSupplementDTO;
import com.doumee.dao.business.join.SettleClaimsJoinMapper;
import com.doumee.dao.business.join.SettleClaimsLogJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.SettleClaimsLogService;
import com.doumee.service.business.SettleClaimsService;
@@ -28,6 +29,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * ç†èµ”申请表Service实现
@@ -48,6 +50,9 @@

    @Autowired
    private SettleClaimsJoinMapper settleClaimsJoinMapper;

    @Autowired
    private SettleClaimsLogJoinMapper settleClaimsLogJoinMapper;

    @Override
    public Integer create(SettleClaims settleClaims) {
@@ -109,16 +114,51 @@
    }


    @Override
    public SettleClaims getSettleClaimsDetail(Integer id){
        SettleClaims settleClaims = settleClaimsJoinMapper.selectJoinOne(SettleClaims.class,new MPJLambdaWrapper<SettleClaims>()
                .selectAll(SettleClaims.class)
                .leftJoin(Member.class,Member::getId,SettleClaims::getMemberId)
                .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
                .leftJoin(DispatchUnit.class,DispatchUnit::getId,SettleClaims::getDuId)

                .leftJoin(Worktype.class,Worktype::getId,SettleClaims::getWorktypeId)
                .eq(SettleClaims::getId,id)
                .last(" limit 1 ")
        );

        List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
                .lambda().eq(Multifile::getObjId,id)
                .eq(Multifile::getIsdeleted,Constants.ZERO)
                .orderByAsc(Multifile::getCreateDate)
        );
        if(CollectionUtils.isNotEmpty(multifileList)){
            settleClaims.setReportFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SGXC_FILE.getKey())).collect(Collectors.toList()));

            settleClaims.setRelationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_YGGX_FILE.getKey())).collect(Collectors.toList()));

            settleClaims.setOutpatientFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_MZCL_FILE.getKey())).collect(Collectors.toList()));

            settleClaims.setHospitalFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_ZYCL_FILE.getKey())).collect(Collectors.toList()));

            settleClaims.setDisabilityFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SCZL_FILE.getKey())).collect(Collectors.toList()));

            settleClaims.setCompensationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_JACL_FILE.getKey())).collect(Collectors.toList()));

        }

        //查询操作记录
        List<SettleClaimsLog> settleClaimsLogList = settleClaimsLogJoinMapper.selectJoinList(SettleClaimsLog.class,
                new MPJLambdaWrapper<SettleClaimsLog>()
                        .selectAll(SettleClaimsLog.class)
                        .selectAs(Member::getName,SettleClaimsLog::getCreatorName)
                        .selectAs(Company::getName,SettleClaimsLog::getCompanyName)
                        .leftJoin(Member.class,Member::getId,SettleClaimsLog::getCreator)
                        .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                        .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
                        .orderByAsc(SettleClaimsLog::getCreateDate)
        );

        settleClaims.setSettleClaimsLogList(settleClaimsLogList);
        return settleClaims;
    }