From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java |  825 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 784 insertions(+), 41 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index 37a29e3..ef2badd 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -1,25 +1,52 @@
 package com.doumee.service.business.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.biz.system.SystemDictDataBiz;
+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;
 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.model.SettleClaims;
+import com.doumee.dao.business.dto.SCSupplementDTO;
+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.system.model.SystemUser;
+import com.doumee.service.business.SettleClaimsLogService;
 import com.doumee.service.business.SettleClaimsService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+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;
 
-import java.util.List;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 鐞嗚禂鐢宠琛⊿ervice瀹炵幇
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Service
 public class SettleClaimsServiceImpl implements SettleClaimsService {
@@ -27,10 +54,681 @@
     @Autowired
     private SettleClaimsMapper settleClaimsMapper;
 
+    @Autowired
+    private SettleClaimsLogMapper settleClaimsLogMapper;
+    @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
+
+    @Autowired
+    private MultifileJoinMapper multifileJoinMapper;
+
+    @Autowired
+    private SettleClaimsJoinMapper settleClaimsJoinMapper;
+
+    @Autowired
+    private SettleClaimsLogJoinMapper settleClaimsLogJoinMapper;
+
+    @Autowired
+    private NoticesMapper noticesMapper;
+    /**
+     * 鍒犻櫎闄勪欢
+     * @return
+     */
+    @Override
+    public  Integer delFile(Integer id,Integer fileId){
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        return   multifileJoinMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+                .set(Multifile::getIsdeleted,Constants.ONE)
+                .set(Multifile::getEditDate,new Date())
+                .set(Multifile::getEditor,user.getId())
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .eq(Multifile::getObjId,id)
+                .eq(Multifile::getId,fileId)
+                .in(Multifile::getObjType,Arrays.asList(new Integer[]{
+                        Constants.MultiFile.LP_YGGX_FILE.getKey(),
+                        Constants.MultiFile.LP_MZCL_FILE.getKey(),
+                        Constants.MultiFile.LP_ZYCL_FILE.getKey(),
+                        Constants.MultiFile.LP_SCZL_FILE.getKey(),
+                        Constants.MultiFile.LP_JACL_FILE.getKey(),
+                })));
+    }
+    @Override
+    public      Integer back(SettleClaims  param){
+        if(param.getId() == null
+                ||StringUtils.isBlank( param.getCheckInfo()) ){
+            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.FINISH_ACCEPTANCE.getKey())
+                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.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(param.getCheckInfo());
+        update.setCheckUserId(user.getId());
+        update.setId(model.getId());
+        update.setStatus(Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey());
+        settleClaimsMapper.updateById(update);
+
+
+        //瀛樺偍寰呭姙淇℃伅
+        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
+        //鍒犻櫎鍏朵粬寰呭姙
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+
+        Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),model.getInformantName(),
+                model.getCompanyId(), Constants.NoticeType.FOUR);
+        noticesMapper.insert(notices);
+
+
+        Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_RETURN;
+        String info =applyLogType.getInfo();
+        info = info.replace("${param}", update.getCheckInfo());
+        SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        settleClaimsLogMapper.insert(log);
+        return  1;
+
+    }
+    /**
+     * 璧勬枡纭
+     * @param param
+     * @return
+     */
+    @Override
+    public      Integer confirm(SettleClaims  param){
+        if(param.getId() == null ){
+            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.FINISH_ACCEPTANCE.getKey())
+                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.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(param.getCheckInfo());
+        update.setCheckUserId(user.getId());
+        update.setId(model.getId());
+        update.setStatus(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey());
+        settleClaimsMapper.updateById(update);
+
+
+        //瀛樺偍寰呭姙淇℃伅
+        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
+        //鍒犻櫎鍏朵粬寰呭姙
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+
+        Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_CONFIRM_INFORMATION;
+        String info =applyLogType.getInfo();
+//        info = info.replace("${param}", update.getCheckInfo());
+        SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        settleClaimsLogMapper.insert(log);
+        return  1;
+
+    }
+    /**
+     * 鐞嗚禂澶囨敞鏍囩
+     * @param param
+     * @return
+     */
+    @Override
+    public       Integer remark(SettleClaims param){
+        if(param.getId() == null
+                ||StringUtils.isBlank( param.getCheckInfo()) ){
+            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.FINISH_ACCEPTANCE.getKey())
+                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.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.getCheckInfo());
+        SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        settleClaimsLogMapper.insert(log);
+        return  1;
+
+    }
+    /**
+     * 鐞嗚禂缁撴鎻愪氦
+     * @param param
+     * @return
+     */
+    @Override
+    public    Integer doneCommit(SettleClaims param){
+        if(param.getId() == null
+                ||StringUtils.isBlank( param.getCheckInfo()) ){
+            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.FINISH_ACCEPTANCE.getKey())
+              ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.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(param.getCheckInfo());
+        update.setCheckUserId(user.getId());
+        update.setStatus(Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey());
+        update.setId(model.getId());
+        update.setYlClaimAccount(Constants.formatBigdecimal(param.getYlClaimAccount()));
+        update.setSwClaimAccount(Constants.formatBigdecimal(param.getSwClaimAccount()));
+        update.setWgClaimAccount(Constants.formatBigdecimal(param.getWgClaimAccount()));
+        update.setScClaimAccount(Constants.formatBigdecimal(param.getScClaimAccount()));
+        update.setClaimAccount(update.getYlClaimAccount().add(update.getSwClaimAccount()).add(update.getScClaimAccount()).add(update.getWgClaimAccount()));
+        settleClaimsMapper.updateById(update);
+
+        //瀛樺偍寰呭姙淇℃伅
+        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
+        //鍒犻櫎鍏朵粬寰呭姙
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+        Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),model.getInformantName(),
+                model.getCompanyId(), Constants.NoticeType.ONE);
+        noticesMapper.insert(notices);
+
+        Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_FINISH;
+        String info =applyLogType.getInfo();
+        info = info.replace("${param}", update.getCheckInfo());
+        SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        settleClaimsLogMapper.insert(log);
+        return  1;
+
+    }
+    /**
+     * 鐞嗚禂澶勭悊
+     * @param param
+     * @return
+     */
+    @Override
+    public Integer dealBiz(SettleClaims  param){
+        if(param.getId() == null
+                ||StringUtils.isBlank( param.getCheckInfo()) ){
+            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.RETURN_ACCEPTANCE.getKey())
+              ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.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(param.getCheckInfo());
+        update.setCheckUserId(user.getId());
+        update.setId(model.getId());
+        settleClaimsMapper.updateById(update);
+
+        Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_LP_DEAL;
+        String info =applyLogType.getInfo();
+        info = info.replace("${param}", update.getCheckInfo());
+        SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        settleClaimsLogMapper.insert(log);
+        return  1;
+
+    }
+    /**
+     * 娣诲姞澶囨鍙�
+     * @param param
+     * @return
+     */
+    @Override
+    public Integer addCode(SettleClaims 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.FINISH_ACCEPTANCE.getKey())
+                ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.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());
+        update.setStatus(Constants.SettleClaimsStatus.DEAL_ING.getKey());
+        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
     public Integer create(SettleClaims settleClaims) {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(Objects.isNull(settleClaims)
+                || Objects.isNull(settleClaims.getMemberId())
+                || Objects.isNull(settleClaims.getSolutionId())
+                || Objects.isNull(settleClaims.getDuId())
+                || Objects.isNull(settleClaims.getWorktypeId())
+                || Objects.isNull(settleClaims.getHappenTime())
+                || Objects.isNull(settleClaims.getType())
+                || Objects.isNull(settleClaims.getInHospital())
+                || Objects.isNull(settleClaims.getMedicalInsurance())
+                || Objects.isNull(settleClaims.getContent())
+                || Objects.isNull(settleClaims.getInformantName())
+                || Objects.isNull(settleClaims.getInformantPhone())
+        ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        if(!loginUserInfo.getType().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氬憳宸ユ棤娉曡繘琛岃鎿嶄綔");
+        }
+        //鏌ヨ鏄惁瀛樺湪宸叉彁鎶ョ殑鏁版嵁  鏍规嵁浜哄憳鍜屼繚闄╂柟妗堣繘琛岃繃婊� 鏄惁瀛樺湪杩涜涓殑鏁版嵁
+        if(settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda()
+                .eq(SettleClaims::getSolutionId,settleClaims.getSolutionId())
+                .eq(SettleClaims::getMemberId,loginUserInfo.getId())
+                .in(SettleClaims::getStatus,Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey(),
+                        Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey())
+        )>Constants.ZERO){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鎻愭姤涓殑鎶ユ鏁版嵁!");
+        }
+        settleClaims.setCreateDate(new Date());
+        settleClaims.setIsdeleted(Constants.ZERO);
+        settleClaims.setCompanyId(loginUserInfo.getCompanyId());
+        settleClaims.setStatus(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey());
+        settleClaims.setCreator(loginUserInfo.getId());
+        settleClaims.setCheckUserId(loginUserInfo.getId());
         settleClaimsMapper.insert(settleClaims);
+
+        List<Multifile> reportVideo = settleClaims.getReportFileList();
+        if(CollectionUtils.isNotEmpty(reportVideo)){
+            for (int i = 0; i < reportVideo.size(); i++) {
+                Multifile multifile = reportVideo.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.ONE);
+                multifile.setSortnum(i+1);
+                multifileJoinMapper.insert(multifile);
+            }
+        }
+        //璁板綍鏃ュ織
+        this.saveSettleClaimsLog(settleClaims,Constants.SettleClaimsLogType.UPLOAD,null);
+
+
+        //瀛樺偍寰呭姙淇℃伅
+        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
+        //鍒犻櫎鍏朵粬寰呭姙
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,settleClaims.getId()));
+        Notices notices = new Notices(noticeObjectType,Constants.ZERO,settleClaims.getId(),settleClaims.getInformantName(),
+                settleClaims.getCompanyId(), Constants.NoticeType.ZERO);
+        noticesMapper.insert(notices);
+
+
         return settleClaims.getId();
+    }
+
+    @Override
+    public  void exportFiles(Integer id, HttpServletResponse response) {
+        try {
+            SettleClaims model = settleClaimsMapper.selectById(id);
+            if(model == null){
+                throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+            }
+            LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+            SettleClaims update = new SettleClaims();
+            update.setEditDate(new Date());
+            update.setEditor(loginUserInfo.getId());
+            Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_DOWNLOAD;
+            String info =applyLogType.getInfo();
+            SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+            settleClaimsLogMapper.insert(log);
+
+            List<File> fileList = new ArrayList<>();
+            List<Multifile> multifileList = multifileJoinMapper.selectList(new QueryWrapper<Multifile>().lambda()
+                    .eq(Multifile::getIsdeleted,Constants.ZERO)
+                    .eq(Multifile::getObjId,id)
+                    .isNotNull(Multifile::getFileurl)
+                    .in(Multifile::getObjType, Arrays.asList(new Integer[]{
+                            Constants.MultiFile.LP_YGGX_FILE.getKey(),
+                            Constants.MultiFile.LP_MZCL_FILE.getKey(),
+                            Constants.MultiFile.LP_ZYCL_FILE.getKey(),
+                            Constants.MultiFile.LP_SCZL_FILE.getKey(),
+                            Constants.MultiFile.LP_JACL_FILE.getKey(),
+                    }))
+                    .orderByAsc(Multifile::getCreateDate)
+            );
+            if(multifileList== null || multifileList.size() == 0){
+                throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+            }
+            String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.SETTLE_FILE).getCode();
+            Integer sn = 1;
+            for(Multifile l : multifileList){
+                File f = Constants.getFileByNetFile(path + l.getFileurl(),StringUtils.defaultString(sn + "_" +l.getName(),"鏈懡鍚�"));
+                if(f !=null && f.isFile()){
+                    fileList.add(f);
+                }
+                sn = sn +1;
+            }
+            if(fileList == null || fileList.size() == 0){
+                throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+            }
+            String fileName =  model.getInformantName() +"-鐞嗚禂璧勬枡-" +System.currentTimeMillis();
+            String encodeFileName =URLEncoder.encode(fileName, Charset.forName("UTF-8").toString())+".zip";
+            response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+            response.setContentType("application/octet-stream");
+            response.setHeader("eva-opera-type", "download");
+            response.setHeader("eva-download-filename", encodeFileName);
+            Constants.packFilesToZip(fileList,response.getOutputStream());
+        } catch (Exception e) {
+            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        }
+    }
+
+    @Override
+    public SettleClaims getSettleClaimsDetail(Integer id){
+
+        MPJLambdaWrapper<SettleClaims>  queryWrapper =    new MPJLambdaWrapper<SettleClaims>();
+        queryWrapper.selectAll(SettleClaims.class)
+                .selectAs(Company::getName,SettleClaims::getCompanyName)
+                .selectAs(Solutions::getName,SettleClaims::getSolutionName)
+                .selectAs(Member::getName,SettleClaims::getMemberName)
+                .selectAs(Member::getIdcardNo,SettleClaims::getMemberIdcardNo)
+                .selectAs(InsuranceApply::getCode,SettleClaims::getApplyCode)
+                .selectAs(Worktype::getName,SettleClaims::getWorktypeName)
+                .selectAs(InsuranceApply::getStartTime,SettleClaims::getBaoxianStartTime)
+                .selectAs(InsuranceApply::getEndTime,SettleClaims::getBaoxianEndTime)
+                .selectAs(DispatchUnit::getName,SettleClaims::getDuName)
+                .leftJoin(Company.class,Company::getId,SettleClaims::getCompanyId)
+                .leftJoin(Member.class,Member::getId,SettleClaims::getMemberId)
+                .leftJoin(DispatchUnit.class,DispatchUnit::getId,SettleClaims::getDuId)
+                .leftJoin(Worktype.class,Worktype::getId,SettleClaims::getWorktypeId)
+                .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
+                .leftJoin(Solutions.class,Solutions::getId,SettleClaims::getSolutionId)
+                .eq(SettleClaims::getId,id);
+        SettleClaims settleClaims = settleClaimsJoinMapper.selectJoinOne(SettleClaims.class,queryWrapper);
+        if(settleClaims == null){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        List<Multifile> multifileList = multifileJoinMapper.selectJoinList(Multifile.class,
+                new MPJLambdaWrapper<Multifile>()
+                .selectAll(Multifile.class)
+                .selectAs(SystemUser::getRealname,Multifile::getCreatorName)
+                .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
+                .eq(Multifile::getObjId,id)
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .orderByAsc(Multifile::getCreateDate)
+        );
+        String rPath = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode();
+        String path = rPath+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.SETTLE_FILE).getCode();
+        if(multifileList!=null){
+            for(Multifile f : multifileList){
+                if(f!=null&& StringUtils.isNotBlank(f.getFileurl())){
+                    f.setFileurlFull(path+f.getFileurl());
+                }
+            }
+        }
+        Multifile baoxiandanFile = multifileJoinMapper.selectOne(new QueryWrapper<Multifile>()
+                .lambda().eq(Multifile::getObjId,settleClaims.getInsuranceApplyId())
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .eq(Multifile::getObjType,Constants.MultiFile.BD_DONE_PDF.getKey())
+                .last("limit 1"));
+        if(baoxiandanFile!=null&& StringUtils.isNotBlank(baoxiandanFile.getFileurl())){
+            path = rPath+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+            baoxiandanFile.setFileurlFull(path+baoxiandanFile.getFileurl());
+        }
+        settleClaims.setBaoxiandanFile(baoxiandanFile);//淇濋櫓鍗�
+        if(CollectionUtils.isNotEmpty(multifileList)){
+            settleClaims.setReportFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SGXC_FILE.getKey())).collect(Collectors.toList()));
+
+            settleClaims.setRelationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_YGGX_FILE.getKey())).collect(Collectors.toList()));
+
+            settleClaims.setOutpatientFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_MZCL_FILE.getKey())).collect(Collectors.toList()));
+
+            settleClaims.setHospitalFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_ZYCL_FILE.getKey())).collect(Collectors.toList()));
+
+            settleClaims.setDisabilityFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SCZL_FILE.getKey())).collect(Collectors.toList()));
+
+            settleClaims.setCompensationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_JACL_FILE.getKey())).collect(Collectors.toList()));
+        }
+
+        //鏌ヨ鎿嶄綔璁板綍
+        List<SettleClaimsLog> settleClaimsLogList = settleClaimsLogJoinMapper.selectJoinList(SettleClaimsLog.class,
+                new MPJLambdaWrapper<SettleClaimsLog>()
+                        .selectAll(SettleClaimsLog.class)
+                        .selectAs(SystemUser::getRealname,SettleClaimsLog::getCreatorName)
+                        .selectAs(SystemUser::getType,SettleClaimsLog::getCreatorType)
+                        .selectAs(Company::getName,SettleClaimsLog::getCompanyName)
+                        .leftJoin(SystemUser.class,SystemUser::getId,SettleClaimsLog::getCreator)
+                        .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+                        .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
+                        .orderByAsc(SettleClaimsLog::getCreateDate)
+        );
+        settleClaims.setSettleClaimsLogList(settleClaimsLogList);
+        SettleClaimsLog lastConfirm = settleClaimsLogMapper.selectOne(new QueryWrapper<SettleClaimsLog>().lambda()
+                .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
+                .eq(SettleClaimsLog::getObjType,Constants.SettleClaimsLogType.PLATFORM_CONFIRM_INFORMATION.getKey())
+                .orderByDesc(SettleClaimsLog::getCreateDate)
+                .last(" limit 1")
+        );
+
+        Multifile multifile = multifileJoinMapper.selectOne(new QueryWrapper<Multifile>()
+                .lambda()
+                .eq(Multifile::getObjId,settleClaims.getId())
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .in(Multifile::getObjType,
+                        Constants.MultiFile.LP_SGXC_FILE.getKey(),
+                        Constants.MultiFile.LP_YGGX_FILE.getKey(),
+                        Constants.MultiFile.LP_MZCL_FILE.getKey(),
+                        Constants.MultiFile.LP_ZYCL_FILE.getKey(),
+                        Constants.MultiFile.LP_SCZL_FILE.getKey(),
+                        Constants.MultiFile.LP_JACL_FILE.getKey())
+                .orderByDesc(Multifile::getCreateDate)
+                .last(" limit 1")
+        );
+
+        if(!Objects.isNull(lastConfirm)&&!Objects.isNull(multifile)){
+            settleClaims.setFinishDate(lastConfirm.getCreateDate().compareTo(multifile.getCreateDate())>=0?lastConfirm.getCreateDate():multifile.getCreateDate());
+        }else if(!Objects.isNull(lastConfirm)&&Objects.isNull(multifile)){
+            settleClaims.setFinishDate(lastConfirm.getCreateDate());
+        }
+        return settleClaims;
+    }
+
+
+
+    @Override
+    public Integer updateForCompany(SettleClaims settleClaims) {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(Objects.isNull(settleClaims)
+                || Objects.isNull(settleClaims.getId())
+                || Objects.isNull(settleClaims.getMemberId())
+                || Objects.isNull(settleClaims.getSolutionId())
+                || Objects.isNull(settleClaims.getDuId())
+                || Objects.isNull(settleClaims.getWorktypeId())
+                || Objects.isNull(settleClaims.getType())
+                || Objects.isNull(settleClaims.getInHospital())
+                || Objects.isNull(settleClaims.getMedicalInsurance())
+                || Objects.isNull(settleClaims.getInformantName())
+                || Objects.isNull(settleClaims.getInformantPhone())
+        ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        if(!loginUserInfo.getType().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氬憳宸ユ棤娉曡繘琛岃鎿嶄綔");
+        }
+        SettleClaims oldSettleClaims  = settleClaimsMapper.selectById(settleClaims.getId());
+        if(Objects.isNull(oldSettleClaims)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇敼鏁版嵁");
+        }
+        if(!oldSettleClaims.getSolutionId().equals(settleClaims.getSolutionId())){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳硶淇敼鏂规淇℃伅");
+        }
+        if(!(oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())
+                || oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.DEAL_ING.getKey())
+                || oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
+        }
+        oldSettleClaims.setEditor(loginUserInfo.getId());
+        oldSettleClaims.setEditDate(new Date());
+        oldSettleClaims.setDuId(settleClaims.getDuId());
+        oldSettleClaims.setWorktypeId(settleClaims.getWorktypeId());
+        oldSettleClaims.setInHospital(settleClaims.getInHospital());
+        oldSettleClaims.setMedicalInsurance(settleClaims.getMedicalInsurance());
+        oldSettleClaims.setAreaId(settleClaims.getAreaId());
+        oldSettleClaims.setAreaInfo(settleClaims.getAreaInfo());
+        oldSettleClaims.setType(settleClaims.getType());
+        oldSettleClaims.setInformantName(settleClaims.getInformantName());
+        oldSettleClaims.setInformantPhone(settleClaims.getInformantPhone());
+        oldSettleClaims.setCheckUserId(loginUserInfo.getId());
+        settleClaimsMapper.updateById(oldSettleClaims);
+        //璁板綍鏃ュ織
+        Constants.SettleClaimsLogType settleClaimsLogType =  Constants.SettleClaimsLogType.UPDATE_DATA;
+        this.saveSettleClaimsLog(settleClaims,settleClaimsLogType,null);
+        return oldSettleClaims.getId();
+    }
+
+    @Override
+    public void supplement(SCSupplementDTO scSupplementDTO){
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(Objects.isNull(scSupplementDTO)
+                || Objects.isNull(scSupplementDTO.getId())
+                || Objects.isNull(scSupplementDTO.getSupplement())
+                || Objects.isNull(scSupplementDTO.getObjType())
+                || !(scSupplementDTO.getObjType().equals(Constants.ZERO))
+        ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        if(!loginUserInfo.getType().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氬憳宸ユ棤娉曡繘琛岃鎿嶄綔");
+        }
+        SettleClaims settleClaims  = settleClaimsMapper.selectById(scSupplementDTO.getId());
+        if(!(settleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())
+                || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.DEAL_ING.getKey())
+                || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
+        }
+        settleClaims.setEditor(loginUserInfo.getId());
+        settleClaims.setEditDate(new Date());
+        settleClaims.setCheckUserId(loginUserInfo.getId());
+        settleClaims.setCheckInfo(scSupplementDTO.getSupplement());
+        settleClaimsMapper.updateById(settleClaims);
+
+        Constants.SettleClaimsLogType settleClaimsLogType =  Constants.SettleClaimsLogType.SUPPLEMENT;
+        String content = settleClaimsLogType.getInfo().replace("${param}", scSupplementDTO.getSupplement());
+        this.saveSettleClaimsLog(settleClaims,settleClaimsLogType,content);
+    }
+
+
+
+
+    @Override
+    public void claimsUploadFile(SCSupplementDTO scSupplementDTO){
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(Objects.isNull(scSupplementDTO)
+                || Objects.isNull(scSupplementDTO.getId())
+                || Objects.isNull(scSupplementDTO.getObjType())
+                || Objects.isNull(scSupplementDTO.getFileUrl())
+                || Objects.isNull(scSupplementDTO.getFileType())
+        ){
+            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())
+                || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
+        }
+        Multifile multifile = new Multifile();
+        if(loginUserInfo.getType().equals(Constants.ONE)){
+            multifile.setCompanyId(loginUserInfo.getCompanyId());
+        }
+        multifile.setCreator(loginUserInfo.getId());
+        multifile.setCreateDate(new Date());
+        multifile.setIsdeleted(Constants.ZERO);
+        multifile.setObjType(scSupplementDTO.getObjType());
+        multifile.setObjId(scSupplementDTO.getId());
+        multifile.setFileurl(scSupplementDTO.getFileUrl());
+        multifile.setName(scSupplementDTO.getFileName());
+        multifile.setType(scSupplementDTO.getFileType());
+        multifileJoinMapper.insert(multifile);
+    }
+
+
+
+
+    public void saveSettleClaimsLog(SettleClaims settleClaims, Constants.SettleClaimsLogType settleClaimsLogType, String content){
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); 
+        SettleClaimsLog settleClaimsLog = new SettleClaimsLog();
+        settleClaimsLog.setCreateDate(new Date());
+        settleClaimsLog.setCreator(loginUserInfo.getId());
+        settleClaimsLog.setIsdeleted(Constants.ZERO);
+        settleClaimsLog.setSettleClainmsId(settleClaims.getId());
+        settleClaimsLog.setTitle(settleClaimsLogType.getName());
+        settleClaimsLog.setContent(content);
+        settleClaimsLog.setObjType(settleClaimsLogType.getKey());
+        settleClaimsLog.setObjId(settleClaims.getId());
+        settleClaimsLogMapper.insert(settleClaimsLog);
     }
 
     @Override
@@ -69,6 +767,7 @@
 
     @Override
     public SettleClaims findById(Integer id) {
+
         return settleClaimsMapper.selectById(id);
     }
 
@@ -87,109 +786,153 @@
     @Override
     public PageData<SettleClaims> findPage(PageWrap<SettleClaims> pageWrap) {
         IPage<SettleClaims> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
-        QueryWrapper<SettleClaims> queryWrapper = new QueryWrapper<>();
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         Utils.MP.blankToNull(pageWrap.getModel());
+        MPJLambdaWrapper<SettleClaims>  queryWrapper =    new MPJLambdaWrapper<SettleClaims>();
+        queryWrapper.selectAll(SettleClaims.class)
+                .selectAs(Company::getName,SettleClaims::getCompanyName)
+                .selectAs(Solutions::getName,SettleClaims::getSolutionName)
+                .selectAs(Member::getName,SettleClaims::getMemberName)
+                .selectAs(Member::getIdcardNo,SettleClaims::getMemberIdcardNo)
+                .selectAs(Worktype::getName,SettleClaims::getWorktypeName)
+                .selectAs(InsuranceApply::getStartTime,SettleClaims::getBaoxianStartTime)
+                .selectAs(DispatchUnit::getName,SettleClaims::getDuName)
+                .leftJoin(Company.class,Company::getId,SettleClaims::getCompanyId)
+                .leftJoin(Member.class,Member::getId,SettleClaims::getMemberId)
+                .leftJoin(DispatchUnit.class,DispatchUnit::getId,SettleClaims::getDuId)
+                .leftJoin(Worktype.class,Worktype::getId,SettleClaims::getWorktypeId)
+                .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
+                .leftJoin(Solutions.class,Solutions::getId,SettleClaims::getSolutionId);
+        queryWrapper.eq(DispatchUnit::getIsdeleted,Constants.ZERO);
+        queryWrapper.eq(SettleClaims::getIsdeleted,Constants.ZERO);
+        if(Constants.equalsInteger(user.getType(),Constants.ZERO)){
+            //鍙兘鐪嬫潈闄愯寖鍥村唴
+            if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+                queryWrapper. eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+            }else {
+                queryWrapper. in(Company::getId, user.getCompanyIdList());
+            }
+        } else  {
+            //浼佷笟鐢ㄦ埛鍙湅鑷繁鐨勬暟鎹�
+            pageWrap.getModel().setCompanyId(user.getCompanyId());
+        }
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName, pageWrap.getModel().getMemberName());
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberIdcardNo()),Member::getIdcardNo, pageWrap.getModel().getMemberIdcardNo());
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDuName()),DispatchUnit::getName, pageWrap.getModel().getDuName());
+        queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId, pageWrap.getModel().getBaseSolutionId());
+        queryWrapper.eq(pageWrap.getModel().getBaseDuId()!=null,DispatchUnit::getBaseId, pageWrap.getModel().getBaseDuId());
+
         if (pageWrap.getModel().getId() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getId, pageWrap.getModel().getId());
+            queryWrapper.eq(SettleClaims::getId, pageWrap.getModel().getId());
         }
         if (pageWrap.getModel().getCreator() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getCreator, pageWrap.getModel().getCreator());
+            queryWrapper.eq(SettleClaims::getCreator, pageWrap.getModel().getCreator());
         }
         if (pageWrap.getModel().getCreateDate() != null) {
-            queryWrapper.lambda().ge(SettleClaims::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
-            queryWrapper.lambda().le(SettleClaims::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+            queryWrapper.ge(SettleClaims::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+            queryWrapper.le(SettleClaims::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
         }
         if (pageWrap.getModel().getEditor() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getEditor, pageWrap.getModel().getEditor());
+            queryWrapper.eq(SettleClaims::getEditor, pageWrap.getModel().getEditor());
         }
         if (pageWrap.getModel().getEditDate() != null) {
-            queryWrapper.lambda().ge(SettleClaims::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
-            queryWrapper.lambda().le(SettleClaims::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+            queryWrapper.ge(SettleClaims::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+            queryWrapper.le(SettleClaims::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
         }
         if (pageWrap.getModel().getIsdeleted() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getIsdeleted, pageWrap.getModel().getIsdeleted());
+            queryWrapper.eq(SettleClaims::getIsdeleted, pageWrap.getModel().getIsdeleted());
         }
         if (pageWrap.getModel().getRemark() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getRemark, pageWrap.getModel().getRemark());
+            queryWrapper.eq(SettleClaims::getRemark, pageWrap.getModel().getRemark());
         }
         if (pageWrap.getModel().getSortnum() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getSortnum, pageWrap.getModel().getSortnum());
+            queryWrapper.eq(SettleClaims::getSortnum, pageWrap.getModel().getSortnum());
         }
         if (pageWrap.getModel().getSolutionId() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getSolutionId, pageWrap.getModel().getSolutionId());
+            queryWrapper.eq(SettleClaims::getSolutionId, pageWrap.getModel().getSolutionId());
         }
         if (pageWrap.getModel().getCompanyId() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getCompanyId, pageWrap.getModel().getCompanyId());
+            queryWrapper.eq(SettleClaims::getCompanyId, pageWrap.getModel().getCompanyId());
         }
         if (pageWrap.getModel().getMemberId() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getMemberId, pageWrap.getModel().getMemberId());
+            queryWrapper.eq(SettleClaims::getMemberId, pageWrap.getModel().getMemberId());
         }
         if (pageWrap.getModel().getHappenTime() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getHappenTime, pageWrap.getModel().getHappenTime());
+            queryWrapper.eq(SettleClaims::getHappenTime, pageWrap.getModel().getHappenTime());
         }
         if (pageWrap.getModel().getIdcardNo() != null) {
-            queryWrapper.lambda().ge(SettleClaims::getIdcardNo, Utils.Date.getStart(pageWrap.getModel().getIdcardNo()));
-            queryWrapper.lambda().le(SettleClaims::getIdcardNo, Utils.Date.getEnd(pageWrap.getModel().getIdcardNo()));
+            queryWrapper.eq(SettleClaims::getIdcardNo, pageWrap.getModel().getIdcardNo());
+
         }
         if (pageWrap.getModel().getDuId() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getDuId, pageWrap.getModel().getDuId());
+            queryWrapper.eq(SettleClaims::getDuId, pageWrap.getModel().getDuId());
         }
         if (pageWrap.getModel().getWorktypeId() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getWorktypeId, pageWrap.getModel().getWorktypeId());
+            queryWrapper.eq(SettleClaims::getWorktypeId, pageWrap.getModel().getWorktypeId());
         }
         if (pageWrap.getModel().getFee() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getFee, pageWrap.getModel().getFee());
+            queryWrapper.eq(SettleClaims::getFee, pageWrap.getModel().getFee());
         }
         if (pageWrap.getModel().getCheckInfo() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getCheckInfo, pageWrap.getModel().getCheckInfo());
+            queryWrapper.eq(SettleClaims::getCheckInfo, pageWrap.getModel().getCheckInfo());
         }
         if (pageWrap.getModel().getCheckUserId() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getCheckUserId, pageWrap.getModel().getCheckUserId());
+            queryWrapper.eq(SettleClaims::getCheckUserId, pageWrap.getModel().getCheckUserId());
         }
         if (pageWrap.getModel().getCode() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getCode, pageWrap.getModel().getCode());
+            queryWrapper.eq(SettleClaims::getCode, pageWrap.getModel().getCode());
         }
         if (pageWrap.getModel().getStatus() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getStatus, pageWrap.getModel().getStatus());
+            if(pageWrap.getModel().getStatus().equals(Constants.ZERO)){
+                queryWrapper.in(SettleClaims::getStatus, Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey()
+                        ,Constants.SettleClaimsStatus.DEAL_ING.getKey()
+                        ,Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey());
+            }else{
+                queryWrapper.eq(SettleClaims::getStatus, pageWrap.getModel().getStatus());
+            }
+
+
         }
         if (pageWrap.getModel().getType() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getType, pageWrap.getModel().getType());
+            queryWrapper.eq(SettleClaims::getType, pageWrap.getModel().getType());
         }
         if (pageWrap.getModel().getInHospital() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getInHospital, pageWrap.getModel().getInHospital());
+            queryWrapper.eq(SettleClaims::getInHospital, pageWrap.getModel().getInHospital());
         }
         if (pageWrap.getModel().getMedicalInsurance() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getMedicalInsurance, pageWrap.getModel().getMedicalInsurance());
+            queryWrapper.eq(SettleClaims::getMedicalInsurance, pageWrap.getModel().getMedicalInsurance());
         }
         if (pageWrap.getModel().getContent() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getContent, pageWrap.getModel().getContent());
+            queryWrapper.eq(SettleClaims::getContent, pageWrap.getModel().getContent());
         }
         if (pageWrap.getModel().getInformantName() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getInformantName, pageWrap.getModel().getInformantName());
+            queryWrapper.eq(SettleClaims::getInformantName, pageWrap.getModel().getInformantName());
         }
         if (pageWrap.getModel().getInformantPhone() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getInformantPhone, pageWrap.getModel().getInformantPhone());
+            queryWrapper.eq(SettleClaims::getInformantPhone, pageWrap.getModel().getInformantPhone());
         }
         if (pageWrap.getModel().getAreaId() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getAreaId, pageWrap.getModel().getAreaId());
+            queryWrapper.eq(SettleClaims::getAreaId, pageWrap.getModel().getAreaId());
         }
         if (pageWrap.getModel().getAreaInfo() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getAreaInfo, pageWrap.getModel().getAreaInfo());
+            queryWrapper.eq(SettleClaims::getAreaInfo, pageWrap.getModel().getAreaInfo());
         }
         if (pageWrap.getModel().getReportNum() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getReportNum, pageWrap.getModel().getReportNum());
+            queryWrapper.eq(SettleClaims::getReportNum, pageWrap.getModel().getReportNum());
         }
         if (pageWrap.getModel().getInsuranceApplyId() != null) {
-            queryWrapper.lambda().eq(SettleClaims::getInsuranceApplyId, pageWrap.getModel().getInsuranceApplyId());
+            queryWrapper.eq(SettleClaims::getInsuranceApplyId, pageWrap.getModel().getInsuranceApplyId());
         }
-        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+        queryWrapper.orderByDesc(SettleClaims::getCreateDate);
+        /*for(PageWrap.SortData sortData: pageWrap.getSorts()) {
             if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                 queryWrapper.orderByDesc(sortData.getProperty());
             } else {
                 queryWrapper.orderByAsc(sortData.getProperty());
             }
-        }
-        return PageData.from(settleClaimsMapper.selectPage(page, queryWrapper));
+        }*/
+        PageData<SettleClaims> pageData = PageData.from(settleClaimsJoinMapper.selectJoinPage(page,SettleClaims.class, queryWrapper));
+        return pageData;
     }
 
     @Override

--
Gitblit v1.9.3