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

jiangping

2025-05-20 418eb69319481f176a49ab085b971d81d55661f7

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

# Conflicts:
#	server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
#	server/service/src/main/java/com/doumee/service/business/SettleClaimsService.java

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

@@ -126,6 +126,13 @@
    }


    @ApiOperation("查询人员可报案数据")
    @GetMapping("/getMemberSettleClaimsList")
    public ApiResponse<List<ApplyDetail>> getMemberSettleClaimsList(@RequestParam Integer memberId) {
        return ApiResponse.success(applyDetailService.getMemberSettleClaimsList(memberId));
    }




}

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

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

import com.doumee.api.BaseController;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.dao.business.dto.CompensationDTO;
import com.doumee.dao.business.dto.OptSettleClaimsDTO;
import com.doumee.dao.business.dto.SaveSupplementDescribeDTO;
import com.doumee.dao.business.dto.SettleClaimsDTO;
import com.doumee.service.business.SettleClaimsService;
import com.doumee.service.system.impl.SystemDictDataServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/01/16 10:03
 */
@Api(tags = "报案理赔（新）")
@RestController
@RequestMapping("/business/settleRisk")
public class SettleRiskController extends BaseController {

    @Autowired
    private SystemDictDataServiceImpl systemDictDataService;

    @Autowired
    private SettleClaimsService settleClaimsService;


    @PreventRepeat
    @ApiOperation("理赔报案")
    @PostMapping("/saveSettleClaims")
    public ApiResponse saveSettleClaims(@RequestBody SettleClaimsDTO settleClaimsDTO) {
        settleClaimsService.saveSettleClaims(settleClaimsDTO,systemDictDataService);
        return ApiResponse.success(null);
    }


    @PreventRepeat
    @ApiOperation("添加材料")
    @PostMapping("/saveSupplementFile")
    public ApiResponse saveSupplementFile(@RequestBody SaveSupplementDescribeDTO dto) {
        settleClaimsService.saveSupplementFile(dto);
        return ApiResponse.success(null);
    }



    @PreventRepeat
    @ApiOperation("撤销报案")
    @PostMapping("/returnSettle")
    public ApiResponse returnSettle(@RequestBody OptSettleClaimsDTO dto) {
        settleClaimsService.returnSettle(dto);
        return ApiResponse.success(null);
    }


    @PreventRepeat
    @ApiOperation("确认金额")
    @GetMapping("/confirmFee")
    public ApiResponse confirmFee(@RequestParam Integer id) {
        settleClaimsService.confirmFee(id);
        return ApiResponse.success(null);
    }



}

 server/platform/src/main/java/com/doumee/api/business/RiskConfigController.java

ÎļþÒÑɾ³ý

 server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java

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

import com.doumee.api.BaseController;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.vo.CompensationVO;
import com.doumee.dao.business.vo.RiskConfigVO;
import com.doumee.service.business.SettleClaimsService;
import com.doumee.service.system.SystemDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/01/16 10:03
 */
@Api(tags = "报案理赔（新）")
@RestController
@RequestMapping("/business/settleRisk")
public class SettleRiskController extends BaseController {

    @Autowired
    private SystemDictDataService systemDictDataService;

    @Autowired
    private SettleClaimsService settleClaimsService;

    @ApiOperation("获取风险配置")
    @GetMapping("/getRiskConfig")
    public ApiResponse<RiskConfigVO> getRiskConfig() {
        return ApiResponse.success(systemDictDataService.getRiskConfig());
    }


    @ApiOperation("更新风险配置")
    @PostMapping("/updRiskConfig")
    public ApiResponse updRiskConfig(@RequestBody RiskConfigDTO riskConfigDTO) {
        systemDictDataService.updRiskConfig(riskConfigDTO);
        return ApiResponse.success(null);
    }


    @PreventRepeat
    @ApiOperation("补充说明")
    @PostMapping("/saveSupplementDescribe")
    public ApiResponse saveSupplementDescribe(@RequestBody SaveSupplementDescribeDTO dto) {
        settleClaimsService.saveSupplementDescribe(dto);
        return ApiResponse.success(null);
    }

    @PreventRepeat
    @ApiOperation("添加材料")
    @PostMapping("/saveSupplementFile")
    public ApiResponse saveSupplementFile(@RequestBody SaveSupplementDescribeDTO dto) {
        settleClaimsService.saveSupplementFile(dto);
        return ApiResponse.success(null);
    }


    @PreventRepeat
    @ApiOperation("平台立案或退回")
    @PostMapping("/register")
    public ApiResponse register(@RequestBody OptSettleClaimsDTO dto) {
        settleClaimsService.register(dto);
        return ApiResponse.success(null);
    }



    @PreventRepeat
    @ApiOperation("添加报案号")
    @PostMapping("/addReportNum")
    public ApiResponse addReportNum(@RequestBody OptSettleClaimsDTO dto) {
        settleClaimsService.addReportNum(dto);
        return ApiResponse.success(null);
    }



    @PreventRepeat
    @ApiOperation("添加备注")
    @PostMapping("/addRemark")
    public ApiResponse addRemark(@RequestBody OptSettleClaimsDTO dto) {
        settleClaimsService.addRemark(dto);
        return ApiResponse.success(null);
    }


    @PreventRepeat
    @ApiOperation("受理业务")
    @PostMapping("/acceptance")
    public ApiResponse acceptance(@RequestBody AcceptanceSettleClaimsDTO dto) {
        settleClaimsService.acceptance(dto);
        return ApiResponse.success(null);
    }


    @PreventRepeat
    @ApiOperation("理赔费用项信息")
    @GetMapping("/getCompensation")
    public ApiResponse<List<CompensationVO>> getCompensation(@RequestParam Integer id) {
        return ApiResponse.success(settleClaimsService.getCompensation(id));
    }


    @PreventRepeat
    @ApiOperation("理赔")
    @PostMapping("/compensation")
    public ApiResponse compensation(@RequestBody CompensationDTO dto) {
        settleClaimsService.compensation(dto);
        return ApiResponse.success(null);
    }


    @PreventRepeat
    @ApiOperation("商议审批")
    @PostMapping("/discussAudit")
    public ApiResponse discussAudit(@RequestBody DiscussAuditDTO dto) {
        settleClaimsService.discussAudit(dto);
        return ApiResponse.success(null);
    }



    @PreventRepeat
    @ApiOperation("核赔")
    @PostMapping("/nuclearCompensation")
    public ApiResponse nuclearCompensation(@RequestBody CompensationDTO dto) {
        settleClaimsService.nuclearCompensation(dto);
        return ApiResponse.success(null);
    }



    @PreventRepeat
    @ApiOperation("修改金额")
    @PostMapping("/updFee")
    public ApiResponse updFee(@RequestBody CompensationDTO dto) {
        settleClaimsService.updFee(dto);
        return ApiResponse.success(null);
    }


    @PreventRepeat
    @ApiOperation("修改案件类型")
    @PostMapping("/updCaseType")
    public ApiResponse updCaseType(@RequestBody CaseTypeDTO dto) {
        settleClaimsService.updCaseType(dto);
        return ApiResponse.success(null);
    }



}

 server/platform/src/main/java/com/doumee/api/business/UnionChangeController.java

@@ -120,6 +120,7 @@
        return ApiResponse.success(unionChangeService.getSignLink(smsCheckDTO));
    }


    @ApiOperation("上传保险单")
    @PostMapping("/uploadBXD")
    @RequiresPermissions("business:unionchange:uploadBXD")

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

@@ -1934,26 +1934,28 @@

    public  enum SettleClaimsStatus {
        //状态 0暂存中 1已报案 2待立案 3已立案 4立案退回 5待受理 6拒绝受理 7商议待审批
        // 8商议审批拒绝 9已受理 10待核赔  11已核赔 12待结案 13已结案 14已撤案
        // 8商议审批拒绝 9已受理 10待核赔  11已核赔 12已确认金额 13已结案 14已撤案
        WAIT_ACCEPTANCE(0, "暂存中"),
        RETURN_ACCEPTANCE(1, "已报案"),
        DEAL_ING(2, "待立案"),
        DEAL_ING(2, "待立案 ï¼ˆå¼ƒç”¨ï¼‰"),
        CONFIRM_INFORMATION(3, "已立案"),
        FINISH_ACCEPTANCE(4, "立案退回"),
        WAIT_DEAL(5, "待受理"),
        REJECT_DEAL(6, "拒绝受理"),
        WAIT_DISCUSS_AUDIT(7, "待商议审批"),
        WAIT_DISCUSS_REJECT(8, "商议审批拒绝"),
        ACCEPTANCE(9, "已受理"),
        ACCEPTANCE(9, "已受理"),//待理算
        WAIT_AUDIT_COMPENSATION(10, "待核赔"),
        COMPENSATION(11, "已核赔"),
        WAIT_CLOSE_CASE(12, "待结案"),
        CLOSE_CASE(13, "待结案"),
        CONFIRM_FEE(12, "已确认金额"),
        CLOSE_CASE(13, "已结案"),
        RETURN(14, "已撤案"),
        ;
        // æˆå‘˜å˜é‡
        private String name;
        private int key;
        private String name;//业务描述
        private int key;//业务状态
        private int companyParentKey;//企业主流程
        private int platformParentKey;//平台主流程

        // æž„造方法
        SettleClaimsStatus(int key, String name) {
@@ -1996,12 +1998,25 @@
        PLATFORM_FINISH(3, "结案提交","提交意见：${param}"),
        UPDATE_DATA(4, "修改信息","提交意见：${param}"),
        SUPPLEMENT(5, "补充说明","提交意见：${param}"),
        PLATFORM_LP_DEAL(6, "平台理赔处理","提交意见：${param}"),
        PLATFORM_LP_DEAL(6, "平台理赔处理","已在平台完成理赔"),
        PLATFORM_REMARK(7, "平台备注标签","${param}"),
        PLATFORM_ADDCODE(8, "平台添加报案号","备案号：${param}"),
        PLATFORM_UN_AGREE_BACK(9, "企业下载资料",""),
        PLATFORM_DOWNLOAD(10, "平台下载资料",""),
        PLATFORM_CHECK_PASS(11, "平台上传资料",""),
        SUPPLEMENT_DESCRIBE(12, "平台填写需补充内容",""),
        RETURN_SETTLE(13, "撤销报案",""),
        PLATFORM_REGISTER(14, "平台立案",""),
        PLATFORM_ACCEPTANCE(15, "受理-已受理",""),
        PLATFORM_REFUSE_ACCEPTANCE(16, "受理-拒绝受理","拒绝原因：${param}"),
        PLATFORM_DISCUSS(17, "受理-商议",""),
        PLATFORM_DISCUSS_PASS(18, "受理-商议通过",""),
        PLATFORM_DISCUSS_REFUSE(19, "受理-商议拒绝","拒绝原因：${param}"),
        PLATFORM_WAIT_DISCUSS(20, "受理-商议待审批",""),
        PLATFORM_HP_DEAL(21, "核赔-提交核赔金额","已提交赔付金额，待用户确认"),
        PLATFORM_UPD_FEE(22, "核赔-修改金额",""),
        CONFIRM_FEE(22, "核赔-客户确认金额","已确认金额"),
        UPD_CASE_TYPE(23, "受理-确认案件类型","已确认案件类型"),
        ;
        // æˆå‘˜å˜é‡
        private String name;
@@ -2621,5 +2636,73 @@
    }


    /**
     * èµ”付项
     */
    public  enum compensation{
        YL_COMPENSATION(0, "医疗理赔",1),
        WG_COMPENSATION(1, "误工理赔",1),
        SC_COMPENSATION(2, "伤残理赔",1),
        SW_COMPENSATION(3, "死亡理赔",1),
        HSF_FEE(4, "伙食费",2),
        XY_FEE(5, "续医费",2),
        YY_FEE(6, "营养费",2),
        HL_FEE(7, "护理费",2),
        ZDJB_FEE(8, "重大疾病赔偿金",2),
        TB_FEE(9, "特别费用",2),
        ZS_FEE(10, "住宿费",2),
        JT_FEE(11, "津贴",2),
        CJ_FEE(12, "残疾赔偿金",2),
        BFYR_FEE(13, "被抚养人生活费",2),
        SCF_FEE(14, "丧葬费",2),
        JSFXJ_FEE(15, "精神抚恤金",2),
        JD_FEE(16, "鉴定费",2),
        SS_FEE(17, "诉讼费",2),
        LS_FEE(18, "律师费",2),
        TRAFFIC_FEE(19, "交通费",2),
        CJQJ_FEE(20, "残疾器具费",2),
        QT_FEE(21, "其他费用",2),
        ;
        // æˆå‘˜å˜é‡
        private String name;
        private int key;
        private int type;

        // æž„造方法
        compensation(int key, String name, int type) {
            this.name = name;
            this.key = key;
            this.type = type;
        }


        // get set æ–¹æ³•
        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public int getKey() {
            return key;
        }

        public void setKey(int key) {
            this.key = key;
        }


        public int getType() {
            return type;
        }

        public void setType(int type) {
            this.type = type;
        }

    }


}

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

@@ -113,6 +113,33 @@
        }
    }

    public static long getBetweenMin(Date fromDate, Date toDate) {
        long m_intervalday = 0;// åˆå§‹åŒ–时间间隔的值为0
        // ä½¿ç”¨çš„时间格式为yyyy-MM-dd
        try {
            m_intervalday = toDate.getTime() - fromDate.getTime();// è®¡ç®—所得为微秒数
            m_intervalday = m_intervalday / 1000 / 60 ;// è®¡ç®—所得的天数

            return m_intervalday + 1;
        } catch (Exception e) {
            return Integer.MIN_VALUE;
        }
    }


    public static long getBetweenDay(Date fromDate, Date toDate) {
        long m_intervalday = 0;// åˆå§‹åŒ–时间间隔的值为0
        // ä½¿ç”¨çš„时间格式为yyyy-MM-dd
        try {
            m_intervalday = toDate.getTime() - fromDate.getTime();// è®¡ç®—所得为微秒数
            m_intervalday = m_intervalday / 1000 / 60 / 60 / 24 ;// è®¡ç®—所得的天数

            return m_intervalday + 1;
        } catch (Exception e) {
            return Integer.MIN_VALUE;
        }
    }

    /**
     * @author Pablo Descrption:ȡ�õ�ǰ����getgetg get Date format
     *         Example：2008.03.15
@@ -889,95 +916,95 @@
     * @return è½¬æ¢å¾—到的日期
     */
    @SuppressWarnings("unchecked")
    public static Date stringToDate(String strDate, String oracleFormat) {
        if (strDate == null)
            return null;
        Hashtable<Integer, String> h = new Hashtable<Integer, String>();
        String javaFormat = new String();
        String s = oracleFormat.toLowerCase();
        if (s.indexOf("yyyy") != -1)
            h.put(new Integer(s.indexOf("yyyy")), "yyyy");
        else if (s.indexOf("yy") != -1)
            h.put(new Integer(s.indexOf("yy")), "yy");
        if (s.indexOf("mm") != -1)
            h.put(new Integer(s.indexOf("mm")), "MM");

        if (s.indexOf("dd") != -1)
            h.put(new Integer(s.indexOf("dd")), "dd");
        if (s.indexOf("hh24") != -1)
            h.put(new Integer(s.indexOf("hh24")), "HH");
        if (s.indexOf("mi") != -1)
            h.put(new Integer(s.indexOf("mi")), "mm");
        if (s.indexOf("ss") != -1)
            h.put(new Integer(s.indexOf("ss")), "ss");

        int intStart = 0;
        while (s.indexOf("-", intStart) != -1) {
            intStart = s.indexOf("-", intStart);
            h.put(new Integer(intStart), "-");
            intStart++;
        }

        intStart = 0;
        while (s.indexOf("/", intStart) != -1) {
            intStart = s.indexOf("/", intStart);
            h.put(new Integer(intStart), "/");
            intStart++;
        }

        intStart = 0;
        while (s.indexOf(" ", intStart) != -1) {
            intStart = s.indexOf(" ", intStart);
            h.put(new Integer(intStart), " ");
            intStart++;
        }

        intStart = 0;
        while (s.indexOf(":", intStart) != -1) {
            intStart = s.indexOf(":", intStart);
            h.put(new Integer(intStart), ":");
            intStart++;
        }

        if (s.indexOf("å¹´") != -1)
            h.put(new Integer(s.indexOf("å¹´")), "å¹´");
        if (s.indexOf("月") != -1)
            h.put(new Integer(s.indexOf("月")), "月");
        if (s.indexOf("日") != -1)
            h.put(new Integer(s.indexOf("日")), "日");
        if (s.indexOf("时") != -1)
            h.put(new Integer(s.indexOf("时")), "时");
        if (s.indexOf("分") != -1)
            h.put(new Integer(s.indexOf("分")), "分");
        if (s.indexOf("秒") != -1)
            h.put(new Integer(s.indexOf("秒")), "秒");

        int i = 0;
        while (h.size() != 0) {
            Enumeration e = h.keys();
            int n = 0;
            while (e.hasMoreElements()) {
                i = ((Integer) e.nextElement()).intValue();
                if (i >= n)
                    n = i;
            }
            String temp = (String) h.get(new Integer(n));
            h.remove(new Integer(n));

            javaFormat = temp + javaFormat;
        }
        SimpleDateFormat df = new SimpleDateFormat(javaFormat);

        Date myDate = new Date();
        try {
            myDate = df.parse(strDate);
        } catch (Exception e) {
            // e.printStackTrace();
            return null;
        }

        return myDate;
    }
//    public static Date stringToDate(String strDate, String oracleFormat) {
//        if (strDate == null)
//            return null;
//        Hashtable<Integer, String> h = new Hashtable<Integer, String>();
//        String javaFormat = new String();
//        String s = oracleFormat.toLowerCase();
//        if (s.indexOf("yyyy") != -1)
//            h.put(new Integer(s.indexOf("yyyy")), "yyyy");
//        else if (s.indexOf("yy") != -1)
//            h.put(new Integer(s.indexOf("yy")), "yy");
//        if (s.indexOf("mm") != -1)
//            h.put(new Integer(s.indexOf("mm")), "MM");
//
//        if (s.indexOf("dd") != -1)
//            h.put(new Integer(s.indexOf("dd")), "dd");
//        if (s.indexOf("hh24") != -1)
//            h.put(new Integer(s.indexOf("hh24")), "HH");
//        if (s.indexOf("mi") != -1)
//            h.put(new Integer(s.indexOf("mi")), "mm");
//        if (s.indexOf("ss") != -1)
//            h.put(new Integer(s.indexOf("ss")), "ss");
//
//        int intStart = 0;
//        while (s.indexOf("-", intStart) != -1) {
//            intStart = s.indexOf("-", intStart);
//            h.put(new Integer(intStart), "-");
//            intStart++;
//        }
//
//        intStart = 0;
//        while (s.indexOf("/", intStart) != -1) {
//            intStart = s.indexOf("/", intStart);
//            h.put(new Integer(intStart), "/");
//            intStart++;
//        }
//
//        intStart = 0;
//        while (s.indexOf(" ", intStart) != -1) {
//            intStart = s.indexOf(" ", intStart);
//            h.put(new Integer(intStart), " ");
//            intStart++;
//        }
//
//        intStart = 0;
//        while (s.indexOf(":", intStart) != -1) {
//            intStart = s.indexOf(":", intStart);
//            h.put(new Integer(intStart), ":");
//            intStart++;
//        }
//
//        if (s.indexOf("å¹´") != -1)
//            h.put(new Integer(s.indexOf("å¹´")), "å¹´");
//        if (s.indexOf("月") != -1)
//            h.put(new Integer(s.indexOf("月")), "月");
//        if (s.indexOf("日") != -1)
//            h.put(new Integer(s.indexOf("日")), "日");
//        if (s.indexOf("时") != -1)
//            h.put(new Integer(s.indexOf("时")), "时");
//        if (s.indexOf("分") != -1)
//            h.put(new Integer(s.indexOf("分")), "分");
//        if (s.indexOf("秒") != -1)
//            h.put(new Integer(s.indexOf("秒")), "秒");
//
//        int i = 0;
//        while (h.size() != 0) {
//            Enumeration e = h.keys();
//            int n = 0;
//            while (e.hasMoreElements()) {
//                i = ((Integer) e.nextElement()).intValue();
//                if (i >= n)
//                    n = i;
//            }
//            String temp = (String) h.get(new Integer(n));
//            h.remove(new Integer(n));
//
//            javaFormat = temp + javaFormat;
//        }
//        SimpleDateFormat df = new SimpleDateFormat(javaFormat);
//
//        Date myDate = new Date();
//        try {
//            myDate = df.parse(strDate);
//        } catch (Exception e) {
//            // e.printStackTrace();
//            return null;
//        }
//
//        return myDate;
//    }

    public static Date StringToDate(String DATE1) {
        DateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@@ -3084,7 +3111,25 @@
        return cal.getTime();
    }

    /**
     * èŽ·å–某个时间X分钟后的时间
     * @param minutes
     * @param date
     * @return
     */
    public static Date afterMinutesByDate(Integer minutes,Date date){
        Calendar cal = Calendar.getInstance();
        cal.setTime(date);
        cal.add(Calendar.MINUTE,minutes);
        return cal.getTime();
    }

    public static Date afterDayByDate(Integer days,Date date){
        Calendar cal = Calendar.getInstance();
        cal.setTime(date);
        cal.add(Calendar.DATE,days);
        return cal.getTime();
    }
    /**
     * è®¡ç®—多少自然年/月/日后的日期
     * @param startDate å¼€å§‹æ—¥æœŸ
@@ -3157,7 +3202,8 @@


    public static void main(String[] args) throws Exception{
        System.out.println(DateUtil.getLongDateTime(new Date()));;
        System.out.println(DateUtil.StringToDate("2025-05-16 13:49:40").getTime());
//        System.out.println(DateUtil.getLongDateTime(new Date()));;
    }

    /**

 server/service/src/main/java/com/doumee/dao/business/dto/AcceptanceSettleClaimsDTO.java

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

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * å­˜å‚¨ è¡¥å……说明
 */
@Data
public class AcceptanceSettleClaimsDTO {

    @ApiModelProperty(value = "业务主键")
    private Integer id;

    @ApiModelProperty(value = "0=受理；1=拒绝受理；2=商议审批；3=商议不审批")
    private Integer status;

    @ApiModelProperty(value = "说明、备注")
    private String describe;

    @ApiModelProperty(value = "问题类型：多个用英文逗号隔开")
    private String syProblemOpts;

}

 server/service/src/main/java/com/doumee/dao/business/dto/CaseTypeDTO.java

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

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class CaseTypeDTO {

    @ApiModelProperty(value = "业务主键")
    private Integer id;

    @ApiModelProperty(value = "案件类型：1=医疗；2=伤残；3=死亡")
    private Integer caseType;


}

 server/service/src/main/java/com/doumee/dao/business/dto/CompensationDTO.java

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

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class CompensationDTO {

    @ApiModelProperty(value = "业务主键")
    private Integer id;


    @ApiModelProperty(value = "理赔金额json串")
    private String compensationJson;
}

 server/service/src/main/java/com/doumee/dao/business/dto/DiscussAuditDTO.java

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

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class DiscussAuditDTO {

    @ApiModelProperty(value = "业务主键")
    private Integer id;

    @ApiModelProperty(value = "0=审批通过；1=审批拒绝")
    private Integer status;

    @ApiModelProperty(value = "说明")
    private String describe;

}

 server/service/src/main/java/com/doumee/dao/business/dto/OptSettleClaimsDTO.java

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

import com.doumee.dao.business.model.Multifile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * å­˜å‚¨ è¡¥å……说明
 */
@Data
public class OptSettleClaimsDTO {

    @ApiModelProperty(value = "业务主键")
    private Integer id;

    @ApiModelProperty(value = "立案业务状态：3=立案；4=立案退回")
    private Integer registerStatus;

    @ApiModelProperty(value = "说明、备注")
    private String describe;

    @ApiModelProperty(value = "报案号")
    private String reportNum;

    @ApiModelProperty(value = "受理业务状态：9=受理；6=拒绝受理；")
    private Integer acceptanceStatus;
}

 server/service/src/main/java/com/doumee/dao/business/dto/PayCashDTO.java

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

import com.doumee.dao.business.model.Multifile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * å­˜å‚¨ è¡¥å……说明
 */
@Data
public class PayCashDTO {

    @ApiModelProperty(value = "业务主键")
    private Integer id;

    @ApiModelProperty(value = "说明、备注")
    private String describe;

    @ApiModelProperty(value = "打款图片")
    private List<Multifile> multifileList;

}

 server/service/src/main/java/com/doumee/dao/business/dto/RiskConfigDTO.java

@@ -26,7 +26,7 @@
    @ApiModelProperty(value = "风险提醒设置-索赔次数", example = "1")
    private String riskClaimTimes;
    @ApiModelProperty(value = "风险提醒设置-新员工出险提醒是否开启：0=否；1=是;", example = "1")
    private String riskNewMemberOepn;
    private String riskNewMemberOpen;
    @ApiModelProperty(value = "风险提醒设置-新员工出险提醒时间单位：0分钟 1小时 2天", example = "1")
    private String riskNewMemberTimeUnit;
    @ApiModelProperty(value = "风险提醒设置-新员工出险提醒时间", example = "1")

 server/service/src/main/java/com/doumee/dao/business/dto/SaveSupplementDescribeDTO.java

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

import com.doumee.dao.business.model.Multifile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * å­˜å‚¨ è¡¥å……说明
 */
@Data
public class SaveSupplementDescribeDTO {

    @ApiModelProperty(value = "业务主键")
    private Integer id;

    @ApiModelProperty(value = "补充说明")
    private String describe;

    @ApiModelProperty(value = "补充说明文件")
    private List<Multifile> supplementFileList;



}

 server/service/src/main/java/com/doumee/dao/business/dto/SettleClaimsDTO.java

@@ -23,6 +23,12 @@
    @ApiModelProperty(value = "出险人")
    private Integer memberId;

    @ApiModelProperty(value = "投保申请编码", example = "1")
    private Integer insuranceApplyId;

    @ApiModelProperty(value = "投保申请明细编码", example = "1")
    private Integer applyDetailId;

    @ApiModelProperty(value = "出险人")
    private String idcardNo;


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

@@ -106,8 +106,8 @@
    @ExcelColumn(name="单号")
    private String code;

    @ApiModelProperty(value = "状态 å¼ƒç”¨(0待受理（处理中） 1退回受理（已撤案）2受理中  3确认资料（处理中） 4完成受理（已结案）) 5待受理 6受理退回 7待商议 8商议待审批 9商议审批拒绝 10已受理", example = "1")
    @ExcelColumn(name="状态 0待受理（处理中） 1退回受理（已撤案） 2确认资料（处理中） 3完成受理（已结案）")
    @ApiModelProperty(value = "状态 0暂存中 1已报案 2待立案 3已立案 4立案退回 5待受理 6拒绝受理 7商议待审批 8商议审批拒绝 9已受理 10待核赔  11已核赔 12待结案 13已结案 14已撤案", example = "1")
    @ExcelColumn(name="状态 0暂存中 1已报案 2待立案 3已立案 4立案退回 5待受理 6拒绝受理 7商议待审批 8商议审批拒绝 9已受理 10待核赔  11已核赔 12待结案 13已结案 14已撤案")
    private Integer status;

    @ApiModelProperty(value = "事故类型 0工作期间受伤 1上下班途中受伤 2非工作时间受伤 3意外受伤", example = "1")
@@ -177,37 +177,37 @@
    private String shouliType;
    @ApiModelProperty(value = "理赔来源 0企业 1平台录入 2其他 ")
    @ExcelColumn(name="理赔来源 0企业 1平台录入 2其他")
    private Integer origin;
    private String origin;
    @ApiModelProperty(value = "受理商议问题 0资料缺失，1延迟报案 2超职业类别 3其他（多个用英文逗号隔开）")
    @ExcelColumn(name="受理商议问题 0资料缺失，1延迟报案 2超职业类别 3其他（多个用英文逗号隔开）")
    private String syProblemOpts;
    @ApiModelProperty(value = "是否风险案件 0否 1是")
    @ExcelColumn(name="是否风险案件 0否 1是")
    private String isRisk;
    private Integer isRisk;
    @ApiModelProperty(value = "是否多次出险风险 0否1是 ")
    @ExcelColumn(name="是否多次出险风险 0否1是 ")
    private String riskTimesCx;
    private Integer riskTimesCx;
    @ApiModelProperty(value = "是否疑似重复报案风险 0否1是 ")
    @ExcelColumn(name="是否疑似重复报案风险 0否1是 ")
    private String riskRepeat;
    private Integer riskRepeat;
    @ApiModelProperty(value = "是否索赔多次过多风险 0否1是")
    @ExcelColumn(name="是否索赔多次过多风险 0否1是")
    private String riskTimesSp;
    private Integer riskTimesSp;
    @ApiModelProperty(value = "是否新员工出险风险 0否1是")
    @ExcelColumn(name="是否新员工出险风险 0否1是")
    private String riskNewUser    ;
    private Integer riskNewUser    ;
    @ApiModelProperty(value = "设计敏感词，多个英文逗号隔开")
    @ExcelColumn(name="设计敏感词，多个英文逗号隔开")
    private String riskSensitive;
    @ApiModelProperty(value = "报案号设置状态 0未设置 1已设置 2已修改")
    @ExcelColumn(name="报案号设置状态 0未设置 1已设置 2已修改")
    private String reportNumStatus;
    private Integer reportNumStatus;
    @ApiModelProperty(value = "所有赔付项信息（json数组[{name:“伙食费”,val:100,info:“伙食费说明”,type:0}]）,type:0主要赔付项 1其他赔付项 2定损方案费用\t")
    @ExcelColumn(name="所有赔付项信息")
    private String accountContent;
    @ApiModelProperty(value = "其他赔付项总额")
    @ExcelColumn(name="其他赔付项总额")
    private String otherAccount;
    private BigDecimal otherAccount;
    @ApiModelProperty(value = "是否可赔付医保外用药")
    @ExcelColumn(name="是否可赔付医保外用药")
    private String payForYbwyy;
@@ -227,10 +227,19 @@
    @ExcelColumn(name="收款账户")
    private String receiveAccount;

    @ApiModelProperty(value = "风险信息集合")
    private String riskContent;


    @ApiModelProperty(value = "是否待补充材料:0=否；1=是")
    private Integer waitSupplement;


    @ApiModelProperty(value = "费用是否发生变更:0=否；1=是；")
    private Integer feeUpdate;

    @ApiModelProperty(value = "案件类型：0=未设置；1=医疗；2=伤残；3=死亡")
    private Integer caseType;

    @ApiModelProperty(value = "保险单附件")
    @TableField(exist = false)
@@ -259,6 +268,12 @@
    @TableField(exist = false)
    private List<Multifile> compensationFileList;


    @ApiModelProperty(value = "其他资料")
    @TableField(exist = false)
    private List<Multifile> otherFileList;


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

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

@@ -158,8 +158,8 @@
    @ApiModelProperty(value = "风险设置-允许对新员工已投保未生效保险进行保障 0不允许 1允许")
    @ExcelColumn(name="风险设置-允许对新员工已投保未生效保险进行保障 0不允许 1允许")
    private Integer riskNewUserStatus;
    @ApiModelProperty(value = "风险设置-允许新员工出险时间提前时间单位 0分钟 1小时 2天")
    @ExcelColumn(name="风险设置-允许新员工出险时间提前时间单位 0分钟 1小时 2天")
    @ApiModelProperty(value = "风险设置-允许新员工出险时间提前时间单位 1小时 2天")
    @ExcelColumn(name="风险设置-允许新员工出险时间提前时间单位 1小时 2天")
    private Integer riskNewUserUnit;
    @ApiModelProperty(value = "风险设置-允许新员工出险时间提前时间")
    @ExcelColumn(name="风险设置-允许新员工出险时间提前时间")

 server/service/src/main/java/com/doumee/dao/business/vo/CompensationVO.java

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

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * å­˜å‚¨ è¡¥å……说明
 */
@Data
public class CompensationVO {

    @ApiModelProperty(value = "赔付类型：1=主要赔付项；2=其他赔付项")
    private Integer type;

    @ApiModelProperty(value = "赔付项")
    private String name;

    @ApiModelProperty(value = "费用说明")
    private String describe;

    @ApiModelProperty(value = "赔付费用")
    private BigDecimal fee;


}

 server/service/src/main/java/com/doumee/dao/business/vo/RiskConfigVO.java

@@ -19,7 +19,7 @@
    private String riskTimesReportTimes;
    @ApiModelProperty(value = "风险提醒设置-重复报案是否开启：0=否；1=是", example = "1")
    private String riskRepeatReportOpen;
    @ApiModelProperty(value = "风险提醒设置-重复报案时间单位：0分钟 1小时 2天", example = "1")
    @ApiModelProperty(value = "风险提醒设置-重复报案时间单位：1小时 2天", example = "1")
    private String riskRepeatReportTimeUnit;
    @ApiModelProperty(value = "风险提醒设置-重复报案时间", example = "1")
    private String riskRepeatReportTime;
@@ -28,8 +28,8 @@
    @ApiModelProperty(value = "风险提醒设置-索赔次数", example = "1")
    private String riskClaimTimes;
    @ApiModelProperty(value = "风险提醒设置-新员工出险提醒是否开启：0=否；1=是;", example = "1")
    private String riskNewMemberOepn;
    @ApiModelProperty(value = "风险提醒设置-新员工出险提醒时间单位：0分钟 1小时 2天", example = "1")
    private String riskNewMemberOpen;
    @ApiModelProperty(value = "风险提醒设置-新员工出险提醒时间单位：1小时 2天", example = "1")
    private String riskNewMemberTimeUnit;
    @ApiModelProperty(value = "风险提醒设置-新员工出险提醒时间", example = "1")
    private String riskNewMemberTime;

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

@@ -107,4 +107,6 @@
     * @return
     */
    List<ApplyDetail> getMemberApplyList(Integer memberId);

    List<ApplyDetail> getMemberSettleClaimsList(Integer memberId);
}

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

@@ -2,8 +2,10 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.dto.SCSupplementDTO;
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.model.SettleClaims;
import com.doumee.dao.business.vo.CompensationVO;
import com.doumee.service.system.impl.SystemDictDataServiceImpl;
import io.swagger.models.auth.In;

import javax.servlet.http.HttpServletResponse;
@@ -132,4 +134,107 @@
    Integer delFile(Integer id, Integer fileId);

    Integer createSys(SettleClaims settleClaims);


    /************************************************************************新业务******************************************************************************************/

    /**
     * ä¼ä¸šæŠ¥æ¡ˆæäº¤
     * @param settleClaimsDTO
     * @param systemDictDataService
     */
    void saveSettleClaims(SettleClaimsDTO settleClaimsDTO, SystemDictDataServiceImpl systemDictDataService);


    /**
     * è¡¥å……说明
     * å¹³å°ç«¯ä½¿ç”¨
     * @param dto
     */
    void saveSupplementDescribe(SaveSupplementDescribeDTO dto);


    /**
     * æ·»åŠ è¡¥å……材料
     * @param dto
     */
    void saveSupplementFile(SaveSupplementDescribeDTO dto);


    /**
     * æ’¤é”€æŠ¥æ¡ˆ
     * @param dto
     */
    void returnSettle(OptSettleClaimsDTO dto);

    /**
     * å¹³å°ç«‹æ¡ˆæˆ–退回
     * @param dto
     */
    void register(OptSettleClaimsDTO dto);

    /**
     * æ·»åŠ æŠ¥æ¡ˆå·
     * @param param
     * @return
     */
    Integer addReportNum(OptSettleClaimsDTO param);

    /**
     * æ·»åŠ å¤‡æ³¨
     * @param param
     * @return
     */
    Integer addRemark(OptSettleClaimsDTO param);

    /**
     * å—理业务
     * @param dto
     */
    void acceptance(AcceptanceSettleClaimsDTO dto);


    /**
     * ç†èµ”金额项
     * @param id
     * @return
     */
    List<CompensationVO> getCompensation(Integer id);

    /**
     * ç†èµ”业务
     * @param dto
     */
    void compensation(CompensationDTO dto);

    /**
     * å•†è®®å®¡æ‰¹
     * @param dto
     */
    void discussAudit(DiscussAuditDTO dto);


    /**
     * å¹³å°æ ¸èµ”
     * @param dto
     */
    void nuclearCompensation(CompensationDTO dto);

    /**
     * ä¿®æ”¹é‡‘额
     * @param dto
     */
    void updFee(CompensationDTO dto);

    /**
     * å®¢æˆ·ç¡®è®¤é‡‘额
     * @param id
     */
    void confirmFee(Integer id);

    /**
     * ä¿®æ”¹æ¡ˆä»¶ç±»åž‹
     * @param dto
     */
    void updCaseType(CaseTypeDTO dto);
}

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

@@ -1200,6 +1200,14 @@
        List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
        //加保数据
        List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
        //换厂业务
        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
        
        if(CollectionUtils.isEmpty(delDetailList)
        && CollectionUtils.isEmpty(addDetailList)
                && CollectionUtils.isEmpty(changeDetailList)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未添加人员数据无法进行提交");
        }

        if (CollectionUtils.isNotEmpty(addDetailList)) {
            if(Objects.isNull(solutions.getCanAdd()) || solutions.getCanAdd().equals(Constants.ZERO)){
@@ -1238,7 +1246,6 @@
        }

        //换厂业务
        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
        if (CollectionUtils.isNotEmpty(changeDetailList)) {
            if(Objects.isNull(solutions.getCanChangeUnit()) || solutions.getCanChangeUnit().equals(Constants.ZERO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该保险方案无法进行换厂操作");
@@ -1358,6 +1365,7 @@
            }
            //查询员工是在主单下 æ˜¯å¦å­˜åœ¨ç”Ÿæ•ˆä¸­çš„数据
            List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
                            .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
//                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
@@ -1616,6 +1624,7 @@
            }
            //查询员工是在主单下 æ˜¯å¦å­˜åœ¨ç”Ÿæ•ˆä¸­çš„数据
            List<ApplyDetail>  applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
                    .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))

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

@@ -2,6 +2,7 @@

import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -18,6 +19,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -215,6 +217,7 @@
        queryWrapper.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId);
        queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
        queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
        queryWrapper.eq(ApplyDetail::getIsdeleted,Constants.ZERO);

        ApplyDetailPageDTO applyDetailPageDTO = pageWrap.getModel();

@@ -366,6 +369,37 @@
    }


    /**
     * æŸ¥è¯¢äººå‘˜å¯æŠ¥æ¡ˆæ•°æ®
     * @param memberId
     * @return
     */
    @Override
    public List<ApplyDetail> getMemberSettleClaimsList(Integer memberId){
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        List<ApplyDetail>  applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,
                new MPJLambdaWrapper<ApplyDetail>()
                        .selectAll(ApplyDetail.class)
                        .selectAs(InsuranceApply::getCode,ApplyDetail::getApplyCode)
                        .selectAs(InsuranceApply::getStartTime,ApplyDetail::getParentStartTime)
                        .selectAs(InsuranceApply::getEndTime,ApplyDetail::getParentEndTime)
                        .selectAs(Company::getName,ApplyDetail::getCompanyName)
                        .selectAs(Solutions::getName,ApplyDetail::getSolutionName)
                        .selectAs(Worktype::getName,ApplyDetail::getWorkTypeName)
                        .selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
                        .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                        .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
                        .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
                        .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),
                                Constants.InsuranceApplyStatus.WTB_DONE.getKey())
                        .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                        .eq(InsuranceApply::getCompanyId,user.getCompanyId())
                        .eq(ApplyDetail::getMemberId,memberId)
        );
        return applyDetailList;
    }


}

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

@@ -3776,6 +3776,11 @@
        return applyPowerVO;
    }






}



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

@@ -7,7 +7,9 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.AreasMapper;
import com.doumee.dao.business.KnowledgeMapper;
import com.doumee.dao.business.model.Areas;
import com.doumee.dao.business.model.Knowledge;
import com.doumee.service.business.KnowledgeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -35,15 +37,16 @@
    @Autowired
    private KnowledgeMapper knowledgeMapper;

    @Autowired
    private AreasMapper areasMapper;

    @Override
    public Integer create(Knowledge knowledge) {
        LoginUserInfo user= (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Objects.isNull(knowledge)
        || StringUtils.isBlank(knowledge.getTitle())
                || StringUtils.isBlank(knowledge.getLink())
//                || StringUtils.isBlank(knowledge.getCityName())
//                || Objects.isNull(knowledge.getCityId())
                || StringUtils.isBlank(knowledge.getProvinceName())
                || Objects.isNull(knowledge.getProvinceId())
                || StringUtils.isBlank(knowledge.getYearInfo())
                || StringUtils.isBlank(knowledge.getTitle())
@@ -53,6 +56,18 @@
        }
        if(knowledge.getLabels().split(",").length>10){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"标签数最多添加十个");
        }
        Areas province = areasMapper.selectById(knowledge.getProvinceId());
        if(Objects.isNull(province)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"省份信息错误");
        }
        knowledge.setProvinceName(province.getName());
        if(Objects.nonNull(knowledge.getCityId())){
            Areas city = areasMapper.selectById(knowledge.getCityId());
            if(Objects.isNull(city)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"市区信息错误");
            }
            knowledge.setCityName(city.getName());
        }
        knowledge.setIsdeleted(Constants.ZERO);
        knowledge.setCreateDate(new Date());
@@ -88,8 +103,6 @@
                || Objects.isNull(knowledge.getId())
                || StringUtils.isBlank(knowledge.getTitle())
                || StringUtils.isBlank(knowledge.getLink())
                || StringUtils.isBlank(knowledge.getProvinceName())
//                || StringUtils.isBlank(knowledge.getCityName())
//                || Objects.isNull(knowledge.getCityId())
                || Objects.isNull(knowledge.getProvinceId())
                || StringUtils.isBlank(knowledge.getYearInfo())
@@ -101,6 +114,18 @@
        if(knowledge.getLabels().split(",").length>10){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"标签数最多添加十个");
        }
        Areas province = areasMapper.selectById(knowledge.getProvinceId());
        if(Objects.isNull(province)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"省份信息错误");
        }
        knowledge.setProvinceName(province.getName());
        if(Objects.nonNull(knowledge.getCityId())){
            Areas city = areasMapper.selectById(knowledge.getCityId());
            if(Objects.isNull(city)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"市区信息错误");
            }
            knowledge.setCityName(city.getName());
        }
        knowledge.setEditDate(new Date());
        knowledge.setEditor(user.getId());
        knowledgeMapper.updateById(knowledge);

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

@@ -42,9 +42,14 @@
        || StringUtils.isEmpty(labels.getName())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(labelsMapper.selectCount(new QueryWrapper<Labels>().lambda().eq(Labels::getIsdeleted,Constants.ZERO).eq(Labels::getStatus,Constants.ZERO))>=5){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，最多配置50个标签~");
        }
        labelsMapper.delete(new QueryWrapper<Labels>().lambda().eq(Labels::getName,labels.getName()));
        labels.setCreateDate(new Date());
        labels.setCreator(user.getId());
        labels.setStatus(Constants.ZERO);
        labels.setIsdeleted(Constants.ZERO);
        labelsMapper.insert(labels);
        return labels.getId();
    }

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

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
@@ -8,16 +9,16 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.NoticesMapper;
import com.doumee.dao.business.SettleClaimsLogMapper;
import com.doumee.dao.business.SettleClaimsMapper;
import com.doumee.dao.business.dto.SCSupplementDTO;
import com.doumee.dao.business.dto.SettleClaimsDTO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.join.MultifileJoinMapper;
import com.doumee.dao.business.join.SettleClaimsJoinMapper;
import com.doumee.dao.business.join.SettleClaimsLogJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.CompensationVO;
import com.doumee.dao.business.vo.RiskConfigVO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SettleClaimsLogService;
import com.doumee.service.business.SettleClaimsService;
@@ -25,6 +26,7 @@
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.doumee.service.system.impl.SystemDictDataServiceImpl;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.ApiModelProperty;
@@ -32,15 +34,18 @@
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.util.*;
@@ -73,6 +78,19 @@

    @Autowired
    private NoticesMapper noticesMapper;

    @Autowired
    private InsuranceApplyMapper insuranceApplyMapper;

    @Autowired
    private SolutionsMapper solutionsMapper;

    @Autowired
    private SolutionsBaseMapper solutionsBaseMapper;

    @Autowired
    private ApplyDetailMapper applyDetailMapper;

    /**
     * åˆ é™¤é™„件
     * @return
@@ -355,8 +373,9 @@
        SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        settleClaimsLogMapper.insert(log);
        return  1;

    }


    @Override
    public Integer createSys(SettleClaims settleClaims) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -612,6 +631,8 @@
            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()));

            settleClaims.setOtherFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_OTHER_FILE.getKey())).collect(Collectors.toList()));
        }

        //查询操作记录
@@ -755,7 +776,6 @@
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }

        SettleClaims settleClaims  = settleClaimsMapper.selectById(scSupplementDTO.getId());
        if(!(settleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())
                || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.DEAL_ING.getKey())
@@ -1005,7 +1025,9 @@
    }


    public void saveSettleClaims(SettleClaimsDTO settleClaimsDTO){
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void saveSettleClaims(SettleClaimsDTO settleClaimsDTO,SystemDictDataServiceImpl systemDictDataService){
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业员工无法进行该操作");
@@ -1014,6 +1036,7 @@
            || Objects.isNull(settleClaimsDTO.getSaveType())
            || Objects.isNull(settleClaimsDTO.getMemberId())
            ||StringUtils.isBlank(settleClaimsDTO.getIdcardNo())
            || Objects.isNull(settleClaimsDTO.getInsuranceApplyId())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
@@ -1038,9 +1061,17 @@
        }
        SettleClaims settleClaims = new SettleClaims();
        BeanUtils.copyProperties(settleClaimsDTO,settleClaims);
        settleClaims.setReportNumStatus(Constants.ZERO);
        if(Objects.nonNull(settleClaims.getId())){
            settleClaims.setEditDate(new Date());
            settleClaims.setEditor(loginUserInfo.getId());
            settleClaims.setStatus(Constants.equalsInteger(settleClaimsDTO.getSaveType(),Constants.ONE)?
                    Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey():Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey());
            if(Constants.equalsInteger(settleClaimsDTO.getSaveType(),Constants.ONE)){
                //处理风险信息
                this.saveRisk(settleClaims,settleClaimsDTO,systemDictDataService);
            }

            settleClaimsMapper.updateById(settleClaims);
        }else{
            settleClaims.setCreateDate(new Date());
@@ -1048,15 +1079,207 @@
            settleClaims.setCompanyId(loginUserInfo.getCompanyId());
            settleClaims.setStatus(Constants.equalsInteger(settleClaimsDTO.getSaveType(),Constants.ONE)?
                    Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey():Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey());
            if(Constants.equalsInteger(settleClaimsDTO.getSaveType(),Constants.ONE)){
                //处理风险信息
                this.saveRisk(settleClaims,settleClaimsDTO,systemDictDataService);
            }
            settleClaims.setCreator(loginUserInfo.getId());
            settleClaims.setCheckUserId(loginUserInfo.getId());
            settleClaimsMapper.insert(settleClaims);
        }
        this.saveFile(settleClaims,settleClaimsDTO,loginUserInfo);


        //记录日志
        this.saveSettleClaimsLog(settleClaims,Constants.SettleClaimsLogType.UPLOAD,null);
    }

    public void saveRisk(SettleClaims settleClaims, SettleClaimsDTO settleClaimsDTO, SystemDictDataServiceImpl systemDictDataService){
        //根据保单信息 æŸ¥è¯¢å‡ºä¸»æ–¹æ¡ˆ
        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(settleClaims.getInsuranceApplyId());
        if(Objects.isNull(insuranceApply)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到保单数据");
        }
        Date happenTime = DateUtil.StringToDate(settleClaims.getHappenTime());
        if(happenTime.getTime() < insuranceApply.getStartTime().getTime() || happenTime.getTime() > insuranceApply.getEndTime().getTime()){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"事故发生事件未在保单生效范围内");
        }
        Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
        if(Objects.isNull(solutions)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到子方案信息");
        }
        SolutionsBase solutionsBase = solutionsBaseMapper.selectById(solutions.getParentId());
        if(Objects.isNull(solutionsBase)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到主方案信息");
        }
        List<Map<String,String>> riskList = new ArrayList<>();
        //查询保单明细数据
        ApplyDetail applyDetail = applyDetailMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,settleClaims.getInsuranceApplyId()).eq(ApplyDetail::getId,settleClaimsDTO.getApplyDetailId()).last("limit 1 "));
        //是否开启 æ–°å‘˜å·¥æŠ¥æ¡ˆ 0不允许 1允许
        if(Constants.equalsInteger(solutionsBase.getRiskNewUserStatus(),Constants.ONE)
                && Objects.nonNull(solutionsBase.getRiskNewUserUnit())
                && Objects.nonNull(solutionsBase.getRiskNewUserTime())
        ){
            if(happenTime.getTime() > applyDetail.getEndTime().getTime()){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"事故发生时间未在人员保障日期范围内");
            }
            Map<String,String> map = new HashMap<>();
            map.put("title","保单已投保未生效");
            Date startDate = applyDetail.getStartTime();
            if(Constants.equalsInteger(solutionsBase.getRiskNewUserUnit(),Constants.ONE)){
                startDate = DateUtil.afterMinutesByDate(-solutionsBase.getRiskNewUserTime()*60,startDate);
            }else if(Constants.equalsInteger(solutionsBase.getRiskNewUserUnit(),Constants.TWO)){
                startDate = DateUtil.afterDayByDate(-solutionsBase.getRiskNewUserTime(),happenTime);
            }else{
                if(happenTime.getTime() < applyDetail.getStartTime().getTime() || happenTime.getTime() > applyDetail.getEndTime().getTime()){
                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"事故发生时间未在人员保障日期范围内");
                }
            }
            if(happenTime.getTime() < startDate.getTime() ){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"事故发生时间未在人员保障日期范围内");
            }else{
                map.put("info","事故发生时间早于保单生效时间"+solutionsBase.getRiskNewUserUnit()+(Constants.equalsInteger(solutionsBase.getRiskNewUserUnit(),Constants.ONE)?"小时内":"天内"));
                riskList.add(map);
            }
        }else{
            if(happenTime.getTime() < applyDetail.getStartTime().getTime() || happenTime.getTime() > applyDetail.getEndTime().getTime()){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"事故发生时间未在人员保障日期范围内");
            }
        }

        //是否开启 å»¶è¿ŸæŠ¥æ¡ˆæé†’是否开启 0不允许 1允许
        if(Constants.equalsInteger(solutionsBase.getRiskDelayStatus(),Constants.ONE)){
            Map<String,String> map = new HashMap<>();
            map.put("title","延迟报案提醒");
            //根据配置 æŸ¥è¯¢ å»¶è¿ŸæŠ¥æ¡ˆæé†’时间单位 0分钟 1小时 2天
            if(Constants.equalsInteger(solutionsBase.getRiskDelayUnit(),Constants.ZERO)){
                if(DateUtil.getBetweenMin(happenTime,new Date())>solutionsBase.getRiskDelayTime()){
                    map.put("info","报案时间超过案发时间"+solutionsBase.getRiskDelayUnit()+"分钟");
                    riskList.add(map);
                }
            }else if(Constants.equalsInteger(solutionsBase.getRiskDelayUnit(),Constants.ONE)){
                if(DateUtil.getBetweenHours(happenTime,new Date())>solutionsBase.getRiskDelayTime()){
                    map.put("info","报案时间超过案发时间"+solutionsBase.getRiskDelayUnit()+"小时");
                    riskList.add(map);
                }
            }else if(Constants.equalsInteger(solutionsBase.getRiskDelayUnit(),Constants.TWO)){
                if(DateUtil.getBetweenDay(happenTime,new Date())>solutionsBase.getRiskDelayTime()){
                    map.put("info","报案时间超过案发时间"+solutionsBase.getRiskDelayUnit()+"天");
                    riskList.add(map);
                }
            }
        }

        //查询字典值配置信息
        RiskConfigVO riskConfigVO = systemDictDataService.getRiskConfig();
        //多次出险提醒
        if(StringUtils.isNotBlank(riskConfigVO.getRiskTimesOpen()) && StringUtils.equals(riskConfigVO.getRiskTimesOpen(),Constants.ONE+"")
            && StringUtils.isNotBlank(riskConfigVO.getRiskTimesReportTimes())){
            Integer cxcs = settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda()
                    .eq(SettleClaims::getMemberId,settleClaimsDTO.getMemberId())
                    .ne(Objects.nonNull(settleClaims.getId()),SettleClaims::getId,settleClaims.getId())
                    .apply(" HAPPEN_TIME > DATE_SUB(now(), INTERVAL 365 DAY)  ")
            );
            if(cxcs>Integer.valueOf(riskConfigVO.getRiskTimesReportTimes())){
                Map<String,String> map = new HashMap<>();
                map.put("title","疑似多次出险");
                map.put("info","出险人一年内已出险"+cxcs+"次");
                riskList.add(map);
                settleClaims.setRiskTimesCx(Constants.ONE);
            };
        }
        //疑似重复报案
        if(StringUtils.isNotBlank(riskConfigVO.getRiskRepeatReportOpen())
                && StringUtils.equals(riskConfigVO.getRiskRepeatReportOpen(),Constants.ONE+"")
                && StringUtils.isNotBlank(riskConfigVO.getRiskRepeatReportTimeUnit())
                && StringUtils.isNotBlank(riskConfigVO.getRiskRepeatReportTime())){
            Integer cxcs = settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda()
                    .eq(SettleClaims::getMemberId,settleClaimsDTO.getMemberId())
                    .ne(Objects.nonNull(settleClaims.getId()),SettleClaims::getId,settleClaims.getId())
                    .apply(riskConfigVO.getRiskRepeatReportTimeUnit().equals("1")," HAPPEN_TIME > DATE_SUB(now(), INTERVAL "+riskConfigVO.getRiskRepeatReportTime()+" HOUR)  ")
                    .apply(riskConfigVO.getRiskRepeatReportTimeUnit().equals("2")," HAPPEN_TIME > DATE_SUB(now(), INTERVAL "+riskConfigVO.getRiskRepeatReportTime()+" DAY)  ")
            );
            if(cxcs > Constants.TWO){
                Map<String,String> map = new HashMap<>();
                map.put("title","疑似重复报案");
                map.put("info","该出险人在"+riskConfigVO.getRiskRepeatReportTime()+(riskConfigVO.getRiskRepeatReportTimeUnit().equals("1")?"小时":"天")+"内已报案"+cxcs+"次");
                riskList.add(map);
                settleClaims.setRiskRepeat(Constants.ONE);
            }
        }


        //索赔次数过多提醒
        if(StringUtils.isNotBlank(riskConfigVO.getRiskClaimTimesOpen())
                && StringUtils.equals(riskConfigVO.getRiskClaimTimesOpen(),Constants.ONE+"")
                && StringUtils.isNotBlank(riskConfigVO.getRiskClaimTimes())){
            Integer cxcs = settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda()
                    .eq(SettleClaims::getInsuranceApplyId,settleClaimsDTO.getInsuranceApplyId())
                    .ne(Objects.nonNull(settleClaims.getId()),SettleClaims::getId,settleClaims.getId())
                    .apply(" HAPPEN_TIME > DATE_SUB(now(), INTERVAL 365 DAY)  ")
            );
            if(cxcs > Integer.valueOf(riskConfigVO.getRiskClaimTimes())){
                Map<String,String> map = new HashMap<>();
                map.put("title","该保单索赔次数过多");
                map.put("info","累计索赔次数已到达"+cxcs+"次");
                riskList.add(map);
                settleClaims.setRiskTimesSp(Constants.ONE);
            }
        }

        //设计敏感词汇
        if(StringUtils.isNotBlank(riskConfigVO.getRiskSensitiveWordsOpen())
                && StringUtils.equals(riskConfigVO.getRiskSensitiveWordsOpen(),Constants.ONE+"")
                && StringUtils.isNotBlank(riskConfigVO.getRiskSensitiveWords())){
            String [] words = riskConfigVO.getRiskSensitiveWords().split(",");
            String sensitiveWord = ""; 
            for (String word:words) {
                if(settleClaims.getContent().indexOf(word)>=Constants.ZERO){
                    if(Constants.equalsInteger(sensitiveWord.length(),Constants.ZERO)){
                        sensitiveWord = word;
                    }else{
                        sensitiveWord = sensitiveWord + "、" + word ;
                    }
                } 
            }
            if(!Constants.equalsInteger(sensitiveWord.length(),Constants.ZERO)){
                Map<String,String> map = new HashMap<>();
                map.put("title","涉及敏感词");
                map.put("info","检测到敏感词："+sensitiveWord);
                riskList.add(map);
                settleClaims.setRiskSensitive(sensitiveWord);
            }
        }
        //疑似新员工出险
        if(StringUtils.isNotBlank(riskConfigVO.getRiskNewMemberOpen())
                && StringUtils.equals(riskConfigVO.getRiskNewMemberOpen(),Constants.ONE+"")
                && StringUtils.isNotBlank(riskConfigVO.getRiskNewMemberTimeUnit())
                && StringUtils.isNotBlank(riskConfigVO.getRiskNewMemberTime())
        ){
            Map<String,String> map = new HashMap<>();
            map.put("title","疑似新员工出险");
            if(riskConfigVO.getRiskNewMemberTimeUnit().equals(Constants.ONE+"")){
                if(DateUtil.afterMinutesByDate(Integer.valueOf(riskConfigVO.getRiskNewMemberTime())*60,insuranceApply.getStartTime()).getTime() < happenTime.getTime()){
                    map.put("info","保险生效时间为"+DateUtil.getFomartDate(insuranceApply.getStartTime(),"yyyy-MM-dd")+"");
                    riskList.add(map);
                    settleClaims.setRiskNewUser(Constants.ONE);
                };

            }else if(Constants.equalsInteger(solutionsBase.getRiskDelayUnit(),Constants.TWO)){
                if(DateUtil.afterDayByDate(Integer.valueOf(riskConfigVO.getRiskNewMemberTime()),insuranceApply.getStartTime()).getTime() < happenTime.getTime()){
                    map.put("info","保险生效时间为"+DateUtil.getFomartDate(insuranceApply.getStartTime(),"yyyy-MM-dd")+"");
                    riskList.add(map);
                    settleClaims.setRiskNewUser(Constants.ONE);
                }
            } 
        }
        settleClaims.setRiskContent(JSONObject.toJSONString(riskList));
        if(riskList.size()>Constants.ZERO){
            settleClaims.setIsRisk(Constants.ONE);
        }else{
            settleClaims.setIsRisk(Constants.ZERO);
            settleClaims.setStatus(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey());
        }
    }

    public void saveFile(SettleClaims settleClaims,SettleClaimsDTO settleClaimsDTO,LoginUserInfo loginUserInfo){
        multifileJoinMapper.delete(new QueryWrapper<Multifile>().lambda()
@@ -1189,13 +1412,669 @@
                multifileJoinMapper.insert(multifile);
            }
        }
    }

//    public void getRiskSettleDetail(Integer id){
//        settleClaimsJoinMapper.selectJoinOne(SettleClaims.class,new MPJLambdaWrapper<SettleClaims>()
//                .selectAll(SettleClaims.class)
//                .selectAs(DispatchUnit::getName,SettleClaims::getDuName)
//                .selectAs(Worktype::getName,SettleClaims::getWorktypeName)
//                .selectAs(Solutions::getName,SettleClaims::getSolutionName)
//                .selectAs(InsuranceApply::getStartTime,SettleClaims::getBaoxianStartTime)
//                .selectAs(InsuranceApply::getEndTime,SettleClaims::getBaoxianEndTime)
//                .leftJoin(Solutions.class,Solutions::getId,SettleClaims::getSolutionId)
//                .leftJoin(DispatchUnit.class,DispatchUnit::getId,SettleClaims::getDuId)
//                .leftJoin(Worktype.class,Worktype::getId,SettleClaims::getWorktypeId)
//                .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
//
//
//                .eq(SettleClaims::getId,id)
//                .last(" limit 1 ")
//        );
//    }

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void saveSupplementDescribe(SaveSupplementDescribeDTO dto){
        if(Objects.isNull(dto)
                || Objects.isNull(dto.getId())
            || Objects.isNull(dto.getDescribe())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(Constants.SettleClaimsStatus.ACCEPTANCE.getKey(),settleClaims.getStatus())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }
        if(Constants.equalsInteger(settleClaims.getWaitSupplement(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"待企业补充文件，请等待企业补充文件");
        }
        //存储日志
        this.saveSettleClaimsLog(settleClaims,Constants.SettleClaimsLogType.SUPPLEMENT_DESCRIBE,dto.getDescribe());
        settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime()).set(SettleClaims::getWaitSupplement,Constants.ONE));
    }

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void saveSupplementFile(SaveSupplementDescribeDTO dto){
        if(Objects.isNull(dto)
                || Objects.isNull(dto.getId())
                || CollectionUtils.isEmpty(dto.getSupplementFileList())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!(loginUserInfo.getType().equals(Constants.ZERO)||loginUserInfo.getType().equals(Constants.ONE))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非平台与企业员工无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(loginUserInfo.getType().equals(Constants.ZERO)){
            if(!(Constants.equalsInteger(Constants.SettleClaimsStatus.ACCEPTANCE.getKey(),settleClaims.getStatus())
                    || Constants.equalsInteger(Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION.getKey(),settleClaims.getStatus())
            )){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
            }
        }else{
            //如果是企业 æŸ¥è¯¢æ˜¯å¦æ˜¯è‡ªå·±ä¼ä¸šçš„数据
            if(!Constants.equalsInteger(settleClaims.getCompanyId(),loginUserInfo.getCompanyId())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您企业的数据，您无法进行该操作");
            }
            if(!Constants.equalsInteger(settleClaims.getWaitSupplement(),Constants.ONE)) {
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "当前业务无需进行添加材料");
            }
            if(!(Constants.equalsInteger(Constants.SettleClaimsStatus.ACCEPTANCE.getKey(),settleClaims.getStatus())
                    || Constants.equalsInteger(Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION.getKey(),settleClaims.getStatus())
                    || Constants.equalsInteger(Constants.SettleClaimsStatus.REJECT_DEAL.getKey(),settleClaims.getStatus())
                    || Constants.equalsInteger(Constants.SettleClaimsStatus.WAIT_DISCUSS_REJECT.getKey(),settleClaims.getStatus())
            )){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
            }
            settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                    .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime()).set(SettleClaims::getWaitSupplement,Constants.ZERO));
        }
        multifileJoinMapper.delete(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,dto.getId()).eq(Multifile::getObjType,Constants.MultiFile.LP_OTHER_FILE.getKey()));
        List<Multifile> fileList = dto.getSupplementFileList();
        if(CollectionUtils.isNotEmpty(fileList)){
            for (int i = 0; i < fileList.size(); i++) {
                Multifile multifile = fileList.get(i);
                if(Objects.isNull(multifile.getFileurl())
                        || Objects.isNull(multifile.getType())
                        || StringUtils.isBlank(multifile.getName())
                ){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"附件内容异常");
                }
                multifile.setCreator(loginUserInfo.getId());
                multifile.setCreateDate(new Date());
                multifile.setIsdeleted(Constants.ZERO);
                multifile.setObjId(settleClaims.getId());
                //添加材料放入 å…¶ä»–材料业务内
                multifile.setObjType(Constants.MultiFile.LP_OTHER_FILE.getKey());
                multifile.setSortnum(i+1);
                multifileJoinMapper.insert(multifile);
            }
        }
        //存储日志
        this.saveSettleClaimsLog(settleClaims,Constants.SettleClaimsLogType.SUPPLEMENT,null);
    }


    /**
     * æ’¤é”€æŠ¥æ¡ˆ
     * @param dto
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void returnSettle(OptSettleClaimsDTO dto){
        if(Objects.isNull(dto)
                || Objects.isNull(dto.getId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业人员无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        //如果是企业 æŸ¥è¯¢æ˜¯å¦æ˜¯è‡ªå·±ä¼ä¸šçš„数据
        if(!Constants.equalsInteger(settleClaims.getCompanyId(),loginUserInfo.getCompanyId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您企业的数据，您无法进行该操作");
        }
        if(!Constants.equalsInteger(Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey(),settleClaims.getStatus())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }
        //存储日志
        this.saveSettleClaimsLog(settleClaims,Constants.SettleClaimsLogType.RETURN_SETTLE,null);
        settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime()).set(SettleClaims::getStatus,Constants.SettleClaimsStatus.RETURN.getKey()));
    }


    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updCaseType(CaseTypeDTO dto){
        if(Objects.isNull(dto)
                || Objects.isNull(dto.getId())
                || Objects.isNull(dto.getCaseType())
                || !(dto.getCaseType()>=Constants.ONE&&dto.getCaseType()<=Constants.THREE)
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(Constants.SettleClaimsStatus.ACCEPTANCE.getKey(),settleClaims.getStatus())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }
        //存储日志
        this.saveSettleClaimsLog(settleClaims, Constants.SettleClaimsLogType.UPD_CASE_TYPE,Constants.SettleClaimsLogType.UPD_CASE_TYPE.getInfo());
        settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime())
                .set(SettleClaims::getEditor,loginUserInfo.getId())
                .set(SettleClaims::getCaseType,dto.getCaseType()));
    }



    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void register(OptSettleClaimsDTO dto){
        if(Objects.isNull(dto)
                || Objects.isNull(dto.getId())
                || Objects.isNull(dto.getRegisterStatus())
                || !(Constants.equalsInteger(dto.getRegisterStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())||Constants.equalsInteger(dto.getRegisterStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey()))
                || (Constants.equalsInteger(dto.getRegisterStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())&&StringUtils.isBlank(dto.getDescribe()))
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey(),settleClaims.getStatus())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }
        Constants.SettleClaimsStatus settleClaimsStatus =
                Constants.equalsInteger(dto.getRegisterStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())?Constants.SettleClaimsStatus.CONFIRM_INFORMATION:Constants.SettleClaimsStatus.FINISH_ACCEPTANCE;
        //存储日志
        this.saveSettleClaimsLog(settleClaims, Constants.equalsInteger(dto.getRegisterStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())?Constants.SettleClaimsLogType.PLATFORM_REGISTER:Constants.SettleClaimsLogType.PLATFORM_RETURN,dto.getDescribe());
        settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,
                        DateUtil.getCurrDateTime()).set(SettleClaims::getStatus,settleClaimsStatus.getKey()));
    }


    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public Integer addReportNum(OptSettleClaimsDTO param){
        if(param.getId() == null
                ||StringUtils.isBlank( param.getReportNum()) ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        SettleClaims model = settleClaimsMapper.selectById(param.getId());
        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())
            || Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())
            ) 
        ){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!user.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
        }
        if(Constants.equalsInteger(model.getReportNumStatus(),Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"仅可修改一次报案号");
        }
        if(!((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())&&Constants.equalsInteger(model.getReportNumStatus(),Constants.ONE))
                ||(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_DEAL.getKey())&&Constants.equalsInteger(model.getReportNumStatus(),Constants.ZERO)))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"仅可修改一次报案号");
        }


//        //查询是否有报案号更改记录
//        if(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())
//        && settleClaimsLogMapper.selectCount(new QueryWrapper<SettleClaimsLog>().lambda()
//                        .eq(SettleClaimsLog::getObjType,Constants.SettleClaimsLogType.PLATFORM_ADDCODE.getKey())
//                .eq(SettleClaimsLog::getSettleClainmsId,param.getId()))>=Constants.ONE){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"仅可修改一次报案号");
//        }
//        if(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())&&StringUtils.isNotBlank(model.getReportNum())){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"已修改报案号，无法再次修改");
//        }
        settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                .eq(SettleClaims::getId,param.getId()).set(SettleClaims::getEditDate,
                        DateUtil.getCurrDateTime()).set(SettleClaims::getReportNum,param.getReportNum()));

        SettleClaims update = new SettleClaims();
        update.setEditDate(new Date());
        update.setEditor(user.getId());
        update.setReportNumStatus(model.getReportNumStatus()+Constants.ONE);
        update.setId(model.getId());
        update.setCheckDate(update.getEditDate());
        update.setCheckInfo("添加备案号");
        update.setCheckUserId(user.getId());
        update.setReportNum(param.getReportNum());
        settleClaimsMapper.updateById(update);

        Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_ADDCODE;
        String info =applyLogType.getInfo();
        info = info.replace("${param}", update.getReportNum());
        SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        settleClaimsLogMapper.insert(log);

        return  1;
    }


    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public  Integer addRemark(OptSettleClaimsDTO  param){
        if(param.getId() == null
                ||StringUtils.isBlank( param.getDescribe()) ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        SettleClaims model = settleClaimsMapper.selectById(param.getId());
        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())
                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey())
                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.REJECT_DEAL.getKey())
                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_DISCUSS_AUDIT.getKey())
                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_DISCUSS_REJECT.getKey())
                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION.getKey())
                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.COMPENSATION.getKey())
                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_FEE.getKey())
                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CLOSE_CASE.getKey())
        )){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该申请当前不支持该操作~");
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        SettleClaims update = new SettleClaims();
        update.setEditDate(new Date());
        update.setEditor(user.getId());
        update.setCheckDate(update.getEditDate());
        update.setCheckInfo("添加备注标签");
        update.setCheckUserId(user.getId());
        update.setId(model.getId());
        settleClaimsMapper.updateById(update);

        Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK;
        String info =applyLogType.getInfo();
        info = info.replace("${param}", param.getDescribe());
        SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        settleClaimsLogMapper.insert(log);
        return  1;

    }






    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void acceptance(AcceptanceSettleClaimsDTO dto){
        if(Objects.isNull(dto)
                || Objects.isNull(dto.getId())
                || Objects.isNull(dto.getStatus())
                || StringUtils.isBlank(dto.getDescribe())
                || !(dto.getStatus()>=Constants.ZERO||dto.getStatus()<=Constants.THREE)
                || ((Constants.equalsInteger(dto.getStatus(),Constants.THREE) ||Constants.equalsInteger(dto.getStatus(),Constants.TWO)) && StringUtils.isBlank(dto.getSyProblemOpts()) )
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(Constants.SettleClaimsStatus.WAIT_DEAL.getKey(),settleClaims.getStatus())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }
        if(Constants.equalsInteger(dto.getStatus(),Constants.ZERO) || Constants.equalsInteger(dto.getStatus(),Constants.THREE)){
            //受理
            settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                    .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime()).set(SettleClaims::getEditor,loginUserInfo.getId())
                    .set(SettleClaims::getStatus,Constants.SettleClaimsStatus.ACCEPTANCE.getKey()));
            //存储日志
            this.saveSettleClaimsLog(settleClaims,
                    Constants.equalsInteger(dto.getStatus(),Constants.ZERO)?Constants.SettleClaimsLogType.PLATFORM_ACCEPTANCE:Constants.SettleClaimsLogType.PLATFORM_DISCUSS,
                    dto.getDescribe());
        }else if(Constants.equalsInteger(dto.getStatus(),Constants.ONE)){
            //拒绝受理
            settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                    .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime()).set(SettleClaims::getEditor,loginUserInfo.getId())
                    .set(SettleClaims::getStatus,Constants.SettleClaimsStatus.REJECT_DEAL.getKey()));
            //存储日志
            this.saveSettleClaimsLog(settleClaims,
                    Constants.SettleClaimsLogType.PLATFORM_REFUSE_ACCEPTANCE,
                    Constants.SettleClaimsLogType.PLATFORM_REFUSE_ACCEPTANCE.getInfo().replace("{param}",dto.getDescribe()));
        }else if(Constants.equalsInteger(dto.getStatus(),Constants.TWO)){
            //受理商议审批
            settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                    .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate,DateUtil.getCurrDateTime()).set(SettleClaims::getEditor,loginUserInfo.getId())
                    .set(SettleClaims::getStatus,Constants.SettleClaimsStatus.REJECT_DEAL.getKey()));
            //存储日志
            this.saveSettleClaimsLog(settleClaims,
                    Constants.SettleClaimsLogType.PLATFORM_WAIT_DISCUSS,
                    dto.getDescribe());
        }
    }


    @Override
    public List<CompensationVO> getCompensation(Integer id){
        SettleClaims settleClaims = settleClaimsMapper.selectById(id);
        List<CompensationVO> modelList = new ArrayList<>();
        if (Objects.nonNull(settleClaims)&&StringUtils.isNotBlank(settleClaims.getAccountContent())) {
            modelList = JSONArray.parseArray(settleClaims.getAccountContent(),CompensationVO.class);
        }
        Constants.compensation [] compensations = Constants.compensation.values();
        List<CompensationVO> list = new ArrayList<>();
        for (Constants.compensation c:compensations) {
            CompensationVO compensationVO = new CompensationVO();
            compensationVO.setType(c.getType());
            compensationVO.setName(c.getName());
            if(CollectionUtils.isNotEmpty(modelList)){
                Optional<CompensationVO> optionalModel =  modelList.stream().filter(i->i.getName().equals(c.getName())).findFirst();
                if(optionalModel.isPresent()){
                    CompensationVO oldModel  = optionalModel.get();
                    compensationVO.setFee(oldModel.getFee());
                    compensationVO.setDescribe(oldModel.getDescribe());
                }
            }
            list.add(compensationVO);
        }
        return list;
    }
    
    
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void compensation(CompensationDTO dto){
        if(Objects.isNull(dto)
                || Objects.isNull(dto.getId())
                || StringUtils.isBlank(dto.getCompensationJson())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(Constants.SettleClaimsStatus.ACCEPTANCE.getKey(),settleClaims.getStatus()))||Constants.equalsInteger(Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION.getKey(),settleClaims.getStatus())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }

        List<CompensationVO> modelList = JSONArray.parseArray(settleClaims.getAccountContent(),CompensationVO.class);

        SettleClaims update = new SettleClaims();
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setYlClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.YL_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setWgClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.WG_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setScClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.SC_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setSwClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.SW_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setOtherAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setAccountContent(dto.getCompensationJson());
        update.setId(settleClaims.getId());
        update.setStatus(Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION.getKey());
        settleClaimsMapper.updateById(update);

        //存储日志
        this.saveSettleClaimsLog(settleClaims,
                Constants.SettleClaimsLogType.PLATFORM_LP_DEAL,
                Constants.SettleClaimsLogType.PLATFORM_LP_DEAL.getInfo());
    }


    /**
     * å•†è®®å®¡æ‰¹
     * @param dto
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void discussAudit(DiscussAuditDTO dto){
        if(Objects.isNull(dto)
                || Objects.isNull(dto.getId())
                || Objects.isNull(dto.getStatus())
                || !(Constants.equalsInteger(dto.getStatus(),Constants.ZERO)||Constants.equalsInteger(dto.getStatus(),Constants.ONE))
                || (Constants.equalsInteger(dto.getStatus(),Constants.ONE)&&StringUtils.isBlank(dto.getDescribe()))
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(Constants.SettleClaimsStatus.WAIT_DISCUSS_AUDIT.getKey(),settleClaims.getStatus())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }
        Constants.SettleClaimsStatus settleClaimsStatus =
                Constants.equalsInteger(dto.getStatus(),Constants.ZERO)?Constants.SettleClaimsStatus.ACCEPTANCE:Constants.SettleClaimsStatus.WAIT_DISCUSS_REJECT;
        //存储日志
        Constants.SettleClaimsLogType settleClaimsLogType = Constants.equalsInteger(dto.getStatus(),Constants.ZERO)
                ?Constants.SettleClaimsLogType.PLATFORM_DISCUSS_PASS:Constants.SettleClaimsLogType.PLATFORM_DISCUSS_REFUSE;
        this.saveSettleClaimsLog(settleClaims, settleClaimsLogType
                ,settleClaimsLogType.getInfo().replace("${param}",dto.getDescribe()));
        settleClaimsMapper.update(null,new UpdateWrapper<SettleClaims>().lambda()
                .eq(SettleClaims::getId,dto.getId()).set(SettleClaims::getEditDate, DateUtil.getCurrDateTime())
                        .set(SettleClaims::getEditor,loginUserInfo.getId())
                .set(SettleClaims::getStatus,settleClaimsStatus.getKey()));
    }






    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void nuclearCompensation(CompensationDTO dto){
        if(Objects.isNull(dto)
                || Objects.isNull(dto.getId())
                || StringUtils.isBlank(dto.getCompensationJson())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(Constants.SettleClaimsStatus.WAIT_AUDIT_COMPENSATION.getKey(),settleClaims.getStatus())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }

        List<CompensationVO> modelList = JSONArray.parseArray(settleClaims.getAccountContent(),CompensationVO.class);

        SettleClaims update = new SettleClaims();
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setYlClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.YL_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setWgClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.WG_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setScClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.SC_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setSwClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.SW_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setOtherAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setAccountContent(dto.getCompensationJson());
        update.setId(settleClaims.getId());
        update.setStatus(Constants.SettleClaimsStatus.COMPENSATION.getKey());
        settleClaimsMapper.updateById(update);

        //存储日志
        this.saveSettleClaimsLog(settleClaims,
                Constants.SettleClaimsLogType.PLATFORM_HP_DEAL,
                Constants.SettleClaimsLogType.PLATFORM_HP_DEAL.getInfo());
    }


    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updFee(CompensationDTO dto){
        if(Objects.isNull(dto)
                || Objects.isNull(dto.getId())
                || StringUtils.isBlank(dto.getCompensationJson())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(Constants.SettleClaimsStatus.COMPENSATION.getKey(),settleClaims.getStatus())
                || Constants.equalsInteger(Constants.SettleClaimsStatus.CONFIRM_FEE.getKey(),settleClaims.getStatus()))
        ){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }

        List<CompensationVO> modelList = JSONArray.parseArray(dto.getCompensationJson(),CompensationVO.class);

        SettleClaims update = new SettleClaims();
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        if(Constants.equalsInteger(Constants.SettleClaimsStatus.CONFIRM_FEE.getKey(),settleClaims.getStatus())){
            update.setFeeUpdate(Constants.ONE);
        }
        update.setYlClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.YL_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setWgClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.WG_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setScClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.SC_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setSwClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&i.getName().equals(Constants.compensation.SW_COMPENSATION.getName())).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        update.setClaimAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
        //处理历史数据
        List<CompensationVO> oldList =  JSONArray.parseArray(settleClaims.getAccountContent(),CompensationVO.class);
        for (CompensationVO compensationVO:oldList) {
            if(compensationVO.getName().equals(Constants.compensation.YL_COMPENSATION.getName())){
                compensationVO.setFee(update.getYlClaimAccount());
            }else if(compensationVO.getName().equals(Constants.compensation.WG_COMPENSATION.getName())){
                compensationVO.setFee(update.getWgClaimAccount());
            }else if(compensationVO.getName().equals(Constants.compensation.SC_COMPENSATION.getName())){
                compensationVO.setFee(update.getScClaimAccount());
            }else if(compensationVO.getName().equals(Constants.compensation.SW_COMPENSATION.getName())){
                compensationVO.setFee(update.getSwClaimAccount());
            }else{
              continue;  
            }
        }
        update.setAccountContent(dto.getCompensationJson());
        update.setAccountContent(JSONArray.toJSONString(oldList));
        update.setId(settleClaims.getId()); 
        settleClaimsMapper.updateById(update);

        //存储日志
        this.saveSettleClaimsLog(settleClaims,
                Constants.SettleClaimsLogType.PLATFORM_UPD_FEE,
                Constants.SettleClaimsLogType.PLATFORM_UPD_FEE.getInfo());
    }


    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void confirmFee(Integer id){
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
        }
        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(id);
        if(Objects.isNull(settleClaims)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(Constants.SettleClaimsStatus.COMPENSATION.getKey(),settleClaims.getStatus())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
        }
        SettleClaims update = new SettleClaims();
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setStatus(Constants.SettleClaimsStatus.WAIT_DEAL.getKey());
        update.setId(settleClaims.getId());
        settleClaimsMapper.updateById(update);

        //存储日志
        this.saveSettleClaimsLog(settleClaims,
                Constants.SettleClaimsLogType.CONFIRM_FEE,
                Constants.SettleClaimsLogType.CONFIRM_FEE.getInfo());
    }


//    @Override
//    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
//    public void payCash(PayCashDTO dto){
//        if(Objects.isNull(dto)
//                || Objects.isNull(dto.getId())
//                || StringUtils.isBlank(dto.getDescribe())
//        ){
//            throw new BusinessException(ResponseStatus.BAD_REQUEST);
//        }
//        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
//        if(!loginUserInfo.getType().equals(Constants.ZERO)){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非管理员无法进行该操作");
//        }
//        SettleClaims settleClaims  = settleClaimsJoinMapper.selectById(dto.getId());
//        if(Objects.isNull(settleClaims)){
//            throw new BusinessException(ResponseStatus.DATA_EMPTY);
//        }
//        if(!Constants.equalsInteger(Constants.SettleClaimsStatus.COMPENSATION.getKey(),settleClaims.getStatus())){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，业务状态已流转~");
//        }
//        SettleClaims update = new SettleClaims();
//        update.setEditDate(new Date());
//        update.setEditor(loginUserInfo.getId());
//        update.setStatus(Constants.SettleClaimsStatus.WAIT_DEAL.getKey());
//        update.setId(settleClaims.getId());
//        settleClaimsMapper.updateById(update);
//
//        //存储日志
//        this.saveSettleClaimsLog(settleClaims,
//                Constants.SettleClaimsLogType.CONFIRM_FEE,
//                Constants.SettleClaimsLogType.CONFIRM_FEE.getInfo());
//    }






}

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

@@ -32,12 +32,14 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
@@ -694,10 +696,19 @@
    }


    @Autowired
    private RedisTemplate redisTemplate;// Redis操作类，对这个使用不熟悉的，可以参考前面的博客

    private static final String KEY_PREFIX = "unionchange:upload:";

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void uploadBXD(UnionChangeBXDDTO unionChangeBXDDTO){
        try{
            if(Objects.nonNull(redisTemplate.opsForValue().get(KEY_PREFIX+unionChangeBXDDTO.getId()))){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"请勿重复提交");
            };
            redisTemplate.opsForValue().set(KEY_PREFIX+unionChangeBXDDTO.getId(), unionChangeBXDDTO.getId(), 30000, TimeUnit.SECONDS);
        if(Objects.isNull(unionChangeBXDDTO)
            || Objects.isNull(unionChangeBXDDTO.getId())
                || Objects.isNull(unionChangeBXDDTO.getApplyDate())
@@ -797,49 +808,7 @@
            
        }

        //存储合并单保险单
       /* Multifile multifile = new Multifile();
        multifile.setIsdeleted(Constants.ZERO);
        multifile.setCreator(user.getId());
        multifile.setCreateDate(new Date());
        multifile.setObjId(unionChangeBXDDTO.getId());
        multifile.setCreateDate(new Date());
        multifile.setObjType(Constants.MultiFile.WTB_CA_DONE_PDF.getKey());
        multifile.setType(Constants.TWO);
        multifile.setFileurl(unionChangeBXDDTO.getFileurl());
        multifile.setName(unionChangeBXDDTO.getName());
        multifileMapper.insert(multifile);*/
 
//        if(CollectionUtils.isNotEmpty(unionChangeBXDDTO.getApplyChangeBXDList())){
//            //查询是否不存在当前合并单的数据
//            if(applyChangeJoinMapper.selectCount(new QueryWrapper<ApplyChange>()
//                    .lambda().ne(ApplyChange::getUnionChangeId,unionChangeBXDDTO.getId())
//                    .in(ApplyChange::getId,
//                            unionChangeBXDDTO.getApplyChangeBXDList().stream().map(m->m.getObjId()).collect(Collectors.toList())
//                    )
//            )>Constants.ZERO){
//                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单明细记录存在非本合并单数据");
//            };
//            for (Multifile m:unionChangeBXDDTO.getApplyChangeBXDList()) {
//                if(StringUtils.isBlank(m.getName())
//                        || StringUtils.isBlank(m.getFileurl()) ){
//                    continue;
//                }
//                if(Objects.isNull(m.getObjId())
//                        ||StringUtils.isBlank(m.getFileurl())
//                        ||StringUtils.isBlank(m.getName())
//                ){
//                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单文件信息缺失");
//                }
//                m.setId(null);
//                m.setIsdeleted(Constants.ZERO);
//                m.setCreator(user.getId());
//                m.setCreateDate(new Date());
//                m.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
//                m.setType(Constants.TWO);
//                multifileMapper.insert(m);
//            }
//        }
        if(CollectionUtils.isNotEmpty(applyChangeList)){
            for (ApplyChange applyChange:applyChangeList) {
                ApplyChange oldModel = applyChange;
@@ -903,6 +872,11 @@
                ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange));
        applyLogMapper.insert(log);

        }catch (Exception e){
            e.printStackTrace();
        }finally {
            redisTemplate.delete(KEY_PREFIX + unionChangeBXDDTO.getId());
        }
    }



 server/service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java

@@ -151,7 +151,7 @@
                }else if(systemDictData.getLabel().equals(Constants.RISK_CLAIM_TIMES)){
                    riskConfigVO.setRiskClaimTimes(systemDictData.getCode());
                }else if(systemDictData.getLabel().equals(Constants.RISK_NEW_MEMBER_OPEN)){
                    riskConfigVO.setRiskNewMemberOepn(systemDictData.getCode());
                    riskConfigVO.setRiskNewMemberOpen(systemDictData.getCode());
                }else if(systemDictData.getLabel().equals(Constants.RISK_NEW_MEMBER_TIME_UNIT)){
                    riskConfigVO.setRiskNewMemberTimeUnit(systemDictData.getCode());
                }else if(systemDictData.getLabel().equals(Constants.RISK_NEW_MEMBER_TIME)){
@@ -202,7 +202,7 @@
                }else if(systemDictData.getLabel().equals(Constants.RISK_CLAIM_TIMES)){
                    systemDictData.setCode(riskConfigDTO.getRiskClaimTimes());
                }else if(systemDictData.getLabel().equals(Constants.RISK_NEW_MEMBER_OPEN)){
                    systemDictData.setCode(riskConfigDTO.getRiskNewMemberOepn());
                    systemDictData.setCode(riskConfigDTO.getRiskNewMemberOpen());
                }else if(systemDictData.getLabel().equals(Constants.RISK_NEW_MEMBER_TIME_UNIT)){
                    systemDictData.setCode(riskConfigDTO.getRiskNewMemberTimeUnit());
                }else if(systemDictData.getLabel().equals(Constants.RISK_NEW_MEMBER_TIME)){