From a9ca0823ab8f33ca85abebcf6ec4a8da235adb49 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 一月 2024 14:36:49 +0800
Subject: [PATCH] 开发业务接口

---
 server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 1053 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 998 insertions(+), 55 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index a0029b9..ad61a06 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -1,25 +1,48 @@
 package com.doumee.service.business.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.annotation.excel.ExcelExporter;
+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.DateUtil;
 import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.ApplyChangeMapper;
-import com.doumee.dao.business.model.ApplyChange;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.dto.ApplyChangeOptDTO;
+import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
+import com.doumee.dao.business.join.ApplyChagneDetailJoinMapper;
+import com.doumee.dao.business.join.ApplyChangeJoinMapper;
+import com.doumee.dao.business.join.ApplyDetailJoinMapper;
+import com.doumee.dao.business.model.*;
 import com.doumee.service.business.ApplyChangeService;
 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.doumee.service.business.third.SignService;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+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;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃Service瀹炵幇
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Service
 public class ApplyChangeServiceImpl implements ApplyChangeService {
@@ -27,10 +50,674 @@
     @Autowired
     private ApplyChangeMapper applyChangeMapper;
 
+    @Autowired
+    private InsuranceApplyMapper insuranceApplyMapper;
+
+    @Autowired
+    private CompanySolutionMapper companySolutionMapper;
+
+    @Autowired
+    private ApplyChangeJoinMapper applyChangeJoinMapper;
+
+    @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
+    @Autowired
+    private SignService signService;
+    @Autowired
+    private ApplyChagneDetailJoinMapper applyChagneDetailJoinMapper;
+
+    @Autowired
+    private ApplyDetailJoinMapper applyDetailJoinMapper;
+
+    @Autowired
+    private MemberMapper memberMapper;
+
+    @Autowired
+    private MultifileMapper multifileMapper;
+    @Autowired
+    private DuSolutionMapper duSolutionMapper;
+    @Autowired
+    private DuWorktypeMapper duWorktypeMapper;
+
+    @Autowired
+    private ApplyLogMapper applyLogMapper;
+
+    @Autowired
+    private SolutionsMapper solutionsMapper;
+
+    /**
+     * 骞冲彴閫�鍥炴姇淇�
+     * @param param
+     * @return
+     */
     @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public Integer back(ApplyChange param) {
+        if(param.getId() == null ||StringUtils.isBlank(param.getCheckInfo())){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        ApplyChange model = applyChangeMapper.selectById(param.getId());
+
+        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())
+                ||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.APPROVE.getKey())){
+            //宸叉彁浜ゅ拰宸插畬鎴愮姸鎬佷笉鏀寔瀹℃牳涓嶉�氳繃
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+        }
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        ApplyChange update = new ApplyChange();
+        update.setEditDate(new Date());
+        update.setEditor(user.getId());
+        update.setStatus(Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey());
+        update.setCheckDate(update.getEditDate());
+        update.setCheckInfo(param.getCheckInfo());
+        update.setCheckUserId(user.getId());
+        update.setId(model.getId());
+        applyChangeMapper.updateById(update);
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_CHECK_PASS_NO;
+        String info =applyLogType.getInfo();
+        info = info.replace("${param}", update.getCheckInfo());
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        applyLogMapper.insert(log);
+        return  1;
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public Integer uploadPidan(ApplyChange param) {
+        if(param.getId() == null
+                || param.getValidCode() == null
+                || param.getApplyStartTime() == null
+                || param.getPidanFile() == null
+                ||StringUtils.isBlank( param.getPidanFile().getFileurl())
+                ||StringUtils.isBlank( param.getPidanFile() .getName())){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+
+        ApplyChange model = applyChangeMapper.selectById(param.getId());
+        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+        }
+
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        ApplyChange update = new ApplyChange();
+        update.setEditDate(new Date());
+        update.setEditor(user.getId());
+        update.setStatus(Constants.ApplyChangeStatus.APPROVE.getKey());
+        update.setCheckDate(update.getEditDate());
+        update.setCheckInfo(param.getCheckInfo());
+        update.setCheckUserId(user.getId());
+        update.setId(model.getId());
+        update.setValidCode(param.getValidCode());
+        update.setApplyStartTime(model.getApplyStartTime());
+        applyChangeMapper.updateById(update);
+
+        param.getPidanFile().setIsdeleted(Constants.ZERO);
+        param.getPidanFile().setCreator(user.getId());
+        param.getPidanFile().setObjId(update.getId());
+        param.getPidanFile().setCreateDate(update.getEditDate());
+        param.getPidanFile().setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
+        param.getPidanFile().setType(Constants.TWO);
+        multifileMapper.insert(param.getPidanFile());
+
+        update.setApplyId(model.getApplyId());
+        if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
+            //濡傛灉鏄姞鍑忎繚鐢宠 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
+            dealDetailsValidTime(update);
+        }else{
+            //濡傛灉鏄崲鍘傜敵璇� 澶勭悊鏄庣粏鏁版嵁
+            dealDetailsDUdata(update);
+        }
+
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_APPROVE;
+        String info = "";
+        if(model.getValidTime()!=null && model.getValidTime().getTime()/1000!= param.getApplyStartTime().getTime()/1000){
+            info =applyLogType.getInfo();
+            info = info.replace("${param1}",DateUtil.getPlusTime2(model.getValidTime()));
+            info = info.replace("${param2}",DateUtil.getPlusTime2(param.getApplyStartTime()));
+        }
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        applyLogMapper.insert(log);
+
+        return  1;
+
+    }
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public     Integer editPidan(ApplyChange param) {
+        if(param.getId() == null
+                || param.getValidCode() == null
+                || param.getPidanFile() == null
+                || param.getCheckInfo() == null
+                ||StringUtils.isBlank( param.getPidanFile().getFileurl())
+                ||StringUtils.isBlank( param.getPidanFile() .getName())){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+
+        ApplyChange model = applyChangeMapper.selectById(param.getId());
+        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.APPROVE.getKey())){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
+        }
+
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        ApplyChange update = new ApplyChange();
+        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.setValidCode(param.getValidCode());
+        applyChangeMapper.updateById(update);
+        //鍒犻櫎鍘熸湁鐨勪繚鍗曚俊鎭�
+        multifileMapper.delete(new UpdateWrapper<Multifile>().lambda()
+                .set(Multifile::getIsdeleted,Constants.ZERO)
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .eq(Multifile::getObjId,update.getId())
+                .eq(Multifile::getObjType,Constants.MultiFile.CA_PD_PDF.getKey())
+        );
+        param.getPidanFile().setIsdeleted(Constants.ZERO);
+        param.getPidanFile().setObjId(update.getId());
+        param.getPidanFile().setCreator(user.getId());
+        param.getPidanFile().setCreateDate(update.getEditDate());
+        param.getPidanFile().setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
+        param.getPidanFile().setType(Constants.TWO);
+        multifileMapper.insert(param.getPidanFile());
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PALTFORM_EDIT_PIDAN;
+        String info =  applyLogType.getInfo();
+        info = info.replace("${param}",param.getCheckInfo());
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        applyLogMapper.insert(log);
+
+        return  1;
+
+    }
+
+    /**
+     * 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
+     * @param update
+     */
+    private void dealDetailsDUdata(ApplyChange update ) {
+        List<ApplyChagneDetail> detailList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
+                new MPJLambdaWrapper<ApplyChagneDetail>()
+                        .selectAll(ApplyChagneDetail.class)
+                        .selectAs(Solutions::getTimeUnit,ApplyChagneDetail::getSolutionTimeUnit)
+                        .selectAs(Solutions::getPrice,ApplyChagneDetail::getSolutionPrice)
+                  .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+                  .leftJoin(Solutions.class, Solutions::getId, ApplyChange::getSolutionsId)
+                  .eq(ApplyChagneDetail::getApplyChangeId,update.getId())
+                  .eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO) );
+        if(detailList ==null || detailList.size()==0){
+            return;
+        }
+        for(ApplyChagneDetail detail : detailList){
+            //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+            ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
+                    .eq(ApplyDetail::getApplyId, update.getApplyId())
+                    .eq(ApplyDetail::getMemberId, detail.getMemberId())
+                    .orderByDesc(ApplyDetail::getCreateDate)
+                    .last("limit 1"));
+            if(oldModel == null  ){
+                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
+            }
+            applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+                    .set(ApplyDetail::getEditor,update.getEditor())
+                    .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
+                    .set(ApplyDetail::getDuId,detail.getDuId())
+                    .set(ApplyDetail::getEditDate,update.getEditDate())
+                    .eq(ApplyDetail::getId,oldModel.getApplyId())
+            );
+
+        }
+    }
+    /**
+     * 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
+     * @param update
+     */
+    private void dealDetailsValidTime(ApplyChange update ) {
+        List<ApplyChagneDetail> detailList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
+                new MPJLambdaWrapper<ApplyChagneDetail>()
+                        .selectAll(ApplyChagneDetail.class)
+                        .selectAs(Solutions::getTimeUnit,ApplyChagneDetail::getSolutionTimeUnit)
+                        .selectAs(Solutions::getPrice,ApplyChagneDetail::getSolutionPrice)
+                  .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+                  .leftJoin(Solutions.class, Solutions::getId, ApplyChange::getSolutionsId)
+                  .eq(ApplyChagneDetail::getApplyChangeId,update.getId())
+                  .eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO) );
+        if(detailList ==null || detailList.size()==0){
+            return;
+        }
+        List<ApplyDetail> addList = new ArrayList<>();
+        List<Integer> reduceMembers = new ArrayList<>();
+        BigDecimal totalFee = new BigDecimal(0);
+        BigDecimal currentFee = new BigDecimal(0);
+
+        for(ApplyChagneDetail detail : detailList){
+            if(Constants.equalsInteger(detail.getType(),Constants.ZERO)){
+                //鍔犱繚
+                ApplyDetail add = new ApplyDetail();
+                add.setApplyId(update.getApplyId());
+                add.setValidCode(update.getValidCode());
+                add.setFee(detail.getFee());
+                add.setIsdeleted(Constants.ZERO);
+                add.setCreator(update.getEditor());
+                add.setCreateDate(update.getEditDate());
+                add.setMemberId(detail.getMemberId());
+                add.setMemberName(detail.getMemberName());
+                add.setWorktypeId(detail.getWorktypeId());
+                add.setDuId(detail.getDuId());
+                add.setStartTime(update.getApplyStartTime());
+                add.setEndTime(detail.getEndTime());
+                add.setFee(Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), add.getStartTime(),add.getEndTime()));
+                if(DateUtil.daysBetweenDates(add.getStartTime(),new Date() )>=0){
+                    //濡傛灉宸蹭骇鐢熻垂鐢紝璁$畻宸蹭骇鐢熻垂鐢�
+                    add.setCurrentFee(Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), add.getStartTime(),new Date()));
+                }
+                addList.add(add);
+                totalFee.add(add.getFee());
+                currentFee.add(add.getCurrentFee());
+            }else{
+                //鍑忎繚鎿嶄綔
+                //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+                ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
+                        .eq(ApplyDetail::getApplyId, update.getApplyId())
+                        .eq(ApplyDetail::getMemberId, detail.getMemberId())
+                        .orderByDesc(ApplyDetail::getCreateDate)
+                        .last("limit 1"));
+                if(oldModel == null || oldModel.getStartTime()==null || oldModel.getStartTime().getTime() > update.getApplyStartTime().getTime()){
+                    throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
+                }
+                BigDecimal updateFee = (Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), oldModel.getStartTime(),update.getApplyStartTime()));
+                BigDecimal updateCurrentFee = new BigDecimal(0);
+                if(DateUtil.daysBetweenDates(update.getApplyStartTime(),new Date() )>0){
+                    //濡傛灉鐢熸晥鏃堕棿 鏄粖澶╀箣鍓嶏紝閫�鍥炲凡浜х敓璐圭敤锛岃绠楀凡浜х敓璐圭敤(鎬昏垂鐢�-宸蹭骇鐢熻垂鐢�)
+                    updateCurrentFee = updateFee.subtract(oldModel.getCurrentFee());
+                }
+                applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+                        .setSql(" fee = ifnull(fee,0)+"+updateFee)
+                        .setSql(" current_fee = "+updateFee)
+                        .set(ApplyDetail::getEditor,update.getEditor())
+                        .set(ApplyDetail::getEditDate,update.getEditDate())
+                        .eq(ApplyDetail::getId,oldModel.getApplyId())
+                );
+                totalFee.add(updateFee);
+                currentFee.add(updateCurrentFee);
+
+            }
+        }
+        if(addList!=null && addList.size()>0){
+            applyDetailJoinMapper.insertBatchSomeColumn(addList);
+        }
+        if(totalFee.compareTo(new BigDecimal(0)) != 0){
+            //濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
+            insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
+                    .setSql(" fee = ifnull(fee,0)+"+totalFee)
+                    .setSql(" current_fee = ifnull(current_fee,0)+"+currentFee)
+                    .set(InsuranceApply::getEditor,update.getEditor())
+                    .set(InsuranceApply::getEditDate,update.getEditDate())
+                    .eq(InsuranceApply::getId,update.getApplyId())
+            );
+
+        }
+
+    }
+
+    /**
+     * 骞冲彴閫�鍥炴姇淇�
+     * @param param
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public Integer dealBackApply(ApplyChange param) {
+        if(param.getId() == null ||StringUtils.isBlank(param.getCheckInfo())){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        ApplyChange model = applyChangeMapper.selectById(param.getId());
+
+        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        Constants.ApplyLogType applyLogType = null;
+        String info = "";
+        ApplyChange update = new ApplyChange();
+        if(param.getDealBackApply() ==1){
+            //濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
+            if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
+                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+            }
+            applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
+            info = applyLogType.getInfo();
+            info = info.replace("${param}", param.getCheckInfo());
+            update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+        }else{
+            //濡傛灉鏄悓鎰�,涓ょ鐢宠閫�鍥炵姸鎬侀兘鍙搷浣�
+            if(!(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
+                    ||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()))){
+                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+            }
+            applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
+            if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
+                update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+            }else if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())){
+                update.setStatus(Constants.ApplyChangeStatus.UPLOAD.getKey());
+            }
+        }
+        update.setEditDate(new Date());
+        update.setEditor(user.getId());
+        //鍚屾剰閫�鍥烇紝鐩存帴鍥炲埌鏈�鍒濈姸鎬侊紝濡傛灉椹冲洖閫�鍥炵敵璇凤紝鍒欎繚鍗曠姸鎬佸洖鍒板緟涓婁紶淇濋櫓鍗�
+        update.setCheckDate(update.getEditDate());
+        update.setCheckInfo(param.getCheckInfo());
+        update.setCheckUserId(user.getId());
+        update.setId(model.getId());
+        applyChangeMapper.updateById(update);
+
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        applyLogMapper.insert(log);
+        return  1;
+
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     public Integer create(ApplyChange applyChange) {
+        if (Objects.isNull(applyChange)
+                || Objects.isNull(applyChange.getApplyId())
+                || Objects.isNull(applyChange.getValidTime())
+                || Objects.isNull(applyChange.getType())
+                || !(applyChange.getType().equals(Constants.ZERO) || applyChange.getType().equals(Constants.TWO))
+        ) {
+            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(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+        }
+        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
+        if (Objects.isNull(insuranceApply)) {
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if (insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())) {
+            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "淇濆崟鐘舵�侀敊璇�");
+        }
+        if (DateUtil.compareDate(new Date(), insuranceApply.getEndTime()) >= Constants.ZERO
+        ) {
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "淇濆崟宸茶繃淇濓紝鏃犳硶杩涜璇ユ搷浣�");
+        }
+        Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
+        }
+        CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
+                .eq(CompanySolution::getCompanyId,loginUserInfo.getCompanyId())
+                .eq(CompanySolution::getSolutionBaseId,solutions.getId())
+                .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+                .last(" limit 1 ")
+        );
+        if(Objects.isNull(companySolution)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟鍒嗛厤淇濋櫓鏂规淇℃伅");
+        }
+        //鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
+        if (!(DateUtil.compareDate(applyChange.getValidTime(), insuranceApply.getStartTime()) >= Constants.ZERO
+                && DateUtil.compareDate(insuranceApply.getEndTime(), applyChange.getValidTime()) >= Constants.ZERO)) {
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
+        }
+        applyChange.setCreateDate(new Date());
+        applyChange.setCreator(loginUserInfo.getId());
+        applyChange.setIsdeleted(Constants.ZERO);
+        applyChange.setStatus(Constants.ZERO);
         applyChangeMapper.insert(applyChange);
+
+
+        List<DuSolution> duSolutionList = duSolutionMapper.selectList(new QueryWrapper<DuSolution>().lambda()
+                .eq(DuSolution::getIsdeleted, Constants.ZERO)
+                .eq(DuSolution::getStatus, Constants.ONE)
+                .eq(DuSolution::getSolutionId, insuranceApply.getSolutionId()));
+        if (!CollectionUtils.isNotEmpty(duSolutionList)) {
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
+        }
+
+        //鏌ヨ鎵�鏈夋淳閬e崟浣嶄笅鐨勫伐绉�
+        List<Integer> duSolutionIdList = duSolutionList.stream().map(i -> i.getId()).collect(Collectors.toList());
+        List<DuWorktype> duWorktypeList = duWorktypeMapper.selectList(new QueryWrapper<DuWorktype>().lambda()
+                .eq(DuWorktype::getIsdeleted, Constants.ZERO)
+                .eq(DuWorktype::getStatus, Constants.ONE)
+                .in(DuWorktype::getDuSolutionId, duSolutionIdList));
+        if (!CollectionUtils.isNotEmpty(duWorktypeList)) {
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
+        }
+        //鍔犱繚鏁版嵁
+        List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
+        if (CollectionUtils.isNotEmpty(addDetailList)) {
+           if(companySolution.getCanAdd().equals(Constants.ZERO)){
+               throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
+           }
+            this.addChangeDetail(applyChange,addDetailList,duWorktypeList,duSolutionList,insuranceApply,solutions,loginUserInfo);
+        }
+
+        //鍑忎繚鏁版嵁
+        List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
+        if (CollectionUtils.isNotEmpty(delDetailList)) {
+            if(companySolution.getCanReduce().equals(Constants.ZERO)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
+            }
+            this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo);
+        }
+        //鎹㈠巶涓氬姟
+        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
+        if (CollectionUtils.isNotEmpty(changeDetailList)) {
+            this.changeDetail(applyChange,changeDetailList,duWorktypeList,duSolutionList,loginUserInfo);
+        }
+
+        this.saveApplyLog(applyChange,Constants.ApplyChangeLogStatus.UPLOAD,null);
+
+
         return applyChange.getId();
+    }
+
+
+    public void saveApplyLog(ApplyChange applyChange,Constants.ApplyChangeLogStatus applyChangeLogStatus,String content){
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        ApplyLog applyLog = new ApplyLog();
+        applyLog.setCreateDate(new Date());
+        applyLog.setCreator(loginUserInfo.getId());
+        applyLog.setIsdeleted(Constants.ZERO);
+        applyLog.setApplyId(applyChange.getApplyId());
+        applyLog.setTitle(applyChangeLogStatus.getName());
+        applyLog.setContent(content);
+        applyLog.setObjType(applyChangeLogStatus.getKey());
+        applyLog.setObjId( applyChange.getId());
+        applyLog.setStatus(applyChange.getStatus());
+        applyLogMapper.insert(applyLog);
+    }
+
+
+    /**
+     * 鍑忎繚鏁版嵁澶勭悊
+     * @param applyChange
+     * @param delDetailList
+     * @param loginUserInfo
+     */
+    public void delChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> delDetailList,InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo){
+        for (ApplyChagneDetail applyChagneDetail : delDetailList) {
+            if (Objects.isNull(applyChagneDetail.getMemberId())) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
+            }
+            Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
+            if (Objects.isNull(member)) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
+            }
+            //鏌ヨ鍛樺伐鏄惁瀛樺湪  0寰呯缃� 1宸茬绔� 鐨勬绫讳笟鍔′繚鏁版嵁 鍚屼竴涓诲崟涓�
+            if (applyChagneDetailJoinMapper.selectJoinCount(
+                    new MPJLambdaWrapper<ApplyChagneDetail>()
+                            .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+                            .eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
+                            .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
+            ) > Constants.ZERO) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
+            }
+            //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+            List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
+                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
+                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
+                    .orderByDesc(ApplyDetail::getCreateDate));
+            if (applyDetailList.size() > Constants.ONE) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯革紝瀛樺湪澶氭潯鏁版嵁");
+            }
+            ApplyDetail applyDetail = applyDetailList.get(Constants.ZERO);
+            if (applyChange.getValidTime().compareTo(applyDetail.getEndTime()) <= 0) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��" + applyDetail.getEndTime() + "銆戞棤娉曢�氳繃鏈鐢宠");
+            }
+            applyChagneDetail.setCreateDate(new Date());
+            applyChagneDetail.setCreator(loginUserInfo.getId());
+            applyChagneDetail.setIsdeleted(Constants.ZERO);
+            applyChagneDetail.setApplyChangeId(applyChange.getId());
+            applyChagneDetail.setType(Constants.ONE);
+            applyChagneDetail.setFee(
+                    Constants.countDetailFee(solutions, applyDetail.getEndTime(),applyDetail.getStartTime())
+                            .subtract(Constants.countDetailFee(solutions,applyChange.getValidTime(), applyDetail.getStartTime()))
+            );
+            applyChagneDetailJoinMapper.insert(applyChagneDetail);
+        }
+    }
+
+
+
+    /**
+     * 鍔犱繚鏁版嵁澶勭悊
+     * @param applyChange
+     * @param addDetailList
+     * @param duWorktypeList
+     * @param duSolutionList
+     * @param loginUserInfo
+     */
+    public void addChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> addDetailList,List<DuWorktype> duWorktypeList,List<DuSolution> duSolutionList,InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo){
+        for (ApplyChagneDetail applyChagneDetail : addDetailList) {
+            if (Objects.isNull(applyChagneDetail.getMemberId())
+                    || Objects.isNull(applyChagneDetail.getDuId())
+                    || Objects.isNull(applyChagneDetail.getWorktypeId())
+            ) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
+            }
+            Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
+            if (Objects.isNull(member)) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
+            }
+            //鏌ヨ鍛樺伐鏄惁瀛樺湪  0寰呯缃� 1宸茬绔� 鐨勬绫讳笟鍔′繚鏁版嵁 鍚屼竴涓诲崟涓�
+            if (applyChagneDetailJoinMapper.selectJoinCount(
+                    new MPJLambdaWrapper<ApplyChagneDetail>()
+                            .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+                            .eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
+                            .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
+            ) > Constants.ZERO) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
+            }
+            //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+            if (applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>().lambda()
+                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
+                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
+                    .le(ApplyDetail::getStartTime, "now()")
+                    .ge(ApplyDetail::getEndTime, "now()")
+            ) > Constants.ZERO) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄤ繚闅滀腑鐨勪繚鍗曚俊鎭紝鏃犳硶杩涜鍔犱繚");
+            }
+
+            //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
+            if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
+                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬e崟浣嶆湭鏌ヨ鍒帮紒");
+            }
+            if (duWorktypeList.stream().filter(d -> d.getDuSolutionId().equals(applyChagneDetail.getDuId()) && d.getWorkTypeId().equals(applyChagneDetail.getWorktypeId()))
+                    .collect(Collectors.toList()).size() <= Constants.ZERO) {
+                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
+            }
+            applyChagneDetail.setCreateDate(new Date());
+            applyChagneDetail.setCreator(loginUserInfo.getId());
+            applyChagneDetail.setIsdeleted(Constants.ZERO);
+            applyChagneDetail.setApplyChangeId(applyChange.getId());
+            applyChagneDetail.setType(Constants.ZERO);
+            applyChagneDetail.setFee(
+
+                    Constants.countDetailFee(solutions,insuranceApply.getEndTime(),applyChange.getValidTime())
+            );
+            applyChagneDetailJoinMapper.insert(applyChagneDetail);
+        }
+    }
+
+
+    /**
+     * 鎹㈠巶涓氬姟
+     * @param applyChange
+     * @param duWorktypeList
+     * @param duSolutionList
+     * @param changeDetailList
+     * @param loginUserInfo
+     */
+    public void changeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> changeDetailList,List<DuWorktype> duWorktypeList,List<DuSolution> duSolutionList,LoginUserInfo loginUserInfo){
+        for (ApplyChagneDetail applyChagneDetail : changeDetailList) {
+            if (Objects.isNull(applyChagneDetail.getMemberId())
+                    || Objects.isNull(applyChagneDetail.getOldDuId())
+                    || Objects.isNull(applyChagneDetail.getOldWorktypeId())
+                    || Objects.isNull(applyChagneDetail.getDuId())
+                    || Objects.isNull(applyChagneDetail.getWorktypeId())
+            ) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
+            }
+            Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
+            if (Objects.isNull(member)) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
+            }
+            //鏌ヨ鍛樺伐鏄惁瀛樺湪  0寰呯缃� 1宸茬绔� 鐨勬绫讳笟鍔′繚鏁版嵁 鍚屼竴涓诲崟涓�
+            if (applyChagneDetailJoinMapper.selectJoinCount(
+                    new MPJLambdaWrapper<ApplyChagneDetail>()
+                            .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+                            .eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
+                            .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
+            ) > Constants.ZERO) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
+            }
+            //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+            List<ApplyDetail>  applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
+                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
+                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
+                    .le(ApplyDetail::getStartTime, "now()")
+                    .ge(ApplyDetail::getEndTime, "now()"));
+            if(applyDetailList.size()>Constants.ONE){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯革紝瀛樺湪澶氭潯鏁版嵁");
+            }
+            ApplyDetail applyDetail = applyDetailList.get(Constants.ZERO);
+            if(applyChange.getValidTime().compareTo( applyDetail.getEndTime())<=0){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��"+applyDetail.getEndTime()+"銆戞棤娉曢�氳繃鏈鐢宠");
+            }
+            //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
+            if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
+                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬e崟浣嶆湭鏌ヨ鍒帮紒");
+            }
+            if (duWorktypeList.stream().filter(d -> d.getDuSolutionId().equals(applyChagneDetail.getDuId()) && d.getWorkTypeId().equals(applyChagneDetail.getWorktypeId()))
+                    .collect(Collectors.toList()).size() <= Constants.ZERO) {
+                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
+            }
+            applyChagneDetail.setCreateDate(new Date());
+            applyChagneDetail.setCreator(loginUserInfo.getId());
+            applyChagneDetail.setIsdeleted(Constants.ZERO);
+            applyChagneDetail.setApplyChangeId(applyChange.getId());
+            applyChagneDetail.setType(Constants.TWO);
+            applyChagneDetailJoinMapper.insert(applyChagneDetail);
+        }
     }
 
     @Override
@@ -87,57 +774,25 @@
     @Override
     public PageData<ApplyChange> findPage(PageWrap<ApplyChange> pageWrap) {
         IPage<ApplyChange> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
-        QueryWrapper<ApplyChange> queryWrapper = new QueryWrapper<>();
+        MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
-        if (pageWrap.getModel().getId() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getId, pageWrap.getModel().getId());
-        }
-        if (pageWrap.getModel().getCreator() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getCreator, pageWrap.getModel().getCreator());
-        }
-        if (pageWrap.getModel().getCreateDate() != null) {
-            queryWrapper.lambda().ge(ApplyChange::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
-            queryWrapper.lambda().le(ApplyChange::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
-        }
-        if (pageWrap.getModel().getEditor() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getEditor, pageWrap.getModel().getEditor());
-        }
-        if (pageWrap.getModel().getEditDate() != null) {
-            queryWrapper.lambda().ge(ApplyChange::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
-            queryWrapper.lambda().le(ApplyChange::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
-        }
-        if (pageWrap.getModel().getIsdeleted() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getIsdeleted, pageWrap.getModel().getIsdeleted());
-        }
-        if (pageWrap.getModel().getRemark() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getRemark, pageWrap.getModel().getRemark());
-        }
-        if (pageWrap.getModel().getSortnum() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getSortnum, pageWrap.getModel().getSortnum());
-        }
-        if (pageWrap.getModel().getApplyId() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getApplyId, pageWrap.getModel().getApplyId());
-        }
-        if (pageWrap.getModel().getCode() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getCode, pageWrap.getModel().getCode());
-        }
-        if (pageWrap.getModel().getApplyStartTime() != null) {
-            queryWrapper.lambda().ge(ApplyChange::getApplyStartTime, Utils.Date.getStart(pageWrap.getModel().getApplyStartTime()));
-            queryWrapper.lambda().le(ApplyChange::getApplyStartTime, Utils.Date.getEnd(pageWrap.getModel().getApplyStartTime()));
-        }
-        if (pageWrap.getModel().getStatus() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getStatus, pageWrap.getModel().getStatus());
-        }
-        if (pageWrap.getModel().getValidTime() != null) {
-            queryWrapper.lambda().ge(ApplyChange::getValidTime, Utils.Date.getStart(pageWrap.getModel().getValidTime()));
-            queryWrapper.lambda().le(ApplyChange::getValidTime, Utils.Date.getEnd(pageWrap.getModel().getValidTime()));
-        }
-        if (pageWrap.getModel().getValidCode() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getValidCode, pageWrap.getModel().getValidCode());
-        }
-        if (pageWrap.getModel().getType() != null) {
-            queryWrapper.lambda().eq(ApplyChange::getType, pageWrap.getModel().getType());
-        }
+        ApplyChange model = pageWrap.getModel() ;
+        queryWrapper
+                .selectAll(ApplyChange.class)
+                .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0  )",ApplyChange::getAddNum)
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1  )",ApplyChange::getDelNum)
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2  )",ApplyChange::getChangeNum)
+                .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID  )",ApplyChange::getChangeMoney)
+                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                .eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
+                .eq(!Objects.isNull(model.getStatus()),ApplyChange::getStatus,model.getStatus())
+                .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
+                .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
+                .ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
+                .le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" );
+
         for(PageWrap.SortData sortData: pageWrap.getSorts()) {
             if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                 queryWrapper.orderByDesc(sortData.getProperty());
@@ -145,7 +800,8 @@
                 queryWrapper.orderByAsc(sortData.getProperty());
             }
         }
-        return PageData.from(applyChangeMapper.selectPage(page, queryWrapper));
+        PageData<ApplyChange> pageData = PageData.from(applyChangeJoinMapper.selectJoinPage(page,ApplyChange.class, queryWrapper));
+        return pageData;
     }
 
     @Override
@@ -153,4 +809,291 @@
         QueryWrapper<ApplyChange> wrapper = new QueryWrapper<>(applyChange);
         return applyChangeMapper.selectCount(wrapper);
     }
+
+
+
+    @Override
+    public PageData<ApplyChange> findPageForCompany(PageWrap<ApplyChange> pageWrap) {
+        IPage<ApplyChange> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+        MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
+        Utils.MP.blankToNull(pageWrap.getModel());
+        ApplyChange model = pageWrap.getModel() ;
+        queryWrapper
+                .selectAll(ApplyChange.class)
+                .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0  )",ApplyChange::getAddNum)
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1  )",ApplyChange::getDelNum)
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2  )",ApplyChange::getChangeNum)
+                .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID  )",ApplyChange::getChangeMoney)
+                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                .eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
+                .eq(!Objects.isNull(model.getStatus()),ApplyChange::getStatus,model.getStatus())
+                .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
+                .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
+                .ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
+                .le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" );
+
+        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+                queryWrapper.orderByDesc(sortData.getProperty());
+            } else {
+                queryWrapper.orderByAsc(sortData.getProperty());
+            }
+        }
+        PageData<ApplyChange> pageData = PageData.from(applyChangeJoinMapper.selectJoinPage(page,ApplyChange.class, queryWrapper));
+        return pageData;
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public void changeOpt(ApplyChangeOptDTO applyChangeOptDTO){
+        if(Objects.isNull(applyChangeOptDTO)
+                ||Objects.isNull(applyChangeOptDTO.getApplyId())
+                ||StringUtils.isBlank(applyChangeOptDTO.getOptIllustration())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+        ApplyChange applyChange = applyChangeMapper.selectById(applyChangeOptDTO.getApplyId());
+        if(Objects.isNull(applyChange)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍗曟嵁鏁版嵁");
+        }
+        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
+        if(Objects.isNull(insuranceApply)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟鏁版嵁");
+        }
+        if(applyChange.getIsdeleted().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�");
+        }
+        Constants.ApplyChangeLogStatus applyChangeLogStatus = Constants.ApplyChangeLogStatus.RETURN_APPLY;
+        if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())
+                ||applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
+            //鍙戣捣閫�鍥炵敵璇�
+            if(loginUserInfo.getType().equals(Constants.ONE)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+            }
+            if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.UPLOAD.getKey()) ){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
+            }
+        }else if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
+            applyChangeLogStatus = Constants.ApplyChangeLogStatus.PLATFORM_AGREE;
+            //骞冲彴鍚屾剰閫�鍥�
+            if(loginUserInfo.getType().equals(Constants.ZERO)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲钩鍙扮鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+            }
+            if(!(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())
+                            ||applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
+                    )){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
+            }
+        }else if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.UPLOAD.getKey())){
+            applyChangeLogStatus = Constants.ApplyChangeLogStatus.PLATFORM_UN_AGREE;
+            //骞冲彴椹冲洖閫�鍥�
+            if(loginUserInfo.getType().equals(Constants.ZERO)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲钩鍙扮鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+            }
+            if(!(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())
+                            ||applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
+                    )){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
+            }
+        }else if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.CLOSE.getKey())){
+            applyChangeLogStatus = Constants.ApplyChangeLogStatus.CLOSE;
+            //浼佷笟鍏抽棴
+            if(loginUserInfo.getType().equals(Constants.ONE)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+            }
+            if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
+            }
+        }else{
+            throw new BusinessException(ResponseStatus.BAD_REQUEST  );
+        }
+        applyChange.setStatus(applyChangeOptDTO.getOptType());
+        applyChangeMapper.updateById(applyChange);
+//        //瀛樺偍鏃ュ織鏁版嵁
+        this.saveApplyLog(applyChange,applyChangeLogStatus,applyChangeOptDTO.getOptIllustration());
+    }
+
+
+    @Override
+    public ApplyChange findDetail(Integer id){
+        MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.selectAll(ApplyChange.class)
+                .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+                .selectAs(Company::getName,ApplyChange::getCompanyName)
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0  )",ApplyChange::getAddNum)
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1  )",ApplyChange::getDelNum)
+                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2  )",ApplyChange::getChangeNum)
+                .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID  )",ApplyChange::getChangeMoney)
+                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                .eq(ApplyChange::getId,id);
+        ApplyChange applyChange =  applyChangeJoinMapper.selectOne(queryWrapper);
+        return applyChange;
+    }
+    /**
+     * 瀵煎嚭鎹㈠巶鐢宠琛�
+     * @param param
+     * @return
+     */
+    @Override
+    public  ApplyChange  exportChangeUnitExcel(ApplyChange param){
+        ApplyChange model = findJoinDetail(param);
+        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getType())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+
+        //鏌ヨ鏄庣粏
+        List<ApplyChagneDetail> detailList =findJoinChangeDetailList(model);
+        model.setChangeDetailList(detailList!=null?detailList:new ArrayList<>());
+        model.setChangeNum(model.getChangeDetailList().size());
+        return model;
+    }
+    /**
+     * 瀵煎嚭鎹㈠巶鐢宠琛�
+     * @param param
+     * @return
+     */
+    @Override
+    public  String  getSignLinkJiajiabao(ApplyChange param){
+        ApplyChange model = exportJiajianBaoExcel(param);
+        return  getOnlineSignLink(model);
+    }
+    /**
+     * 瀵煎嚭鎹㈠巶鐢宠琛�
+     * @param param
+     * @return
+     */
+    @Override
+    public  String  getSignLinkChangeUnit(ApplyChange param){
+        ApplyChange model = exportChangeUnitExcel(param);
+        return  getOnlineSignLink(model);
+    }
+
+    private String getOnlineSignLink(ApplyChange model) {
+        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getType())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(!Constants.equalsInteger(Constants.ZERO,model.getStatus())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔绛剧珷鎿嶄綔锛�");
+        }
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        Company company = user.getCompany();
+        if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.ONE)){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠$悊鍛樼‘璁");
+        }
+
+        String fileUrl = ExcelExporter.build(ApplyChange.class).exportChangeUnitExcelToPdf(model,"缂撳瓨鐢宠琛�");
+        String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
+        notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
+        String applyNo = signService.applySignLocalFile(company.getName(),fileUrl,company.getName(),company.getCode(),company.getEmail(),null,company.getSignId(),notifyUrl);
+        if(StringUtils.isBlank(applyNo) ){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        String link = signService.signLink(applyNo,company.getName(),company.getCode());
+        if(StringUtils.isBlank(link) ){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        ApplyChange update= new ApplyChange();
+        update.setId(model.getId());
+        update.setEditor(user.getId());
+        update.setEditDate(new Date());
+        update.setSignApplyNo(applyNo);
+        applyChangeMapper.updateById(update);
+        return  link;
+    }
+
+
+    /**
+     * 瀵煎嚭鍔犲噺淇濈敵璇疯〃
+     * @param param
+     * @return
+     */
+    @Override
+    public  ApplyChange  exportJiajianBaoExcel(ApplyChange param){
+
+        ApplyChange model = findJoinDetail(param);
+        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getType())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+
+        //鏌ヨ鏄庣粏
+        List<ApplyChagneDetail> detailList =findJoinDetailList(model);
+        model.setAddDetailList(new ArrayList<>());
+        model.setDelDetailList(new ArrayList<>());
+        if(detailList!=null){
+            for(ApplyChagneDetail ad :detailList){
+                if(Constants.equalsInteger(ad.getType(),Constants.ZERO)){
+                    model.getAddDetailList().add(ad);
+                }else{
+                    model.getDelDetailList().add(ad);
+                }
+            }
+        }
+        model.setDelNum(model.getDelDetailList().size());
+        model.setAddNum(model.getAddDetailList().size());
+        return model;
+    }
+    private ApplyChange findJoinDetail(ApplyChange param) {
+        MPJLambdaWrapper wrapper=  new MPJLambdaWrapper<ApplyChange>()
+                .selectAll(ApplyChange.class)
+                .selectAs(Solutions::getName,ApplyChange::getSolutionsName)
+                .selectAs(Company::getName,ApplyChange::getCompanyName)
+                .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+                .selectAs(InsuranceApply::getStartTime,ApplyChange::getStartTime)
+                .selectAs(InsuranceApply::getStartTime,ApplyChange::getEndTime)
+                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                .leftJoin(Company.class,Company::getId,ApplyChange::getCompanyId)
+                .eq(ApplyChange::getId,param.getId())
+                .last("limit 1");
+
+        ApplyChange model = applyChangeJoinMapper.selectJoinOne(ApplyChange.class,wrapper);
+        return  model;
+    }
+    private List<ApplyChagneDetail> findJoinDetailList(ApplyChange model) {
+        MPJLambdaWrapper wrapper1=  new MPJLambdaWrapper<ApplyChagneDetail>()
+                .selectAll(ApplyChagneDetail.class)
+                .selectAs(Member::getName,ApplyChagneDetail::getMemberName)
+                .selectAs(Member::getSex,ApplyChagneDetail::getSex)
+                .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
+                .selectAs(Worktype::getName,ApplyChagneDetail::getWorkTypeName)
+                .selectAs(DispatchUnit::getName,ApplyChagneDetail::getDuName)
+                .leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId)
+                .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getDuId)
+                .leftJoin(Member.class,Member::getId,ApplyChagneDetail::getMemberId)
+                .eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO)
+                .eq(ApplyChagneDetail::getApplyChangeId,model.getId());
+        //鏌ヨ鏄庣粏
+        List<ApplyChagneDetail> detailList =applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,wrapper1);
+        return  detailList;
+    }
+    private List<ApplyChagneDetail> findJoinChangeDetailList(ApplyChange model) {
+        MPJLambdaWrapper wrapper1=  new MPJLambdaWrapper<ApplyChagneDetail>()
+                .selectAll(ApplyChagneDetail.class)
+                .selectAs(Member::getName,ApplyChagneDetail::getMemberName)
+                .selectAs(Member::getSex,ApplyChagneDetail::getSex)
+                .select("t1.name as worktypeName")
+                .select("t2.name as duName")
+                .select("t3.name as oldWorktypeName")
+                .select("t4.name as oldDuName")
+                .selectAs(Member::getSex,ApplyChagneDetail::getSex)
+                .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
+                .leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId)
+                .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getDuId)
+                .leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getOldWorktypeId)
+                .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getOldDuId)
+                .leftJoin(Member.class,Member::getId,ApplyChagneDetail::getMemberId)
+                .eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO)
+                .eq(ApplyChagneDetail::getApplyChangeId,model.getId());
+        //鏌ヨ鏄庣粏
+        List<ApplyChagneDetail> detailList =applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,wrapper1);
+        return  detailList;
+    }
+
+
 }

--
Gitblit v1.9.3